From 91d22d5e7d839ebec9bfe91d855a0a0a13f49104 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Mon, 27 May 2024 16:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 14 ++ pages/member/1.png | Bin 0 -> 3066 bytes pages/member/billDetails.vue | 100 ++++++++ pages/member/index.vue | 8 +- pages/member/list.vue | 3 +- pages/member/memberdetails.vue | 375 ++++++++++++++++++++++++++++ pages/order/successful.vue | 2 +- pages/order_detail/order_detail.vue | 13 +- pages/product/placeOrder.vue | 34 +-- 9 files changed, 521 insertions(+), 28 deletions(-) create mode 100644 pages/member/1.png create mode 100644 pages/member/billDetails.vue create mode 100644 pages/member/memberdetails.vue diff --git a/pages.json b/pages.json index 607816b..1dbad33 100644 --- a/pages.json +++ b/pages.json @@ -231,6 +231,20 @@ "style": { "navigationBarTitleText": "订单详情" } + }, + { + "path" : "pages/member/memberdetails", + "style" : + { + "navigationBarTitleText" : "会员卡" + } + }, + { + "path" : "pages/member/billDetails", + "style" : + { + "navigationBarTitleText" : "账单明细" + } } ], "globalStyle": { diff --git a/pages/member/1.png b/pages/member/1.png new file mode 100644 index 0000000000000000000000000000000000000000..9c4ec8bdbfe6f2547cfef7b405df457ef994a830 GIT binary patch literal 3066 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 + + + + + 充值金额 + 12 + + + 剩余次数（次） + 12 + + + + + 充值 + + + + 消费 + + + + + + + 阿什顿 + 阿什顿 + 阿什顿 + + + + + + + + \ No newline at end of file diff --git a/pages/member/index.vue b/pages/member/index.vue index a815054..ca0f6c5 100644 --- a/pages/member/index.vue +++ b/pages/member/index.vue @@ -49,13 +49,13 @@ } }, onLoad(e) { - console.log(e,'调试') + console.log(e,'调试2') if (e.type == 'list') {//从列表进来的 this.paygetShopByMember(e.shopId_id) }else{ this.paygetShopByMember(e.shopId_id) } - this.paygetActive() //列表 + this.paygetActive(e.shopId_id) //列表 }, methods: { async paygetShopByMember(w) { @@ -67,9 +67,9 @@ }) this.userInfo = res.data.list[0] }, - async paygetActive() { + async paygetActive(shopid) { let res = await this.api.paygetActive({ - shopId: uni.cache.get('shopUser'), + shopId:shopid, page: 1, pageSize: 10 }) diff --git a/pages/member/list.vue b/pages/member/list.vue index 2756d75..e918ceb 100644 --- a/pages/member/list.vue +++ b/pages/member/list.vue @@ -79,7 +79,8 @@ } }, eeInfo(item) { - uni.pro.navigateTo('member/index',{ + console.log(item,'调试123123') + uni.pro.navigateTo('member/memberdetails',{ shopId_id:item.shopId, type:'list' }) diff --git a/pages/member/memberdetails.vue b/pages/member/memberdetails.vue new file mode 100644 index 0000000..086b18e --- /dev/null +++ b/pages/member/memberdetails.vue @@ -0,0 +1,375 @@ + + + + + \ No newline at end of file diff --git a/pages/order/successful.vue b/pages/order/successful.vue index 1409dc7..5ea8ec5 100644 --- a/pages/order/successful.vue +++ b/pages/order/successful.vue @@ -91,7 +91,7 @@ const hour = date.getHours(); // 获取小时 const minute = date.getMinutes(); // 获取分钟 const second = date.getSeconds(); // 获取秒数 - const formattedDate = `${year}-${month}-${day} ${hour}:${minute}:${second}`; // 拼接成格式化后的日期字符串 + const formattedDate = `${year}-${month}-${day} ${hour.length==1? '0'+hour:hour}:${minute.length==1? '0'+minute:minute}:${second.length==1? '0'+second:second}`; // 拼接成格式化后的日期字符串 return formattedDate } }, diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue index 98750d2..a92767a 100644 --- a/pages/order_detail/order_detail.vue +++ b/pages/order_detail/order_detail.vue @@ -171,7 +171,7 @@ 以优惠¥{{emitorderfoodform.couponsPrice}} - + 立即付款 @@ -255,7 +255,11 @@ }) }, methods: { - + fangdouevent() { + this.$u.debounce(() => { + this.showpopupclick() + }, 1000) + }, async getcoupon() { let res = await this.api.userCoupon({ "orderNum": this.listinfo.amount, @@ -336,10 +340,7 @@ orderId: this.listinfoid }) }, - // 防抖去结算 - shopEvent(){ - uni.$u.throttle(this.showpopupclick, 500) - }, + // 去结算 showpopupclick() { if (this.numValue == 0) { diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue index 6906170..b635882 100644 --- a/pages/product/placeOrder.vue +++ b/pages/product/placeOrder.vue @@ -49,7 +49,7 @@ - + 支付方式 @@ -65,7 +65,8 @@ - + - + 会员卡余额{{ amountVIP.amount}} 去充值 @@ -94,7 +96,7 @@ 共{{Quantity}}件 已优惠￥{{calculateEvent(info.save) }} - + @@ -108,8 +110,6 @@ }, onLoad(e) { this.getInfo(e.id) - - this.orderIds = e.id this.amount = uni.cache.get('userInfo').amount this.vipId = uni.cache.get('userInfo').id @@ -136,7 +136,7 @@ }) if (res.code == 0) { this.amountVIP = res.data - + } }, // 余额支付 @@ -149,9 +149,9 @@ }) if (res.code == 0) { let orderInfo = { - createdAt:this.listinfoid.createTime, - orderNo:this.listinfoid.orderNo, - orderAmount:this.calculateEvent(this.info.salePrice) + createdAt: this.listinfoid.createTime, + orderNo: this.listinfoid.orderNo, + orderAmount: this.calculateEvent(this.info.salePrice) } uni.showToast({ icon: 'none', @@ -160,7 +160,8 @@ setTimeout(res => { uni.redirectTo({ url: '/pages/order/successful?orderId=' + this - .listinfoid.id + '&orderInfo=' + JSON.stringify(orderInfo) + .listinfoid.id + '&orderInfo=' + JSON.stringify( + orderInfo) }); }, 1000) } @@ -173,16 +174,17 @@ } }, calculateEvent(d) { - return (d * 1000 * this.Quantity)/1000 + return (d * 1000 * this.Quantity) / 1000 }, goRecharge() { uni.pro.navigateTo('/pages/member/index', { shopId_id: this.info.shopId }) }, - // 防抖 - sumbitFroms(){ - uni.$u.throttle(this.sumbitFrom, 500) + fangdouevent() { + this.$u.debounce(() => { + this.sumbitFrom() + }, 1000) }, async sumbitFrom() { let payMoney = this.info.salePrice * this.Quantity @@ -201,7 +203,7 @@ this.payEvent(res.data.id) } else { // 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码 - let isVip = uni.cache.get('userInfo').isPwd + let isVip = uni.cache.get('userInfo').isPwd if (isVip == 0) { uni.pro.navigateTo('/pages/user/repairpassword', { shopId_id: uni.cache.get('shopUser')