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

src/project/fengdu/AppHome/AppHome.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page">
     <u-navbar :is-back="false" title="首页" title-color="#000" title-width="300" title-size="32" :background="backgroundNavbar" :title-bold="true"></u-navbar>
+    <div class="container">
       <div class="swiper-content">
         <u-swiper :list="swiperList" mode="none" height="240" bg-color="none" @click="handleBannerClick"/>
       </div>
@@ -26,8 +27,10 @@
           <img src="https://cdn.cunwuyun.cn/fengdu/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('./mods/helpEachOther/helpEachOther')">
       </div>
       </div>
+      
       <AiLogin ref="login"/>
     </div>
+  </div>
 </template>
 <script>
 import {mapActions, mapState} from 'vuex'
@@ -45,7 +48,8 @@ export default {
       notices: [],
       search: {areaId: ''},
       backgroundNavbar: {
-        background: '#FFF'
+        background: 'url(https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg1.png) no-repeat',
+        backgroundSize: '100% auto',
       }
     }
   },
@@ -168,14 +172,18 @@ export default {
   width: 100%;
   min-height: 100%;
   // background-color: #F3F6F9;
-  // background: url('./img/img-bg2.png') no-repeat;
+  // background: url('https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg2.png') no-repeat;
   position: relative;
+
+  .container{
+    background: url('https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg2.png') no-repeat;
+    background: 100% auto;
     .swiper-content {
       width: 100%;
       height: 292px;
       padding: 20px 32px 32px;
       box-sizing: border-box;
-    background: #FFF;
+      // background: 'url(https://cdn.cunwuyun.cn/fengdu/img-bg2) no-repeat',;
     }
 
     .grid-content {
@@ -245,5 +253,6 @@ export default {
         }
       }
     }
+  }
 }
 </style>

src/project/fengdu/AppHome/openPage.vue

@@ -1,24 +1,39 @@
 <template>
   <div class="openPage">
-    <img class="images" src="./img/kaiping3.png" alt="">
+    <img class="images" :src="picUrl" alt="">
   </div>
 </template>
 
 <script>
 export default {
   name: "openPage",
-  appName: "openPage",
   customNavigation: true,
   data() {
     return {
-
+      picUrl: '',
     }
   },
   methods: {
-
+    getList() {
+      this.$instance.post('/app/appwechatguidepage/listForXCX',null, {
+        params: {
+          current: 1,
+          size: 100,
+        }
+      }).then(res=> {
+        if(res?.data) {
+          this.picUrl = res.data.records[0].picUrl
+        }
+      })
+    }
   },
-  onShow() {
+  onLoad() {
-
+    this.getList()
+    setTimeout(()=> {
+      uni.switchTab({
+        url: '/pages/AppHome/AppHome'
+      })
+    }, 2000)
   },
 }
 </script>

src/project/fengdu/AppMine/myHarvestQR.vue

@@ -4,14 +4,15 @@
     :background="backgroundNavbar" :title-bold="true"></u-navbar>
     <div class="card">
       <div class="myself">
-        <img class="avatar" src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="">
+        <img class="avatar" :src="user.avatarUrl" alt="" v-if="user.avatarUrl">
+        <img class="avatar" src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="" v-else>
         <div class="info">
-          <div class="name">百里守约</div>
+          <div class="name">{{ user.nickName }}</div>
-          <div class="area">百地社区</div>
+          <div class="area">{{ user.areaName }}</div>
         </div>
       </div>
       <div class="qr">
-        <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="">
+        <img :src="qrCode" alt="">
       </div>
 
       <div class="my-qr">我的丰收码</div>
@@ -24,6 +25,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: "AppHarvestQR",
   appName: '丰收码',
@@ -32,14 +34,25 @@ export default {
     return {
       backgroundNavbar: {
         background: '#FFF'
-      }
+      },
+      qrCode: '',
     }
   },
   methods: {
-
+    getQrCode() {
+      this.$instance.post('/app/appwechatuserqujing/queryMyQrCode').then(res=> {
+        if(res?.data) {
+          this.qrCode = res.data
+        }
+      })
+    }
   },
-  onShow() {
+  computed: {
+    ...mapState(['user'])
   },
+  onLoad() {
+    this.getQrCode()
+  }
 }
 </script>
 
@@ -51,7 +64,6 @@ export default {
     width: 100%;
     height: 100%;
     box-sizing: border-box;
-    background: #FFF;
     border-radius: 16px;
 
     .myself {

src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue

@@ -7,7 +7,8 @@
         <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon>
       </AiSelect>
       <div v-if="user.areaId" class="qrcode-content">
-        <img :src="picUrl" class="qrcode-img" v-if="picUrl"/>
+        <cell :url='picUrl' v-if="picUrl" class="qrcode-img"/>
+        <!-- <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>
@@ -19,6 +20,7 @@
       </div>
 
       <div class="jionGroup">
+        
         <div>加入群聊</div>
       </div>