Merge remote-tracking branch 'origin/dev' into dev

src/mods/AppServiceOnlineNew/serviceForm.vue

@@ -65,6 +65,7 @@
           </div> -->
 
           <view v-for="(field, i) in item" :key="i">
+            <!-- 0 或 1 输入框 -->
             <div class="form-item" v-if="field.fieldDataType === '1' || field.fieldDataType === '0'">
               <div class="form-title">
                 <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>
@@ -74,11 +75,14 @@
                 <input placeholder="请输入" :maxlength="field.fieldLength ? field.fieldLength : -1" v-model="field.fieldValue" :type="field.fieldDataType === '0' ? 'number' : 'text'" />
               </div>
             </div>
+
+            <!-- 4 单选 -->
             <div class="form-item" v-if="field.fieldDataType === '4'">
               <div class="form-title">
                 <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>
                 <span>{{ field.fieldName }}</span>
               </div>
+
               <div class="form-check">
                 <u-radio-group v-model="field.fieldValue">
                   <u-radio v-for="(dict, j) in $dict.getDict(field.dictionaryCode)" :key="j" :name="dict.dictValue">
@@ -87,6 +91,8 @@
                 </u-radio-group>
               </div>
             </div>
+
+            <!-- 5多选 -->
             <div class="form-item" v-if="field.fieldDataType === '5'">
               <div class="form-title">
                 <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>
@@ -139,6 +145,7 @@
               </div>
             </div>
 
+            <!-- 9单下拉框 -->
             <div class="form-item" v-if="field.fieldDataType === '9'">
               <div class="form-title">
                 <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>

src/mods/AppServiceOnlineNew/serviceResult.vue

@@ -13,12 +13,11 @@
 
 <script>
 export default {
-  appName: "加载中...",
+  appName: '加载中...',
   data() {
     return {}
   },
-
-  onLoad(query) {
+  onshow(query) {
     uni.setNavigationBarTitle({
       title: query.title,
     })

src/mods/AppVillageActivity/AppVillageActivity.vue

@@ -60,7 +60,8 @@ export default {
           params: {
             current: this.current,
             size: 15,
-            areaId: uni.getStorageSync('areaId'),
+            // areaId: uni.getStorageSync('areaId'),
+            areaId: this.$areaId,
           },
         })
         .then((res) => {