fix: 农场修改

src/components/pageComponents/FarmInfoCard.vue

@@ -2,7 +2,7 @@
     <div class="farm-info-card" :class="{ 'has-footer': showFooter }" @click="handleClick">
         <div class="item-content">
             <div class="item-left" :style="{ width: data.maxWidth ? 'calc(100% - 80px)' : 'auto' }">
-                <img class="map-img" :src="data.mapImage || '/map.png'" alt="地图" />
+                <img class="map-img" src="@/assets/img/home/farm.png" alt="地图" />
                 <div class="item-info">
                     <div class="item-header">
                         <div class="farm-name van-ellipsis" :style="{ maxWidth: data.maxWidth || 'calc(100% - 90px)' }">{{ data.farmName }}</div>

src/views/old_mini/create_farm/index.vue

@@ -128,7 +128,7 @@
                                             @input="handleFarmNameInput"
                                         />
                                     </el-form-item>
-                                    <Checkbox v-if="paramsType !== 'client'" class="checkbox" icon-size="18px" shape="square" v-model="ruleForm.defaultFarm">是否勾选为默认农场</Checkbox>
+                                    <Checkbox v-if="paramsType !== 'client' && curRole == 0" class="checkbox" icon-size="18px" shape="square" v-model="ruleForm.defaultFarm">是否勾选为默认农场</Checkbox>
                                 </el-form>
                             </div>
                             <div class="create-btn">
