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

src/views/old_mini/agri_services/components/servicesHall.vue

@@ -21,20 +21,20 @@
             <template #header>
                 <div class="header-bar"></div>
                 <div class="select-group">
-                    <el-select class="select-item" v-model="areaValue" placeholder="距离">
+                    <el-select class="select-item" v-model="paramsPage.distance" placeholder="距离">
                         <el-option
-                            v-for="item in areaOptions"
+                            v-for="item in distanceOptions"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value"
                         />
                     </el-select>
-                    <el-select class="select-item" v-model="areaValue2" placeholder="服务类型">
+                    <el-select class="select-item" v-model="paramsPage.serviceType" placeholder="服务类型">
                         <el-option
-                            v-for="item in areaOptions2"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
+                            v-for="item in serviceTypeList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
                         />
                     </el-select>
                 </div>
@@ -156,6 +156,11 @@ const handleDetail = (item) => {
     router.push(`/expert_homepage?isStore=true&id=${item.id}`);
 };
 
+const paramsPage = ref({
+    serviceType: "",
+    distance:""
+})
+
 const agriculturalStoreList = ref([]);
 const getStoreList = (isInitial = true) => {
     const params = {
@@ -210,18 +215,17 @@ function handleLocationChange(data) {
 
 const cardContentHeight = ref(245);
 
-const areaValue = ref("");
-const areaOptions = [
+const distanceOptions = [
     { value: "1", label: "5km" },
     { value: "2", label: "3km" },
     { value: "3", label: "1km" },
 ];
-const areaValue2 = ref("");
-const areaOptions2 = [
-    { value: "1", label: "服务类型" },
-    { value: "2", label: "2" },
-    { value: "3", label: "3" },
-];
+const serviceTypeList = ref([
+    {id: "", name: "全部"},
+    {id: 1, name: "嫁接"},
+    {id: 2, name: "修剪"},
+    {id: 3, name: "施肥打药"},
+]);
 
 const cardContentRef = ref(null);
 const handleHeightChange = ({ height }) => {

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

@@ -111,7 +111,7 @@
                                 </template>
                             </el-dropdown>
                         </div>
-                        <upload v-show="pageType === 'NZ'" exampleImg :maxCount="1" class="upload-wrap" @handleUpload="handleUploadSuccess">
+                        <upload ref="uploadRef" v-show="pageType === 'NZ'" exampleImg :maxCount="1" class="upload-wrap" @handleUpload="handleUploadSuccess">
                             <div class="upload-btn">
                                 点击上传营业执照
                             </div>
@@ -153,6 +153,7 @@ import ServiceInfo from "@/components/pageComponents/ServiceInfo.vue";
 const route = useRoute();
 const router = useRouter();
 
+const uploadRef = ref(null);
 const serviceInfoRef = ref(null);
 const formRef = ref(null);
 const formData = ref({
@@ -275,6 +276,7 @@ onDeactivated(() => {
     machines.value.forEach(item => {
         item.selected = false;
     });
+    uploadRef.value && uploadRef.value.uploadReset();
 });
 </script>