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

src/mods/AppIntegralApply/add.vue

@@ -294,6 +294,13 @@ export default {
             margin-bottom: 32px;
           }
         }
+        .ai-uploader {
+          .item {
+            .info {
+              padding-left: 10px;
+            }
+          }
+        }
       }
 
       .line {

src/mods/AppServiceOnlineNew/serviceNotice.vue

@@ -3,7 +3,7 @@
     <h2>办理须知</h2>
     <div class="service-content">
       <u-parse :imageProp="imageProp" className="articalContent" :content="content" />
-      <!-- <div v-html="content" class="articalContent"></div> -->
+      <div v-html="content" class="articalContent"></div>
       <!-- <u-parse className="articalContent" :html="content"></u-parse> -->
     </div>
     <div class="service-btn" v-if="processType != 2" @click="toSubmit">我已阅读并同意</div>

src/mods/service/AppPhotoReport/PhotoForm.vue

@@ -206,16 +206,13 @@ export default {
       const column = e.detail.column
       const value = e.detail.value
 
-
+      if (column === 0) {
-      if (column === column) {
         this.getGirdData(value)
       }
     },
 
     onChange(e) {
-      console.log(e)
       const v = e.detail.value[1]
-      console.log(v)
       if (this.gridList[1][v]) {
         this.form.girdName = this.gridList[1][v].girdName
         this.form.girdId = this.gridList[1][v].id