From 96b0b8bb1597d825004f5a8da0728c48b6ce7dba Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 27 三月 2025 15:22:22 +0800
Subject: [PATCH] 首页登录去除侧式

---
 pages/home/home.js |  117 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index 106412b..c8077fd 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -77,17 +77,17 @@
     // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
     // 妫�鏌ョ櫥褰曠姸鎬�
     const token = wx.getStorageSync(app.config.tokenKey)
-    if (!token) {
-      loginInfo(app, (data) => {
-        // 濡傛灉涓嶆槸绗竴娆$櫥褰曪紝浼氭墽琛屽洖璋�
-        if (data) {
-          this.init();
-          this.registe()
-        } else {
-          this.init();
-        }
-      })
-    }
+    // if (!token) {
+    //   loginInfo(app, (data) => {
+    //     // 濡傛灉涓嶆槸绗竴娆$櫥褰曪紝浼氭墽琛屽洖璋�
+    //     if (data) {
+    //       this.init();
+    //       this.registe()
+    //     } else {
+    //       this.init();
+    //     }
+    //   })
+    // }
 
   },
   onReachBottom() {},
@@ -532,57 +532,66 @@
       })
     })
   },
-  async addCart(e) {
+  addCart(e) {
     const {
       info
     } = e.currentTarget.dataset;
-    if (wx.getStorageSync(app.config.tokenKey)) {
-      if (info.isbuy) {
-        wx.showToast({
-          title: "璇ュ晢鍝佸凡璐拱",
-          icon: 'none',
-          duration: 1000
+    const token = wx.getStorageSync(app.config.tokenKey)
+    if (token) {
+      this.addCartFun(info)
+    } else {
+      if (!token) {
+        loginInfo(app, (data) => {
+          // 濡傛灉涓嶆槸绗竴娆$櫥褰曪紝浼氭墽琛屽洖璋�
+          if (data) {
+            this.addCartFun(info)
+            this.registe()
+          } else {
+            this.addCartFun(info)
+          }
         })
-      } else {
-        let query = {
-          start: 0,
-          size: 999,
-          filterList: [],
-          searchList: []
-        }
-        try {
-          if (
-            this.data.shoppingCartGetId.includes(
-              info.defaultSaleMethodId
-            )
-          ) {
-            wx.showToast({
-              title: "璇ュ晢鍝佸凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
-              icon: 'none',
+      }
+    }
+  },
+  // 鍓ョ鍔犲叆璐墿杞︽柟娉曠櫥闄嗗墠鍚庡叕鐢�
+  addCartFun(info) {
+    if (info.isbuy) {
+      wx.showToast({
+        title: "璇ュ晢鍝佸凡璐拱",
+        icon: 'none',
+        duration: 1000
+      })
+    } else {
+      try {
+        if (
+          this.data.shoppingCartGetId.includes(
+            info.defaultSaleMethodId
+          )
+        ) {
+          wx.showToast({
+            title: "璇ュ晢鍝佸凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
+            icon: 'none',
+            duration: 1000
+          })
+        } else {
+          let query = {
+            requests: [{
+              saleMethodId: info.defaultSaleMethodId,
+              storeEventId: null,
+              agentCode: '鐢靛瓙涔�'
+            }]
+          }
+          app.MG.store.addShoppingCart(query).then(res => {
+            if (res) wx.showToast({
+              title: "娣诲姞鎴愬姛",
+              icon: 'success',
               duration: 1000
             })
-          } else {
-            let query = {
-              requests: [{
-                saleMethodId: info.defaultSaleMethodId,
-                storeEventId: null,
-                agentCode: '鐢靛瓙涔�'
-              }]
-            }
-            const addRes = await app.MG.store.addShoppingCart(query)
-            if (addRes) {
-              wx.showToast({
-                title: "娣诲姞鎴愬姛",
-                icon: 'success',
-                duration: 1000
-              })
-            }
             this.getShoppingCartList()
-          }
-
-        } catch (error) {
-          console.error('鍑洪敊浜嗭細', error)
+          })
         }
+      } catch (error) {
+        console.error('鍑洪敊浜嗭細', error)
       }
     }
   },

--
Gitblit v1.9.1