From 4ef1826180997bac879913bf17867bd3e390c29d Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期四, 28 三月 2024 09:24:46 +0800
Subject: [PATCH] 微信支付修改

---
 pages/cart/index.js |  102 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/pages/cart/index.js b/pages/cart/index.js
index 7d37d43..546e1c1 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -3,8 +3,10 @@
 import { getPublicImage } from '../../assets/js/middleGround/tool';
 import Toast from 'tdesign-miniprogram/toast/index';
 
+import { loginInfo } from '../../assets/js/login';
 Page({
   data: {
+    onDisabled: false,
     imgUrl: [],
     shoppingCartData: [],
     checkAll: false,
@@ -23,10 +25,18 @@
       title: '璐墿杞�'
     });
     this.shoppingCartGet();
+    console.log(this.data.shoppingCartData.length, 'this.data.shoppingCartData.length');
+
   },
   onShow() {
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().setData({
+        active: 3
+      })
+    }
     this.shoppingCartGet();
     this.setData({ totalPrice: 0.00, selectedCount: 0, checkAll: false, })
+
 
   },
   onDelete(e) {
@@ -35,7 +45,7 @@
       ids: [item.id]
     }).then(res => {
       this.shoppingCartGet();
-      wx.showToast({ title: '浣犵偣鍑讳簡鍒犻櫎', icon: 'none' });
+      wx.showToast({ title: '鍒犻櫎鍥句功鎴愬姛', icon: 'none' });
     });
   },
 
@@ -53,7 +63,7 @@
       })
 
       res.datas.forEach(item => {
-        console.log(item, 'item456');
+        // console.log(item, 'item456');
         item.imgUrl = getPublicImage(item.productMonWithLinkDto.product.icon, '', '160');
 
         this.setData({
@@ -65,8 +75,22 @@
       this.setData({
         shoppingCartData: res.datas
       });
+
+
+      if (this.data.shoppingCartData.length === 0) {
+        console.log(11111);
+        this.setData({
+          onDisabled: true
+        })
+      } else {
+        console.log(2222);
+        this.setData({
+          onDisabled: false
+        })
+      }
     });
     wx.stopPullDownRefresh()
+
   },
 
   bottomChange(e) {
@@ -116,33 +140,62 @@
       totalPrice: totalPrice.toFixed(2)
     });
   },
+
+
+
+
+
   goPaymentPage() {
-    const selectedItems = this.data.shoppingCartData.filter(item => item.checked);
-    // console.log(selectedItems, 789);
-    const selectedIds = selectedItems.map(item => item.id);
-    console.log('閫変腑鐨勫晢鍝� id:', selectedIds);
-    if (selectedIds.length) {
-      let data = {
-        linkIds: selectedIds
-      }
-      app.MG.store.shoppingCartCreateOrder(data).then(res => {
-        console.log(res, 456);
 
 
-        const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber
-        wx.navigateTo({
-          url
-        });
+    // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
+    // 妫�鏌ョ櫥褰曠姸鎬�
+    const token = wx.getStorageSync(app.config.tokenKey)
+    if (!token) {
+      loginInfo(app, (data) => {
+        // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+        if (data) {
+
+
+          const selectedItems = this.data.shoppingCartData.filter(item => item.checked);
+          // console.log(selectedItems, 789);
+          const selectedIds = selectedItems.map(item => item.id);
+          console.log('閫変腑鐨勫晢鍝� id:', selectedIds);
+          if (selectedIds.length) {
+            let data = {
+              linkIds: selectedIds
+            }
+            app.MG.store.shoppingCartCreateOrder(data).then(res => {
+              // console.log(res, 456);
+
+
+              const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber
+              wx.navigateTo({
+                url
+              });
+            })
+          } else {
+            Toast({
+              context: this,
+              selector: '#t-toast',
+              message: '璇烽�夋嫨鍟嗗搧',
+              theme: 'warning',
+              direction: 'column',
+            });
+          }
+        } else {
+          // 鍑虹幇閿欒锛岃繑鍥瀎alse
+        }
       })
     } else {
-      Toast({
-        context: this,
-        selector: '#t-toast',
-        message: '璇烽�夋嫨鍟嗗搧',
-        theme: 'warning',
-        direction: 'column',
-      });
+      // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
     }
+
+
+
+
+
+
   },
   onLogin() {
     wx.navigateTo({
@@ -165,7 +218,8 @@
         this.setData({
           isMore: false
         })
-      }, 100)
+        console.log('300');
+      }, 300)
 
     }
   },

--
Gitblit v1.9.1