From 52972fbe937b499d4fbb1b582ae49d6d1f3872e9 Mon Sep 17 00:00:00 2001 From: hflllll Date: Sat, 10 May 2025 14:34:48 +0800 Subject: [PATCH] =?UTF-8?q?4.5=E6=AC=A1=E7=9A=84=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 - components/order/OrderItem.vue | 18 ++++----- components/product/productItem.vue | 11 ------ mixins/list.js | 2 - pages/index/cart.vue | 61 ++++++----------------------- pages/index/category.vue | 29 +++++++------- pages_order/components/order/placeOrder.vue | 2 +- pages_order/mine/share.vue | 4 +- pages_order/order/newOrderDetail.vue | 6 +-- pages_order/product/productDetail.vue | 36 +++++++---------- store/store.js | 13 +++++- 11 files changed, 68 insertions(+), 115 deletions(-) diff --git a/App.vue b/App.vue index 6a8e8f6..113427f 100644 --- a/App.vue +++ b/App.vue @@ -2,7 +2,6 @@ export default { onLaunch: function() { this.$store.commit('initConfig') - this.$store.commit('getCategoryList') // 注释掉token检查，允许未登录用户访问所有页面 // if(uni.getStorageSync('token')){ diff --git a/components/order/OrderItem.vue b/components/order/OrderItem.vue index 9b75e46..be8d38f 100644 --- a/components/order/OrderItem.vue +++ b/components/order/OrderItem.vue @@ -33,23 +33,23 @@ - - 全力奔跑中，请耐心等待哦！ - 您的餐点已送到取餐点，请尽快取餐 + v-if="order.status === '2' || order.status === '3'" + :style="{ backgroundColor: order.status === '2' ? '#ECFEF4' : '#FFDBDB', color: order.status === '2' ? '#019245' : '#FF2A2A' }"> + + 全力奔跑中，请耐心等待哦！ + 您的餐点已送到取餐点，请尽快取餐 - + 取消订单 - + 立即下单 - 查看订单 - + 订单售后 diff --git a/components/product/productItem.vue b/components/product/productItem.vue index 5385e3c..b629533 100644 --- a/components/product/productItem.vue +++ b/components/product/productItem.vue @@ -143,17 +143,6 @@ methods: { // 购买商品(创建订单) purchase() { - // this.$api('createOrder', { - // id - // }, res => { - // if (res.code == 200) { - // res.result.num = 1 - // this.$store.commit('setPayOrderProduct', [ - // res.result - // ]) - // this.$utils.navigateTo('/pages_order/order/createOrder') - // } - // }) this.$emit('purchase') }, // 加入购物车 diff --git a/mixins/list.js b/mixins/list.js index 149d26b..23f67fb 100644 --- a/mixins/list.js +++ b/mixins/list.js @@ -64,8 +64,6 @@ export default { success(res.result) // 更新列表数据 this[this.mixinsListKey || 'list'] = res.result.records || res.result - // 输出获得的分类列表 - console.log('这是你获得的分类商品',this.list); // 更新总数 this.total = res.result.total || res.result.length diff --git a/pages/index/cart.vue b/pages/index/cart.vue index 5fb240b..ae70ad3 100644 --- a/pages/index/cart.vue +++ b/pages/index/cart.vue @@ -4,7 +4,7 @@ {{ isManaged ? '退出管理' : '管理' }} - + @@ -70,8 +70,8 @@ diff --git a/pages_order/components/order/placeOrder.vue b/pages_order/components/order/placeOrder.vue index 826fd94..aaeef5b 100644 --- a/pages_order/components/order/placeOrder.vue +++ b/pages_order/components/order/placeOrder.vue @@ -89,7 +89,7 @@ - + diff --git a/pages_order/mine/share.vue b/pages_order/mine/share.vue index e7af07b..383614f 100644 --- a/pages_order/mine/share.vue +++ b/pages_order/mine/share.vue @@ -64,7 +64,7 @@ export default { this.$api('getInviteCode', {}, res => { if(res.code == 200){ console.log('获取邀请二维码', res); - this.shareData = res.data + this.shareData = res.result } }) }, @@ -136,7 +136,7 @@ export default { return { title: `邀请您使用敢为人鲜小程序，邀请码: 666`, path: `/pages/index/index?inviteCode=666`, - imageUrl: this.shareData.qrCodeImage, + imageUrl: this.shareData.url, success: () => { uni.showToast({ title: '分享成功', diff --git a/pages_order/order/newOrderDetail.vue b/pages_order/order/newOrderDetail.vue index a912133..cf80c68 100644 --- a/pages_order/order/newOrderDetail.vue +++ b/pages_order/order/newOrderDetail.vue @@ -98,12 +98,12 @@ - + 微信支付 - + - + 账户余额(余额: ￥{{ userInfo.balance }}) diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index 8988629..41fa106 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -120,7 +120,7 @@ - + @@ -152,8 +152,7 @@ onLoad(args) { this.id = args.id this.getGoodsDetail() - if (args.open === 'true') - this.submit() + if (args.open === 'true') this.submit() }, onShow() { }, @@ -164,29 +163,24 @@ }, // 加入购物车 addCart(){ - this.$api('addCart', { - shopId : this.id, - num : 1, - }, - res => { - if(res.code == 200){ + + uni.showLoading({ + title: '加载中...' + }) + this.$api('addShopcar', { + goodsId: this.id, + num: 1, + }, res => { + uni.hideLoading() + if (res.code == 200) { uni.showToast({ title: '加入购物车成功', - icon: 'success' - }) - }else{ - uni.showToast({ - title: '加入购物车失败', - icon: 'error' + icon: 'success', + duration: 1000 }) } - }, - error => { - uni.showToast({ - title: '加入购物车失败', - icon: 'error' - }) }) + }, // 立即下单 submit() { diff --git a/store/store.js b/store/store.js index ebb038e..4ebf75a 100644 --- a/store/store.js +++ b/store/store.js @@ -12,6 +12,7 @@ const store = new Vuex.Store({ configList: {}, //配置列表 userInfo: {}, //用户信息 levelInfo: {}, //团员等级信息 + cartData: [], //购物车数据 riceInfo: {}, //用户相关信息 category: [], //分类信息 payOrderProduct: [], //支付订单中的商品 @@ -187,10 +188,14 @@ const store = new Vuex.Store({ }) }, // 查询分类接口 - getCategoryList(state) { - api('queryCategoryList', { }, res => { + getCategoryList(state, fn) { + api('queryCategoryList', { + pageNo: 1, + pageSize: 9999, + }, res => { if (res.code == 200) { state.category = res.result.records + fn && fn(state.category) } }) }, @@ -201,6 +206,10 @@ const store = new Vuex.Store({ setPromotionUrl(state, data){ state.promotionUrl = data }, + // 设置购物车数据 + setCartData(state, data){ + state.cartData = data + }, }, actions: {}, })