lxf 3 дней назад
Родитель
Сommit
125620fe40

+ 3 - 3
src/App.vue

@@ -146,11 +146,11 @@ const fetchUserType = () => {
         .then(({ data }) => {
             if (Array.isArray(data) && data.length > 0) {
                 // 有托管农户数据
-                userType.value = 1;
-                localStorage.setItem("USER_TYPE", "1");
-            } else {
                 userType.value = 2;
                 localStorage.setItem("USER_TYPE", "2");
+            } else {
+                userType.value = 1;
+                localStorage.setItem("USER_TYPE", "1");
             }
         })
         .catch(() => {

+ 1 - 1
src/views/old_mini/agri_record/index.vue

@@ -55,7 +55,7 @@ const getRecordList = () => {
     VE_API.user.farmServiceRecord({ farmId: gardenId.value })
         .then(({ data }) => {
             loading.value = false;
-            taskList.value = [...data, ...data];
+            taskList.value = data;
             if(data.length === 0) {
                 noData.value = true;
             }

+ 3 - 1
src/views/old_mini/home/index.vue

@@ -150,7 +150,9 @@ const handleCardClick = (card) => {
 
 onActivated(() => {
     getManagerList();
-    checkExistsEnabledScheme()
+    if (userType.value != 2) {
+        checkExistsEnabledScheme()
+    }
     getBannerList();
     isGarden.value = Boolean(localStorage.getItem("isGarden"));
     // 检测是否从创建农场页面成功返回

+ 1 - 1
src/views/old_mini/mine/pages/authentication.vue

@@ -52,7 +52,7 @@ const list = [
     //     role:1
     // }
 
-const active = ref(1)
+const active = ref(0)
 const handleActive = (item,index) =>{
     active.value = index
 }

+ 2 - 2
src/views/old_mini/user/farmDetails.vue

@@ -357,9 +357,9 @@ const onSelect = () => {
     const query = {
         agriculturalStoreId: route.query.agriculturalStoreId,
         farmId: route.query.farmId,
-        speciesName: farmDetail.value.speciesName,
         containerId: farmDetail.value.containerId,
-        receiveUserId: route.query.receiveUserId,
+        // speciesName: farmDetail.value.speciesName,
+        // receiveUserId: route.query.receiveUserId,
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=shareFarm`,