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

src/saas/AppAskForm/components/List.vue

@@ -109,6 +109,7 @@ export default {
       info: {},
       isMore: false,
       list: [],
+      linkUrl: '',
       isShow: false
     }
   },
@@ -136,6 +137,12 @@ export default {
       this.info = item
       this.id = item.id
       this.isShow = true
+
+      this.$http.post(`/app/appquestionnairetemplate/queryQrCode?id=${item.id}`).then(res => {
+        if (res.code == 0) {
+          this.linkUrl = res.data.linkUrl
+        }
+      })
     },
 
     toStop() {
@@ -159,35 +166,31 @@ export default {
       uni.showActionSheet({
         itemList: ['分享', '微信分享', '获取链接'],
         success: data => {
-          this.$http.post(`/app/appquestionnairetemplate/queryQrCode?id=${this.info.id}`).then(res => {
+          if (data.tapIndex === 2) {
-            if (res.code == 0) {
+            this.copy(this.linkUrl)
-              if (data.tapIndex === 2) {
+            this.isShow = false
-                this.copy(res.data.linkUrl)
+          }
+          if (data.tapIndex === 0 || data.tapIndex === 1) {
+            if (data.tapIndex === 0) {
+              this.wxInvoke(['shareAppMessage', {
+                title: this.info.title,
+                desc: this.info.tableExplain,
+                link: this.linkUrl,
+                imgUrl: this.info.headPicture
+              }, () => {
                 this.isShow = false
-              }
+              }])
-              if (data.tapIndex === 0 || data.tapIndex === 1) {
+            } else {
-                if (data.tapIndex === 0) {
+              this.wxInvoke(['shareWechatMessage', {
-                  this.wxInvoke(['shareAppMessage', {
+                title: this.info.title,
-                    title: this.info.title,
+                desc: this.info.tableExplain,
-                    desc: this.info.tableExplain,
+                link: this.linkUrl,
-                    link: res.data.linkUrl,
+                imgUrl: this.info.headPicture
-                    imgUrl: this.info.headPicture
+              }, () => {
-                  }, () => {
+                this.isShow = false
-                    this.isShow = false
+              }])
-                  }])
-                } else {
-                  this.wxInvoke(['shareWechatMessage', {
-                    title: this.info.title,
-                    desc: this.info.tableExplain,
-                    link: res.data.linkUrl,
-                    imgUrl: this.info.headPicture
-                  }, () => {
-                    this.isShow = false
-                  }])
-                }
-              }
             }
-          })
+          }
         }
       })
     },

src/saas/AppConflictMediation/SelectUser.vue

@@ -9,6 +9,7 @@
         <div v-if="treeList.length > 0">
           <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
             <div class="imges">
+              <span v-if="item.girdLevel == 1" style="width: 24px;"></span>
               <span v-if="item.girdLevel == 2">
                 <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
                 <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />

src/saas/AppWalkask/AppWalkask.vue

@@ -106,8 +106,7 @@ export default {
       this.getList()
     })
     uni.$on('updateList', () => {
-      this.current = 1
+      this.getListInit()
-      this.getList()
     })
   },
   onShow() {
@@ -121,8 +120,7 @@ export default {
       this.getList()
     },
     getList() {
-      this.$http
+      this.$http.post('/app/appvisitvondolence/list', null, {
-        .post('/app/appvisitvondolence/list', null, {
           params: {
             size: this.size,
             current: this.current,