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 | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 95c0fe5..546e1c1 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -3,6 +3,7 @@
import { getPublicImage } from '../../assets/js/middleGround/tool';
import Toast from 'tdesign-miniprogram/toast/index';
+import { loginInfo } from '../../assets/js/login';
Page({
data: {
onDisabled: false,
@@ -139,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({
--
Gitblit v1.9.1