@@ -548,7 +548,7 @@ const submitForm = (formEl) => {
                     
                     // 根据来源页面决定跳转目标
                     const fromPage = route.query.from;
-                    if (fromPage) {
+                    if (fromPage && fromPage !== 'details') {
                         // 如果是从monitor页面来的
                         router.replace(`/${fromPage}`);
                         if(fromPage === 'home'){
@@ -559,6 +559,9 @@ const submitForm = (formEl) => {
                             router.replace(`/home?showSuccess=${showSuccess}`);
                         }
                         
+                    } else if (fromPage === "details") {
+                        console.log('details', res.data);
+                        router.go(-1)
                     } else {
                         router.replace(`/home`);
                     }
@@ -582,7 +585,7 @@ const resetForm = (formEl) => {
     
     // 根据来源页面决定返回目标
     const fromPage = route.query.from;
-    if (fromPage) {
+    if (fromPage && fromPage !== 'details') {
         router.replace(`/${fromPage}`);
         return;
     }
@@ -692,11 +695,12 @@ function backgToHome() {
     
     // 根据来源页面决定返回目标
     const fromPage = route.query.from;
-    if (fromPage) {
+    if (fromPage && fromPage !== 'details') {
         router.replace(`/${fromPage}`);
         return;
+    } else {
+        router.go(-1)
     }
-    router.go(-1)
 }
 
 // 处理面积按键输入 - 只允许数字和小数点

src/views/old_mini/home/components/farmInfoPopup.vue

@@ -126,7 +126,8 @@ const handleEdit = () => {
     // 将农场数据存储到store中，供编辑页面使用
     store.commit("home/SET_EDIT_FARM_DATA", farmInfo.value);
     
-    router.push(`/create_farm?type=edit&farmId=${props.farmId}&from=monitor`);
+    const from = props.showEditBtn ? 'details' : 'monitor';
+    router.push(`/create_farm?type=edit&farmId=${props.farmId}&from=${from}`);
 };
 
 const handleCancel = () => {

src/views/old_mini/mine/pages/serviceDetail.vue

@@ -77,7 +77,6 @@ const farmInfoData = computed(() => {
         area: (farmDetail.value.mianji ? farmDetail.value.mianji + '亩' : ''),
         variety: farmDetail.value.typeName || '',
         address: farmDetail.value.address || '',
-        mapImage: '/map.png',
         maxWidth: '58px',
     };
 });

src/views/old_mini/mine/pages/serviceRecords.vue

@@ -18,7 +18,6 @@
                     area: item.mianji + '亩',
                     variety: item.typeName,
                     address: item.address,
-                    mapImage: item.mapImage || '/map.png',
                     serviceCount: item.serviceCount,
                 }"
                 @click="handleItemClick(item)"

src/views/old_mini/modify_work/completedWork.vue

@@ -147,7 +147,7 @@
                     class="box-wrap farm-photo farm-info"
                     v-if="
                         (curRole == 2 && currentStep == 2 && detailData?.executeEvidence?.length) ||
-                        (curRole == 0 && detailData?.flowStatus === 4 && detailData?.executeEvidence?.length)
+                        (detailData?.flowStatus === 4 && detailData?.executeEvidence?.length)
                     "
                 >
                     <div class="info-title">

src/views/old_mini/modify_work/index.vue

@@ -223,7 +223,7 @@
                                                         placeholder="请输入"
                                                     /> -->
 
-                                                    <el-input v-model.number="domain.ratio" placeholder="请输入">
+                                                    <el-input v-model="domain.ratio" type="number" step="0.01" placeholder="请输入">
                                                         <template #append>{{ domain.unit }}</template>
                                                     </el-input>
                                                 </div>
@@ -256,7 +256,7 @@
                                                         style="width: 100%"
                                                         placeholder="请输入"
                                                     /> -->
-                                                    <el-input v-model.number="domain.muUsage" placeholder="请输入">
+                                                    <el-input v-model="domain.muUsage" type="number" step="0.01" placeholder="请输入">
                                                         <template #append>{{ domain.unit }}</template>
                                                     </el-input>
                                                 </div>
@@ -274,7 +274,7 @@
                                                             style="width: 100%"
                                                             placeholder="请输入"
                                                         /> -->
-                                                        <el-input v-model.number="domain.ratio2" placeholder="请输入">
+                                                        <el-input v-model="domain.ratio2" type="number" step="0.01" placeholder="请输入">
                                                             <template #append>{{ domain.unit }}</template>
                                                         </el-input>
                                                     </div>
@@ -290,7 +290,7 @@
                                                             style="width: 100%"
                                                             placeholder="请输入"
                                                         /> -->
-                                                        <el-input v-model.number="domain.muUsage2" placeholder="请输入">
+                                                        <el-input v-model="domain.muUsage2" type="number" step="0.01" placeholder="请输入">
                                                             <template #append>{{ domain.unit }}</template>
                                                         </el-input>
                                                     </div>

src/views/old_mini/offer_price/component/servicePrice.vue

@@ -4,7 +4,7 @@
             <div class="service-form-title">服务报价</div>
             <el-form ref="formRef" :model="form" label-width="86px">
                 <el-form-item label="人工服务" prop="manualServicePrice" class="input-unit">
-                    <el-input v-if="isEdit" v-model.number="form.manualServicePrice" placeholder="请输入数字">
+                    <el-input v-if="isEdit" v-model="form.manualServicePrice" type="number" step="0.01" placeholder="请输入数字">
                         <template #append>元/亩</template>
                     </el-input>
                     <div v-else class="service-form-value">
@@ -12,7 +12,7 @@
                     </div>
                 </el-form-item>
                 <el-form-item label="无人机服务" prop="uavServicePrice" class="input-unit">
-                    <el-input v-if="isEdit" v-model.number="form.uavServicePrice" placeholder="请输入数字">
+                    <el-input v-if="isEdit" v-model="form.uavServicePrice" type="number" step="0.01" placeholder="请输入数字">
                         <template #append>元/亩</template>
                     </el-input>
                     <div v-else class="service-form-value">

src/views/old_mini/plan/components/modifyPlan.vue

@@ -182,7 +182,7 @@
                                                         placeholder="请输入"
                                                     /> -->
 
-                                                    <el-input v-model.number="domain.ratio" placeholder="请输入">
+                                                    <el-input v-model="domain.ratio" type="number" step="0.01" placeholder="请输入">
                                                         <template #append>{{ domain.unit || 'kg' }}</template>
                                                     </el-input>
                                                 </div>
@@ -215,7 +215,7 @@
                                                         style="width: 100%"
                                                         placeholder="请输入"
                                                     /> -->
-                                                    <el-input v-model.number="domain.dosage" placeholder="请输入">
+                                                    <el-input v-model="domain.dosage" type="number" step="0.01" placeholder="请输入">
                                                         <template #append>{{ domain.unit || 'kg' }}</template>
                                                     </el-input>
                                                 </div>
@@ -233,7 +233,7 @@
                                                             style="width: 100%"
                                                             placeholder="请输入"
                                                         /> -->
-                                                        <el-input v-model.number="domain.ratio2" placeholder="请输入">
+                                                        <el-input v-model="domain.ratio2" type="number" step="0.01" placeholder="请输入">
                                                             <template #append>{{ domain.unit || 'kg' }}</template>
                                                         </el-input>
                                                     </div>
@@ -249,7 +249,7 @@
                                                             style="width: 100%"
                                                             placeholder="请输入"
                                                         /> -->
-                                                        <el-input v-model.number="domain.dosage2" placeholder="请输入">
+                                                        <el-input v-model="domain.dosage2" type="number" step="0.01" placeholder="请输入">
                                                             <template #append>{{ domain.unit || 'kg' }}</template>
                                                         </el-input>
                                                     </div>

src/views/old_mini/price_detail/index.vue

@@ -51,9 +51,10 @@
                             <div class="item-name">亩单价</div>
                             <div class="item-val">
                                  <el-input-number 
-                                     style="width: 132px" 
+                                     style="width: 132px"
+                                     placeholder="服务单价"
                                      v-model="servicePricePerMu" 
-                                     :min="0"
+                                     :min="0.0001"
                                  />
                                  <!-- <span class="price-unit">元/亩</span> -->
                             </div>
@@ -101,7 +102,8 @@
                                 <div class="item-name">肥药单价</div>
                                 <div class="item-val">
                                     <el-input-number 
-                                        style="width: 132px" 
+                                        style="width: 132px"
+                                        placeholder="单价"
                                         v-model="pesticide.price" 
                                         :min="0.0000000001"
                                     />

src/views/old_mini/user/farmDetails.vue

@@ -9,7 +9,6 @@
                     area: (farmDetail.mianji || 0) + '亩',
                     variety: farmDetail.typeName || '',
                     address: farmDetail.address || '',
-                    mapImage: '/map.png',
                     maxWidth:'90px',
                 }"
             >

src/views/old_mini/user/index.vue

@@ -32,7 +32,6 @@
                             area: ele.mianji + '亩',
                             variety: ele.speciesName,
                             address: ele.address,
-                            mapImage: ele.mapImage || '/map.png',
                             maxWidth: '90px',
                         }"
                         @click="handleItemClick(ele)"