Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev

src/components/utils/modules.js

@@ -62,7 +62,8 @@ export const user = {
       } else return Promise.reject("缺少登录code")
     },
     autoLogin({dispatch}, params = {nickName: '微信用户'}) {
-      return dispatch("getCode").then(code => dispatch("getToken", {...params, code})).then(() => dispatch('getUserInfo'))
+      const {loginWay = 'std'} = params
+      return dispatch("getCode").then(code => dispatch("getToken", {...params, code})).then(() => dispatch('getUserInfo', loginWay))
     },
     authCheck({state, dispatch, rootState}, {checkType, modulePath}) {
       //用于进入应用的权限判断
@@ -99,12 +100,18 @@ export const user = {
           return dispatch('autoLogin').then(() => dispatch('authCheck', { checkType, modulePath }));
         }
         if (!userInfo.areaId) {
-          this.$dialog.confirm({
+          return uni.showModal({
+            title: '温馨提示',
             content: '您只有完成信息认证后，才可进行相关操作。',
-            confirmText: '去认证'
-          }).then(() => {
-            uni.switchTab({ url: '/pages/AppMine/userInfo' })
-          }).catch(() => {
+            confirmText: '去认证',
+            success: (res)=> {
+              if (res.confirm) {
+                // console.log('用户点击确定');
+                uni.switchTab({ url: '/pages/AppMine/userInfo' })
+              } else if (res.cancel) {
+                // console.log('用户点击取消');
+              }
+            }
           })
         }
       }

src/project/fengdu/AppHome/AppHome.vue

@@ -23,8 +23,8 @@
       <div class="card">
         <img class="card-left" src="https://cdn.cunwuyun.cn/fengdu/img-fengshouyinhang.png" @click="$linkTo('/mods/AppNewFarmerBank/AppNewFarmerBank')" alt="">
         <div class="card-right">
-          <img src="https://cdn.cunwuyun.cn/fengdu/img-fengduxinnongren.png" alt="" @click="$linkTo('./mods/AppNewFarmer/AppNewFarmer')">
-          <img src="https://cdn.cunwuyun.cn/fengdu/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('./mods/AppHelpEachOther/AppHelpEachOther')">
+          <img src="https://cdn.cunwuyun.cn/fengdu/img-fengduxinnongren.png" alt="" @click="$linkTo('/mods/AppNewFarmer/AppNewFarmer')">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('/mods/AppHelpEachOther/AppHelpEachOther')">
       </div>
       </div>
       <AiLogin ref="login"/>

src/project/fengdu/AppMine/AppMine.vue

@@ -24,10 +24,10 @@
         </div>
       </div>
     </div>
-    <div class="approve">
+    <div class="approve" @click="$linkTo('./userInfo')">
       <img class="icon" src="https://cdn.cunwuyun.cn/wxmp/mine/approve.png" alt="">
       <div class="flex">
-        <span class="cert" v-if="isApprove" v-text="approveLabel" @click="$linkTo('./userInfo')"/>
+        <span class="cert" v-if="isApprove" v-text="approveLabel"></span>
         <u-icon v-else name="arrow-right" color="#E7F2FF" size="28"
                 :label="approveLabel" label-color="#E7F2FF" label-pos="left" @click="approve"/>
       </div>
@@ -65,9 +65,7 @@ export default {
       return this.user?.status == 2;
     },
     approveLabel() {
-      return this.user?.status == 2 ? "已认证" :
-          this.user?.status == 1 ? "审核中" :
-              this.user?.status == -1 ? "审核驳回" : "前往认证"
+      return this.user?.status == 2 ? "已认证" : "前往认证"
     },
     listGroup() {
       return [
@@ -180,8 +178,11 @@ export default {
       })
     },
   },
-  onShow() {
+  onLoad() {
     this.getAuth();
+    uni.$on('auth',()=> {
+      this.getAuth();
+    })
   },
   onShareAppMessage() {
     return {

src/project/fengdu/AppMine/userInfo.vue

@@ -152,7 +152,8 @@ export default {
       }).then(res=> {
         if(res?.code==0) {
           this.$u.toast('提交成功')
-          this.autoLogin()
+          this.autoLogin({ loginWay:'qujing'})
+          uni.$emit('auth')
           setTimeout(() => {
             uni.navigateBack()
           }, 600);

src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue

@@ -10,7 +10,7 @@
         <img :src="picUrl" class="qrcode-img" v-if="picUrl"/>
         <div v-else class="tips">
           <u-icon name="error-circle" color="#909399" size="34" style="display: inline"></u-icon>
-          <div class="col-666">请选择居民群</div>
+          <div class="col-666">请选择社群加入群聊</div>
         </div>
       </div>
       <div class="jionGroup">