Merge branch 'farmer' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5 into farmer

src/components/weatherInfo.vue

@@ -297,7 +297,7 @@ const handleFarmInfo = () => {
     router.push(`/farm_info?subjectId=${farmId.value}`);
 }
 const handleAddFarm = () => {
-    router.push(`/create_farm?type=farmer&expertMiniUserId=81881&isReload=true`);
+    router.push(`/create_farm?type=farmer`);
 }
 
 // 获取天气数据

src/views/old_mini/create_farm/index.vue

@@ -55,7 +55,7 @@
                                     </el-form-item>
                                     <el-form-item label="联系电话" prop="tel">
                                         <div class="area-box">
-                                            <el-input placeholder="请输入联系人电话" v-model="ruleForm.tel" autocomplete="off"
+                                            <el-input placeholder="请输入联系人电话" type="number" v-model="ruleForm.tel" autocomplete="off"
                                                 style="width: fit-content" />
                                         </div>
                                     </el-form-item>
@@ -506,13 +506,14 @@ const submitForm = (formEl) => {
                 params.id = route.query.farmId;
             }
 
-            let pageData = null;
-            if (route.query.miniJson) {
-                const json = JSON.parse(route.query.miniJson);
-                pageData = JSON.parse(json.paramsPage);
-            }
+            // let pageData = null;
+            // if (route.query.miniJson) {
+            //     const json = JSON.parse(route.query.miniJson);
+            //     console.log('json', json);
+            //     // pageData = JSON.parse(json.paramsPage);
+            // }
 
-            if (route.query.type === "add" || pageData?.type === 'add' || route.query.type === "farmer") {
+            // if (route.query.type === "add" || pageData?.type === 'add' || route.query.type === "farmer") {
                 // 处理 geom 参数，如果是数组需要序列化
                 const queryParams = {
                     ...params,
@@ -529,65 +530,65 @@ const submitForm = (formEl) => {
                 delete queryParams.speciesItem;
                 queryParams.speciesName = mainSpecies?.name;
                 
-                if (pageData?.type === 'add') {
-                    queryParams.invite = true;
-                }
+                // if (pageData?.type === 'add') {
+                //     queryParams.invite = true;
+                // }
                 router.push({
                     path: "/prescription",
                     query: queryParams,
                 });
                 return;
-            }
-
-            const apiCall = route.query.type === "edit" ? VE_API.basic_farm.saveBasicFarmInfoByExpertV3({...params, expertMiniUserId: '81881'}) : VE_API.farm.saveFarm(params);
-
-            apiCall.then((res) => {
-                if (res.code === 0) {
-                    ElMessage.success(route.query.type === "edit" ? "修改成功" : "创建成功");
-                    // 重置表单和地块数据
-                    ruleFormRef.value.resetFields();
-                    store.commit("home/SET_FARM_POLYGON", null);
-                    store.commit("home/SET_EDIT_FARM_DATA", null); // 清除编辑数据
-                    polygonArr.value = null;
-                    isFromEditMap.value = false;
-
-                    if (route.query.type !== "edit" && curRole == 0) {
-                        localStorage.setItem("selectedFarmId", res.data.id);
-                        localStorage.setItem("selectedFarmName", res.data.name);
-                    }
-
-                    // 根据来源页面决定跳转目标
-                    const fromPage = route.query.from;
-                    if (fromPage && fromPage !== "details") {
-                        // 如果是从monitor页面来的
-                        router.replace(`/${fromPage}`);
-                    } else if (fromPage === "details") {
-                        router.go(-1);
-                    } else {
-                        if (route.query.miniJson) {
-                            const json = JSON.parse(route.query.miniJson);
-                            //上传图片
-                            VE_API.ali
-                                .uploadImg({
-                                    farmId: res.data.id,
-                                    images: json.images,
-                                    uploadDate: formatDate(new Date()),
-                                })
-                                .then(({ code, msg }) => {
-                                    if (code === 0) {
-                                        showSuccessPopup.value = true;
-                                    } else {
-                                        ElMessage.error(msg);
-                                    }
-                                });
-                        } else {
-                            router.replace(`/growth_report`);
-                        }
-                    }
-                } else {
-                    ElMessage.error(res.msg);
-                }
-            });
+            // }
+
+            // const apiCall = route.query.type === "edit" ? VE_API.basic_farm.saveBasicFarmInfoByExpertV3({...params, expertMiniUserId: '81881'}) : VE_API.farm.saveFarm(params);
+
+            // apiCall.then((res) => {
+            //     if (res.code === 0) {
+            //         ElMessage.success(route.query.type === "edit" ? "修改成功" : "创建成功");
+            //         // 重置表单和地块数据
+            //         ruleFormRef.value.resetFields();
+            //         store.commit("home/SET_FARM_POLYGON", null);
+            //         store.commit("home/SET_EDIT_FARM_DATA", null); // 清除编辑数据
+            //         polygonArr.value = null;
+            //         isFromEditMap.value = false;
+
+            //         if (route.query.type !== "edit" && curRole == 0) {
+            //             localStorage.setItem("selectedFarmId", res.data.id);
+            //             localStorage.setItem("selectedFarmName", res.data.name);
+            //         }
+
+            //         // 根据来源页面决定跳转目标
+            //         const fromPage = route.query.from;
+            //         if (fromPage && fromPage !== "details") {
+            //             // 如果是从monitor页面来的
+            //             router.replace(`/${fromPage}`);
+            //         } else if (fromPage === "details") {
+            //             router.go(-1);
+            //         } else {
+            //             if (route.query.miniJson) {
+            //                 const json = JSON.parse(route.query.miniJson);
+            //                 //上传图片
+            //                 VE_API.ali
+            //                     .uploadImg({
+            //                         farmId: res.data.id,
+            //                         images: json.images,
+            //                         uploadDate: formatDate(new Date()),
+            //                     })
+            //                     .then(({ code, msg }) => {
+            //                         if (code === 0) {
+            //                             showSuccessPopup.value = true;
+            //                         } else {
+            //                             ElMessage.error(msg);
+            //                         }
+            //                     });
+            //             } else {
+            //                 router.replace(`/growth_report`);
+            //             }
+            //         }
+            //     } else {
+            //         ElMessage.error(res.msg);
+            //     }
+            // });
         }
     });
 };
