From 437634b6c3f4fb1fd05a64f62feb0d8501e0360d Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期五, 29 三月 2024 16:03:20 +0800 Subject: [PATCH] yangshi --- pages/cart/index.js | 119 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 90 insertions(+), 29 deletions(-) diff --git a/pages/cart/index.js b/pages/cart/index.js index df1d933..6307aa3 100644 --- a/pages/cart/index.js +++ b/pages/cart/index.js @@ -1,7 +1,13 @@ const app = getApp(); // import { getPublicImage } from '@/assets/js/middleGround/tool.js' -import { getPublicImage } from '../../assets/js/middleGround/tool'; +import { + loginInfo +} from '../../assets/js/login'; +import { + getPublicImage +} from '../../assets/js/middleGround/tool'; import Toast from 'tdesign-miniprogram/toast/index'; + Page({ data: { @@ -34,7 +40,11 @@ }) } this.shoppingCartGet(); - this.setData({ totalPrice: 0.00, selectedCount: 0, checkAll: false, }) + this.setData({ + totalPrice: 0.00, + selectedCount: 0, + checkAll: false, + }) }, @@ -44,7 +54,10 @@ ids: [item.id] }).then(res => { this.shoppingCartGet(); - wx.showToast({ title: '鍒犻櫎鍥句功鎴愬姛', icon: 'none' }); + wx.showToast({ + title: '鍒犻櫎鍥句功鎴愬姛', + icon: 'none' + }); }); }, @@ -107,7 +120,9 @@ }, HandelItemChange(e) { - const { item } = e.target.dataset; + const { + item + } = e.target.dataset; const items = this.data.shoppingCartData items.map(eitem => { if (eitem.id == item.id) { @@ -139,33 +154,75 @@ 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 => { + 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', - }); + 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 => { + const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber + wx.navigateTo({ + url + }); + }) + } else { + Toast({ + context: this, + selector: '#t-toast', + message: '璇烽�夋嫨鍟嗗搧', + theme: 'warning', + direction: 'column', + }); + } } + + + }, onLogin() { wx.navigateTo({ @@ -188,7 +245,8 @@ this.setData({ isMore: false }) - }, 100) + console.log('300'); + }, 300) } }, @@ -196,10 +254,13 @@ onPullDownRefresh() { this.setData({ - start: 1 + start: 1, + checkAll: false, + selectedCount: 0, + totalPrice: 0.00, }) console.log(978); this.shoppingCartGet() }, -}); +}); \ No newline at end of file -- Gitblit v1.9.1