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

src/views/old_mini/modify_work/modify.vue

@@ -362,7 +362,8 @@
                     </div>
 
                     <div class="submit-btn" :class="{ 'center-btn': onlyPrice }">
-                        <div v-if="!onlyPrice" class="btn second" @click.prevent="cancelEdit">取消编辑</div>
+                        <!-- <div v-if="!onlyPrice" class="btn second" @click.prevent="cancelEdit">取消编辑</div> -->
+                        <div v-if="!onlyPrice" class="btn second" @click.prevent="handleCancelAttention">取消关注</div>
                         <div class="btn" @click.prevent="submitForm(formRef)">保存</div>
                     </div>
                 </template>
@@ -1109,6 +1110,9 @@ const submitForm = (formEl) => {
             // 校验标记是否已选择
             if (!validateTagName()) return;
 
+            // 校验施用方式是否已选择
+            if (!validateUsageMode()) return;
+
             // 校验农情互动,不通过，直接返回失败
             if (!onlyPrice.value && !validateInteractForm()) return false;
 
@@ -1136,6 +1140,15 @@ const validateTagName = () => {
     return true;
 };
 
+// 校验施用方式是否已选择
+const validateUsageMode = () => {
+    if (!dynamicValidateForm.prescription?.usageMode || dynamicValidateForm.prescription.usageMode === "") {
+        ElMessage.warning("请选择施用方式");
+        return false;
+    }
+    return true;
+};
+
 // 检验服务报价是否填写
 const validateServicePrice = () => {
     if (!servicePricePerMu.value) {