From 142496beb3aad53eb247051ed707cb9a39de8dd0 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Mar 2023 09:10:07 +0800
Subject: [PATCH 1/5] =?UTF-8?q?6=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppHome/openPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/fengdu/AppHome/openPage.vue b/src/project/fengdu/AppHome/openPage.vue
index 3b947db..b68f396 100644
--- a/src/project/fengdu/AppHome/openPage.vue
+++ b/src/project/fengdu/AppHome/openPage.vue
@@ -29,7 +29,7 @@ export default {
               uni.switchTab({
                 url: '/pages/AppHome/AppHome'
               })
-            }, 2000)
+            }, 6000)
           }
         }
       })

From b7d30b366a70942cbd7e27d8f3f4258f3c322601 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Mar 2023 09:43:41 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BE=A4=E8=81=8A?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppWxworkQrcode/AppWxworkQrcode.vue       | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
index 7560444..0a18917 100644
--- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue
+++ b/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%;

From 2c69fc946b4d44c5df7ba1a5e09811efecb0c305 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Mar 2023 10:22:54 +0800
Subject: [PATCH 3/5] onShow

---
 src/project/fengdu/AppHome/openPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/fengdu/AppHome/openPage.vue b/src/project/fengdu/AppHome/openPage.vue
index b68f396..06a9b09 100644
--- a/src/project/fengdu/AppHome/openPage.vue
+++ b/src/project/fengdu/AppHome/openPage.vue
@@ -49,7 +49,7 @@ export default {
       })
     }
   },
-  onLoad() {
+  onShow() {
     this.getStatus()
   },
 }

From 9f6f44812e7590d5a506e891288c5388894ef090 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Mar 2023 10:35:37 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/utils/modules.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js
index 5e3d997..2486c22 100644
--- a/src/components/utils/modules.js
+++ b/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({

From 967c73f98acda212fae1135aa3d9a748c1db184a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Mar 2023 10:38:45 +0800
Subject: [PATCH 5/5] autoLogin

---
 src/project/fengdu/AppHome/AppHome.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue
index 322bfb3..d3407f0 100644
--- a/src/project/fengdu/AppHome/AppHome.vue
+++ b/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();