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

src/project/fengdu/AppHome/AppHome.vue

@@ -20,10 +20,10 @@
     </div>
 
     <div class="card">
-      <img class="card-left" src="./img/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/newFarmerBank/newFarmerBank')" alt="">
       <div class="card-right">
-        <img src="./img/img-fengduxinnongren.png" alt="" @click="$linkTo('./mods/newFarmer/newFarmer')">
+        <img src="https://cdn.cunwuyun.cn/fengdu/img-fengduxinnongren.png" alt="" @click="$linkTo('./mods/newFarmer/newFarmer')">
-        <img src="./img/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('./mods/helpEachOther/helpEachOther')">
+        <img src="https://cdn.cunwuyun.cn/fengdu/ic-jiaoyuhuzhu.png" alt="" @click="$linkTo('./mods/helpEachOther/helpEachOther')">
     </div>
     </div>
     <AiLogin ref="login"/>

src/project/fengdu/AppMine/myHarvestQR.vue

@@ -17,7 +17,7 @@
       <div class="my-qr">我的丰收码</div>
 
       <div class="pic">
-        <img src="./img-zhuangshi.png" alt="">
+        <img src="https://cdn.cunwuyun.cn/fengdu/img-zhuangshi.png" alt="">
       </div>
     </div>
   </div>

src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue

@@ -1,12 +1,20 @@
 <template>
   <div class="AppWxworkQrcode">
     <div class="header">
-      <AiSelect v-model="id" :list="list" ></AiSelect>
+      <AiSelect v-model="id" :list="dictList" @selected="selectBtn">
+        <span class="label" v-if="id">{{ dictList[id].label }}</span>
+        <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">
-        <AiImage :src="list.codeUrl" class="qrcode-img" preview/>
+        <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>请先去个人中心进行个人信息认证</div>
         <div class="mar-t8 btn pad-v8 pad-h16" @click="goAuth">去实名</div>
       </div>
 
@@ -15,7 +23,7 @@
       </div>
 
       <div class="pic">
-        <img src="./mdpi_img-chongqing.png" alt="">
+        <img src="https://cdn.cunwuyun.cn/fengdu/mdpi_img-chongqing.png" alt="">
       </div>
     </div>
   </div>
@@ -30,15 +38,29 @@ export default {
   },
   data() {
     return {
-      list: {},
+      dictList: [],
       id: '',
       current: 0,
+      list: [],
+      picUrl: '',
     }
   },
   onShow() {
     this.getSelect()
   },
+  watch: {
+    id: {
+      handler(v) {
+        if(v) {
+          this.picUrl = this.list.filter(i=> i.id == v)[0].qrCode
+        }
+      }
+    }
+  },
   methods: {
+    selectBtn(e) {
+      console.log(e);
+    },
     getSelect() {
       const {areaId} = this.user
       areaId && this.$instance.post(`/app/wxcp/wxgroup/listByAreaId`, null, {
@@ -51,6 +73,12 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.list = res.data.records
+          this.dictList = res.data.records.map(e=> {
+            return {
+              value: e.id,
+              label: e.name
+            }
+          })
         }
       })
     },
@@ -114,16 +142,19 @@ export default {
       padding: 36px;
       box-sizing: border-box;
 
-      ::v-deep .qrcode-img {
+      .qrcode-img {
-        width: 420px;
+        width: 100%;
-        height: 420px;
+        height: 100%;
-        margin-bottom: 24px;
 
         image {
-          width: 420px;
+          width: 100%;
-          height: 420px;
+          height: 100%;
         }
       }
+      .tips {
+        margin-top: 200px;
+      }
+      
 
       div {
         font-size: 26px;
@@ -149,5 +180,8 @@ export default {
       height: 100%;
     }
   }
+  .col-666 {
+    color: #666;
+  }
 }
 </style>