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

src/project/fengdu/AppHome/openPage.vue

@@ -36,6 +36,7 @@ export default {
     },
     getList() {
       this.$instance.post('/app/appwechatguidepage/listForXCX',null, {
+        withoutToken: true,
         params: {
           current: 1,
           size: 100,

src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue

@@ -7,15 +7,18 @@
         <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon>
       </AiSelect>
       <div class="qrcode-content">
-        <img :src="picUrl" class="qrcode-img" v-if="picUrl"/>
+        <AiImage :src="picUrl" class="qrcode-img" v-if="picUrl" preview/>
         <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 class="jionGroup"> 
-        <cell class="group" @startmessage="startmessage" @completemessage="completemessage" 
+        长按识别二维码或扫码加入群聊
-        url='picUrl' v-if="picUrl"></cell>
+        <!-- 通过扫一扫加入、与通过插件加入只能选一种 -->
+        <!-- <cell class="group" @startmessage="startmessage" @completemessage="completemessage" 
+        url='picUrl' v-if="picUrl"></cell> -->
       </div>
 
       <div class="pic">
@@ -55,12 +58,6 @@ export default {
     }
   },
   methods: {
-    startmessage(i) {
-      console.log(i, 'startmessage');
-    },
-    completemessage(e) {
-      console.log(e, 'completemessage');
-    },
     getSelect() {
       const {areaId} = this.user
       areaId && this.$instance.post(`/app/wxcp/wxgroup/listByAreaId`, null, {
@@ -104,32 +101,29 @@ export default {
 
   .jionGroup {
     width: 100%;
-    height: 80px;
+    height: 40px;
-    line-height: 80px;
+    line-height: 40px;
     padding: 0 72px;
     box-sizing: border-box;
-
+    color: #666;
-    ::v-deep functional-page-navigator {
+    text-align: center;
-      width: 100%;
+    font-size: 28px;
-      height: 100%;
+    // ::v-deep functional-page-navigator {
-      text-align: center;
+    //   width: 100%;
-      background: #2D7DFF;
+    //   height: 100%;
-      border-radius: 40px;
+    //   text-align: center;
-      view {
+    //   background: #2D7DFF;
-        text {
+    //   border-radius: 40px;
-          color: #FFFFFF !important;
+    //   view {
-          margin: 0;
+    //     text {
-        }
+    //       color: #FFFFFF !important;
-        image {
+    //       margin: 0;
-          display: none;
+    //     }
-        }
+    //     image {
-      }
+    //       display: none;
-    }
+    //     }
-
+    //   }
-    .join-bg {
+    // }
-      background: #999999;
-      color: #333333;
-    }
   }
   ::v-deep .group_chat_icon {
     display: none;
@@ -151,13 +145,18 @@ export default {
       padding: 36px;
       box-sizing: border-box;
 
-      .qrcode-img {
+      ::v-deep AiImage {
         width: 100%;
         height: 100%;
+      }
+
+      ::v-deep .qrcode-img {
+        width: 470px;
+        height: 470px;
 
         image {
-          width: 100%;
+          width: 470px;
-          height: 100%;
+          height: 470px;
         }
       }
       .tips {