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

src/mods/wxwork/AppVillageInfo/AppVillageInfo.vue

@@ -15,22 +15,6 @@
           <div>请联系管理员添加</div>
         </div>
       </div>
-      <!-- <div class="user-content">
-        <div class="title">联村政干</div>
-        <div class="item">
-          <img src="https://cdn.cunwuyun.cn/dvcp/villgroup/group.png" alt="" class="user-img">
-          <div class="user-info">
-            <div class="item-line20 flex-b">
-              <div>余国明<span class="item-position">（组长）</span></div>
-              <div class="item-type">在岗</div>
-            </div>
-            <div class="item-line18 flex-b">
-              <div>上街组、建新组、后街组</div>
-              <div>13617896755</div>
-            </div>
-          </div>
-        </div>
-      </div> -->
     </div>
   </div>
 </template>
@@ -158,87 +142,6 @@ export default {
         }
       }
     }
-
-    .user-content {
-      padding: 16px 30px 64px;
-      width: 690px;
-      background: #FFF;
-      border-radius: 16px;
-      box-sizing: border-box;
-      margin-left: 30px;
-
-      .title {
-        line-height: 80px;
-        padding-left: 10px;
-        color: #333;
-        font-size: 32px;
-        font-weight: 500;
-      }
-
-      .item {
-        width: 100%;
-        padding: 28px 0 30px 0;
-        border-bottom: 2px solid #D8DDE6;
-
-        .user-img {
-          display: inline-block;
-          width: 72px;
-          height: 72px;
-          border-radius: 50%;
-          vertical-align: top;
-        }
-
-        .user-name-bg {
-          display: inline-block;
-          width: 72px;
-          height: 72px;
-          line-height: 72px;
-          text-align: center;
-          border-radius: 50%;
-          background-color: #4E8EEE;
-          color: #fff;
-          font-size: 24px;
-          vertical-align: top;
-        }
-
-        .user-info {
-          display: inline-block;
-          width: calc(100% - 72px);
-          padding-left: 16px;
-          box-sizing: border-box;
-
-          .flex-b {
-            display: flex;
-            justify-content: space-between;
-          }
-
-          .item-line20 {
-            line-height: 40px;
-            font-size: 28px;
-            color: #333;
-            margin-bottom: 8px;
-
-            .item-position {
-              color: #999;
-              font-size: 24px;
-            }
-
-            .item-type {
-              padding: 010px;
-              background: #E8EFFF;
-              color: #2266FF;
-              font-size: 24px;
-            }
-          }
-
-          .item-line18 {
-            line-height: 36px;
-            color: #666;
-            font-size: 26px;
-          }
-        }
-      }
-    }
   }
 }
 </style>

src/mods/wxwork/AppWxworkQrcode/AppWxworkQrcode.vue

@@ -1,24 +1,27 @@
 <template>
   <div class="AppWxworkQrcode">
-    <div class="header-content">
-      <img src="https://cdn.cunwuyun.cn/dvcp/villgroup/group.png" alt="" class="group-img">
-      <div class="group-name">{{ info.areaName || '' }}</div>
-      <p>已有{{ info.peopleNum || 0 }}户居民</p>
-      <img src="https://cdn.cunwuyun.cn/dvcp/villgroup/head.png" alt="" class="banner-img">
-      <div v-if="info.codeUrl" class="qrcode-content">
-        <AiImage :src="info.codeUrl" class="qrcode-img" preview/>
-        <div>长按识别二维码或扫码入群</div>
+    <div class="header">
+      <AiSelect v-model="id" :list="list" ></AiSelect>
+      <div v-if="user.areaId" class="qrcode-content">
+        <AiImage :src="list.codeUrl" class="qrcode-img" preview/>
       </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">
+        <div>加入群聊</div>
+      </div>
+
+      <div class="pic">
+        <img src="./mdpi_img-chongqing.png" alt="">
+      </div>
     </div>
   </div>
 </template>
 <script>
 import {mapState} from 'vuex'
-
 export default {
   name: "AppWxworkQrcode",
   appName: "居民社群",
@@ -27,20 +30,27 @@ export default {
   },
   data() {
     return {
-      info: {}
+      list: {},
+      id: '',
+      current: 0,
     }
   },
   onShow() {
-    this.getDetail()
+    this.getSelect()
   },
   methods: {
-    getDetail() {
+    getSelect() {
       const {areaId} = this.user
       areaId && this.$instance.post(`/app/wxcp/wxgroup/listByAreaId`, null, {
-        params: {areaId}
+        params: {
+          areaId: areaId,
+          current: this.current,
+          size: 3000,
+
+        }
       }).then(res => {
         if (res?.data) {
-          this.info = res.data
+          this.list = res.data.records
         }
       })
     },
@@ -58,60 +68,51 @@ export default {
 </script>
 <style scoped lang="scss">
 .AppWxworkQrcode {
-  width: 100vw;
-  height: auto;
-  padding-top: 30px;
-  background-color: #f3f6f9;
-  padding-bottom: 48px;
+  width: 100%;
+  height: 100%;
+  padding: 32px;
+  box-sizing: border-box;
 
-  .header-content {
-    padding: 40px 70px 56px;
-    width: 690px;
+  ::v-deep .AiSelect {
+    width: 100%;
+    text-align: center;
+    padding: 12% 72px 0;
+    box-sizing: border-box;
+  }
+
+  ::v-deep .AiSelect .display {
+    justify-content: center;
+  }
+
+  .jionGroup {
+    width: 100%;
+    height: 80px;
+    line-height: 80px;
+    padding: 0 72px;
+    box-sizing: border-box;
+    div {
+      text-align: center;
+      background: #2D7DFF;
+      color: #FFFFFF;
+      border-radius: 40px;
+    }
+  }
+
+  .header {
+    width: 100%;
+    height: 100%;
     background: #FFF;
     border-radius: 16px;
-    margin: 0 0 24px 30px;
-    box-sizing: border-box;
-
-    .group-img {
-      width: 92px;
-      height: 96px;
-      border-radius: 8px;
-      margin-bottom: 22px;
-    }
-
-    .group-name {
-      font-size: 36px;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #333;
-      line-height: 50px;
-      margin-bottom: 4px;
-    }
-
-    p {
-      font-size: 24px;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #999;
-      line-height: 34px;
-      margin-bottom: 38px;
-    }
-
-    .banner-img {
-      width: 100%;
-      height: 110px;
-    }
 
     .qrcode-content {
-      width: 100%;
-      height: 592px;
+      width: 542px;
+      height: 542px;
+      margin: 10% auto 10%;
       background: #F6F9FF;
       border-radius: 12px;
-      border: 2px solid #E6EEFF;
-      padding: 56px 66px;
+      border: 4px solid #E6EEFF;
+      padding: 36px;
       box-sizing: border-box;
-      margin-top: -8px;
-      justify-content: center;
 
       ::v-deep .qrcode-img {
         width: 420px;
@@ -139,5 +140,14 @@ export default {
       }
     }
   }
+  .pic {
+    margin-top: 10%;
+    width: 100%;
+    height: 266px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
 }
 </style>

src/project/fengdu/AppMine/userInfo.vue

@@ -153,8 +153,10 @@ export default {
           this.autoLogin()
           setTimeout(() => {
             uni.navigateBack()
-          }, 500);
+          }, 600);
         }
+      }).catch(err=> {
+        this.$u.toast(err.msg)
       })
     },
     upLoad(img) {