@@ -734,7 +735,7 @@ function backgToHome() {
     ruleFormRef.value?.resetFields();
 
     // 根据来源页面决定返回目标
-    const fromPage = route.query.from;
+    const fromPage = route.query?.from;
     if (route.query.miniJson) {
         const json = JSON.parse(route.query.miniJson);
         if (json.isMini) {
@@ -759,7 +760,7 @@ function backgToHome() {
         // }
     } else {
         if (fromPage && fromPage !== "details") {
-            if (route.query.type === "farmer") {
+            if (route.query?.type === "farmer") {
                 router.go(-1);
             } else {
                 router.replace(`/${fromPage}`);
@@ -821,6 +822,7 @@ function updateFarmNameIfNeeded() {
 
 // 回填编辑数据
 function populateEditData() {
+    console.log('populateEditData');
     const editData = store.state.home.editFarmData;
     if (!editData) {
         return;

src/views/old_mini/growth_report/index.vue

@@ -240,7 +240,7 @@ const userInfoObj = userInfo ? JSON.parse(userInfo) : {};
 
 const handleLockClick = () => {
     if (userInfoObj.tel) {
-        router.push(`/create_farm?type=farmer&isReload=true`);
+        router.push(`/create_farm?from=growth_report`);
         return;
     }
     wx.miniProgram.navigateTo({
@@ -253,7 +253,7 @@ const handleLockClick = () => {
 }
 
 const handleAddFarm = () => {
-    router.push(`/create_farm?type=farmer&isReload=true`);
+    router.push(`/create_farm?from=growth_report`);
 }
 
 const todayPatrolFocus = ref([]);