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

src/components/AiEvaluation/AiEvaluation.vue

@@ -18,7 +18,7 @@
           <div v-html="detail.content"/>
         </AiItem>
         <AiItem label="附件" top-label>
-          <AiUploader :def="detail.files" disabled/>
+          <AiUploader :def="detail.files" disabled preview/>
         </AiItem>
       </AiGroup>
     </div>

src/components/AiImage/AiImage.vue

@@ -42,9 +42,6 @@ export default {
           uni.previewImage({
             current: this.image,
             urls: [this.image],
-            success() {
-              sessionStorage.setItem("previewImage", " 1")
-            }
           })
         } else {
           this.previewFile({size: 1, ...this.file})

src/components/pages/selectGird.vue

@@ -61,7 +61,7 @@ export default {
   methods: {
     getAllGrids() {
       this.selectList = []
-      let url = `/app/appgirdinfo/listByInfo`
+      let url = this.query.axiosUrl ? this.query.axiosUrl : `/app/appgirdinfo/listByInfo`
       this.$instance.post(url).then(res => {
         if (res?.data) {
           let parents = res.data?.map(e => e.parentGirdId)

src/project/wuxi/AppHome/AppHome.vue

@@ -102,7 +102,7 @@ export default {
     }
   },
   onReady() {
-    uni.setNavigationBarTitle({title: "东盛e家"})
+    uni.setNavigationBarTitle({title: "数字巫溪"})
   },
   onLoad() {
     this.autoLogin().then(() => {
@@ -239,7 +239,7 @@ export default {
 
   onShareAppMessage() {
     return {
-      title: '欢迎使用东盛e家~',
+      title: '欢迎使用数字巫溪~',
       path: `/pages/AppHome/AppHome`
     }
   },

src/project/wuxi/AppMine/AppMine.vue

@@ -175,7 +175,7 @@ export default {
   },
   onShareAppMessage() {
     return {
-      title: '欢迎使用数字乡村治理服务一体化平台~',
+      title: '欢迎使用数字巫溪治理服务一体化平台~',
       path: `/pages/AppModules/AppModules`
     }
   },

src/project/wuxi/AppPhotoReport/PhotoDetail.vue

@@ -103,6 +103,9 @@ export default {
   methods: {
     tabClick(index) {
       this.currentTab = index
+      if(!this.currentTab) {
+        this.getInfo()
+      }
     },
     getInfo() {
       this.$loading()

src/project/wuxi/AppPhotoReport/PhotoForm.vue

@@ -46,7 +46,7 @@
             <h2>所属网格</h2>
           </div>
           <div class="form-item__right">
-            <AiPagePicker type="gird" v-model="form.girdId" :params="{formType:2}" @select="handleSelectGrid" nodeKey="id">
+            <AiPagePicker type="gird" v-model="form.girdId" :params="{formType:2, axiosUrl:'/app/appgirdinfo/listAllByWuxi'}" @select="handleSelectGrid" nodeKey="id">
               <AiMore v-model="form.girdName"/>
             </AiPagePicker>
           </div>