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

src/components/utils/modules.js

@@ -97,7 +97,7 @@ export const user = {
         uni.navigateTo({url: modulePath});
       } else if (checkType == 4) {
         if (!token) {
-          return dispatch('autoLogin').then(() => dispatch('authCheck', { checkType, modulePath }));
+          return dispatch('autoLogin', { loginWay: 'qujing' }).then(() => dispatch('authCheck', { checkType, modulePath }));
         }
         if (!userInfo.areaId) {
           return uni.showModal({

src/project/fengdu/AppHome/AppHome.vue

@@ -70,7 +70,7 @@ export default {
     uni.setNavigationBarTitle({title: "丰收号"})
   },
   onLoad() {
-    this.autoLogin().then(() => {
+    this.autoLogin({ loginWay: 'qujing' }).then(() => {
       this.getSwiperList();
       this.getGrids();
       this.getNotice();

src/project/fengdu/AppHome/openPage.vue

@@ -29,7 +29,7 @@ export default {
               uni.switchTab({
                 url: '/pages/AppHome/AppHome'
               })
-            }, 2000)
+            }, 6000)
           }
         }
       })
@@ -49,7 +49,7 @@ export default {
       })
     }
   },
-  onLoad() {
+  onShow() {
     this.getStatus()
   },
 }

src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue

@@ -14,7 +14,8 @@
         </div>
       </div>
       <div class="jionGroup"> 
-        <cell @startmessage="startmessage" @completemessage="completemessage" url='https://wework.qpic.cn/wwpic/71159_FwGG4OEPQM6LxsZ_1679023053/0' ></cell>
+        <cell class="group" @startmessage="startmessage" @completemessage="completemessage" 
+        url='picUrl' v-if="picUrl"></cell>
       </div>
 
       <div class="pic">
@@ -55,10 +56,10 @@ export default {
   },
   methods: {
     startmessage(i) {
-      console.log(i);
+      console.log(i, 'startmessage');
     },
     completemessage(e) {
-      console.log(e);
+      console.log(e, 'completemessage');
     },
     getSelect() {
       const {areaId} = this.user
@@ -116,13 +117,22 @@ export default {
     line-height: 80px;
     padding: 0 72px;
     box-sizing: border-box;
-    ::v-deep cell .wrapper {
+
+    ::v-deep functional-page-navigator {
       width: 100%;
       height: 100%;
       text-align: center;
       background: #2D7DFF;
-      color: #FFFFFF;
       border-radius: 40px;
+      view {
+        text {
+          color: #FFFFFF !important;
+          margin: 0;
+        }
+        image {
+          display: none;
+        }
+      }
     }
 
     .join-bg {
@@ -130,6 +140,9 @@ export default {
       color: #333333;
     }
   }
+  ::v-deep .group_chat_icon {
+    display: none;
+  }
 
   .header {
     width: 100%;