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

src/project/fengdu/AppHome/AppHome.vue

@@ -21,13 +21,12 @@
       </div>
 
       <div class="card">
-        <img class="card-left" src="https://cdn.cunwuyun.cn/fengdu/img-fengshouyinhang.png" @click="$linkTo('/mods/newFarmerBank/newFarmerBank')" alt="">
+        <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/newFarmer/newFarmer')">
+          <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/helpEachOther/helpEachOther')">
+          <img src="https://cdn.cunwuyun.cn/fengdu/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('./mods/AppHelpEachOther/AppHelpEachOther')">
       </div>
       </div>
-      
       <AiLogin ref="login"/>
     </div>
   </div>
@@ -119,6 +118,7 @@ export default {
       })
     },
     handleClick({type, appId, modulePath, url, checkType, corpId}) {
+      if(this.user.areaId) {
         //先判读是不是系统应用
         if (type != "0") {
           if (type == "1") {
@@ -140,6 +140,16 @@ export default {
           uni.showLoading({title: '正在进入应用...'})
           this.authCheck({checkType, modulePath}).finally(() => uni.hideLoading())
         }
+      } else {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          uni.switchTab({ url: '/pages/AppMine/userInfo' })
+        }).catch(() => {
+        })
+      }
+      
     },
     handleBannerClick(index) {
       if (!this.swiperList[index].linkUrl) return
@@ -171,8 +181,6 @@ export default {
 .page {
   width: 100%;
   min-height: 100%;
-  // background-color: #F3F6F9;
-  // background: url('https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg2.png') no-repeat;
   position: relative;
 
   .container{

src/project/fengdu/AppMine/AppMine.vue

@@ -27,7 +27,7 @@
     <div class="approve">
       <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('/mods/AppAuth/AppAuth')"/>
+        <span class="cert" v-if="isApprove" v-text="approveLabel" @click="$linkTo('./userInfo')"/>
         <u-icon v-else name="arrow-right" color="#E7F2FF" size="28"
                 :label="approveLabel" label-color="#E7F2FF" label-pos="left" @click="approve"/>
       </div>
@@ -72,14 +72,14 @@ export default {
     listGroup() {
       return [
         [
+          // {
+          //   icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png",
+          //   label: "我的家乡",
+          //   path: "/mods/AppHometown/AppHometown",
+          //   type: 'token'
+          // },
           {
-            icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png",
+            icon: "https://cdn.cunwuyun.cn/fengdu/mdpi_icon-fengshouma.png",
-            label: "我的家乡",
-            path: "/mods/AppHometown/AppHometown",
-            type: 'token'
-          },
-          {
-            icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png",
             label: "我的丰收码",
             path: "./myHarvestQR",
             type: 'token'
@@ -88,7 +88,7 @@ export default {
             icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejifen.png",
             label: "我的积分",
             path: "/mods/AppCreditPoints/AppCreditPoints?type=detail",
-            type: 'idNumber'
+            type: 'null'
           },
         ],
         // [
@@ -144,6 +144,9 @@ export default {
               this.$linkTo(url)
             }
           }
+          if (type == 'null') {
+            this.$u.toast('内容建设中...')
+          }
         } else {
           this.$refs.login.show()
         }
@@ -205,8 +208,8 @@ export default {
     .header-info {
       width: 100%;
       height: 100%;
-      background: url("https://cdn.cunwuyun.cn/wxmp/sanjianxi/mineBg.png") no-repeat no-repeat;
+      background: url('https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg2.png') no-repeat;
-      background-size: 100% 100%;
+      background: 100% auto;
       box-sizing: border-box;
       padding: 240px 0 0 48px;
 

src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue

@@ -6,18 +6,13 @@
         <span v-else class="col-666">请选择</span>
         <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon>
       </AiSelect>
-      <div v-if="user.areaId" class="qrcode-content">
+      <div class="qrcode-content">
         <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>
       </div>
-      <div v-else class="qrcode-content flex column">
-        <div>请先去个人中心进行个人信息认证</div>
-        <div class="mar-t8 btn pad-v8 pad-h16" @click="goAuth">去实名</div>
-      </div>
-
       <div class="jionGroup">
         <!--  bind:startmessage='startmessage' @completemessage="completemessage" -->
         <cell url='https://wework.qpic.cn/wwpic/71159_FwGG4OEPQM6LxsZ_1679023053/0' class="join-btn">加入群聊</cell>