feat: merge公司-私人

src/utils/index.ts

@@ -16,9 +16,10 @@ interface Typeint {
   okFun: any;
 }
 
-const params = () => {
+// 获取params参数
+export const getparams = () => {
   let $instance: any = getCurrentInstance();
-  return $instance.router.params;
+  return $instance?.router?.params;
 };
 // 添加数据
 export const addTable: any = ({ env, tableName, objData, okFun }: Typeint) => {
@@ -37,19 +38,28 @@ export const addTable: any = ({ env, tableName, objData, okFun }: Typeint) => {
   });
 };
 
-// 获取指定集合数据表
-export const getTable: any = ({ env, tableName, keyValue, okFun }: Typeint) => {
+// 获取指定集合数据表 (keyValue指定条件)
+export const getTable: any = ({ env, tableName, keyValue={}, okFun }: Typeint) => {
   // 数据库环境
   const db: any = Taro.cloud.database({
     env: env,
   });
 
   let nowtable: any = db?.collection(tableName);
-  nowtable?.where({ ...(keyValue ?? {}) }).get({
-    success: (res: any) => {
-      okFun(res);
-    },
-  });
+  if(Object.keys(keyValue)?.length>0){
+    nowtable?.where(keyValue).get({
+      success: (res: any) => {
+        okFun(res);
+      },
+    });
+  }else{
+    nowtable?.get({
+      success: (res: any) => {
+        okFun(res);
+      },
+    });
+  }
+  
 };
 
 // 获取指定id数据数据
@@ -57,7 +67,7 @@ export const getTableid: any = ({
   env,
   tableName,
   id,
-  keyValue,
+  keyValue={},
   okFun,
 }: Typeint) => {
   // 数据库环境
@@ -66,14 +76,25 @@ export const getTableid: any = ({
   });
 
   let nowtable: any = db?.collection(tableName);
-  nowtable
+
+  if(Object.keys(keyValue)?.length>0){
+    nowtable
     ?.doc(id)
-    // .where({ ...(keyValue ?? {}) })
+    .where(keyValue)
     .get({
       success: (res: any) => {
         okFun(res);
       },
     });
+  }else{
+    nowtable
+    ?.doc(id)?.get({
+      success: (res: any) => {
+        okFun(res);
+      },
+    });
+  }
+ 
 };
 
 // 更新数据