From f6f481968a286b8a306a45abbb81d0780784e8a9 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Mon, 21 Jul 2025 14:47:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E6=89=B9=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/orderList/index.wxml | 78 ++--- pages/order/orderList/index.wxss | 43 ++- pages/order/postOrder/index.js | 28 +- pages/order/postOrder/index.wxml | 32 +- pages/order/postOrder/index.wxss | 29 ++ pages/user/order/postOrderInfo/index.js | 58 ++++ pages/user/order/postOrderInfo/index.wxml | 227 +++++++++----- pages/user/order/postOrderInfo/index.wxss | 40 ++- pages/user/order/sceneOrderInfo/index.js | 25 +- pages/user/order/sceneOrderInfo/index.wxml | 329 +++++++++++++++------ pages/user/order/sceneOrderInfo/index.wxss | 118 +++++--- 11 files changed, 743 insertions(+), 264 deletions(-) diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml index a488969..c0c25bb 100644 --- a/pages/order/orderList/index.wxml +++ b/pages/order/orderList/index.wxml @@ -1,64 +1,48 @@ - - - - {{item.product.title}} - - - ￥{{item.sku.price/100}} - + + + {{item.product.title}} + ￥{{item.sku.price/100}} - - {{item.sku.sku_name}} - - - X{{item.productNum}} - + {{item.sku.sku_name}} + X{{item.productNum}} - - 运费 - - - ￥{{item.postFee/100 || 0}} - + 运费 + ￥{{item.postFee/100 || 0}} + + 物流信息 + 分批收货 (共{{item.sku.batch_count}}次) + 物流备注：{{item.sku.batch_remark}} + - - - - {{item.product.title}} - - - ￥{{item.sku.price/100}} - + + + {{item.product.title}} + ￥{{item.sku.price/100}} - - {{item.sku.sku_name}} - - - X{{item.num}} - - + {{item.sku.sku_name}} + X{{item.num}} - 出行人信息 - - - - 姓名：{{items.name}} - 证件号：{{items.id_number}} - 手机号：{{items.tel}} + 出行人信息 + + + + 姓名：{{items.name}} + 证件号：{{items.id_number}} + 手机号：{{items.tel}} + + + + + 手机号：{{item.phone}} - - - - 手机号：{{item.phone}} - diff --git a/pages/order/orderList/index.wxss b/pages/order/orderList/index.wxss index 3f7a203..fdf5877 100644 --- a/pages/order/orderList/index.wxss +++ b/pages/order/orderList/index.wxss @@ -7,11 +7,7 @@ page{ background: white; padding: 20rpx; } -.item-box{ - display: flex; - justify-content: space-between; - padding: 10rpx; -} + .price{ color: #D62828; } @@ -64,13 +60,38 @@ page{ } .text { - margin-bottom: 22.67rpx; - color: #333; - font-size: 28rpx; - font-weight: 500; + margin-bottom: 20rpx; display: flex; + font-weight: 500; +font-size: 27rpx; +color: #666666; } -.text-left { - color: #999; + +.goods-item{ + border-bottom: 1px solid #D8D8D8; + padding-bottom: 17rpx; + margin-bottom: 17rpx; +} +.goods-item:last-of-type{ + border-bottom: none; + margin-bottom:0; + padding-bottom: 0; +} +.item-box{ + display: flex; + justify-content: space-between; + padding: 10rpx; + font-weight: 500; + font-size: 27rpx; + color: #666666; +} +.item-box.item-title{ + font-weight: bold; + font-size: 32rpx; + color: #333333; +} +.item-box.item-title .price{ + color: #D62828; + font-weight: bold; } \ No newline at end of file diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js index 922fd0f..2f9c76c 100644 --- a/pages/order/postOrder/index.js +++ b/pages/order/postOrder/index.js @@ -47,6 +47,7 @@ Page({ else if (this.data.gp_id) { price = price + item.sku.event_price * item.productNum; } + item.sku.batch_shipment = item.sku.batch_shipment?item.sku.batch_shipment:0; sku_id.push(item.sku.id) }) this.setData({ @@ -154,7 +155,8 @@ Page({ sku_id: item.sku.id, post: this.data.address.id, product_num: item.productNum, - remark: item.remark + remark: item.remark, + is_batch_shipment: item.sku.batch_shipment, } product_list.push(productItem) }) @@ -232,8 +234,15 @@ Page({ let postFee = 0, flag = true; res.map((item, index) => { if (item.data.price < 0) flag = false; - postFee = postFee + Number(item.data.price); product[index].postFee = item.data.price; + + // 累计总邮费 + let postPrice = Number(item.data.price) + if(product[index].sku.batch_shipment == 1) { + postPrice = product[index].sku.batch_count * postPrice + } + postFee = postFee + postPrice; + }) if (!flag) { wx.showToast({ @@ -265,6 +274,21 @@ Page({ }) }, + changeBatchShip (e) { + let product = this.data.product; + let value = e.currentTarget.dataset.value; + let index = e.currentTarget.dataset.index; + + product[index].sku.batch_shipment = value; + console.log(index) + this.setData({ + product: product + }) + + this.getPostFee() + this.changePrice() + }, + /** * 选择补贴 */ diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml index 9641fb3..6affe90 100644 --- a/pages/order/postOrder/index.wxml +++ b/pages/order/postOrder/index.wxml @@ -25,16 +25,44 @@ {{item.productNum}} + + 收货方式 + + + + + 一次性收货 + + + + + 分批收货(共{{item.sku.batch_count}}次) + + + {{item.sku.batch_remark}} + + + 运费 - {{item.postFee?(item.postFee==0?'包邮':(item.postFee/100)):item.sku.sku_model.post_template_name}} + + {{item.postFee?(item.postFee==0?'包邮':("￥"+(item.postFee/100))):item.sku.sku_model.post_template_name}} + + x{{item.sku.batch_count}} + ￥{{(item.postFee/100)*item.sku.batch_count}} + + 订单备注： - 小计：￥{{(item.sku.price * item.productNum + item.postFee || 0) /100}} + 小计：￥ + {{(item.sku.price * item.productNum + item.postFee*item.sku.batch_count || 0) /100}} + {{(item.sku.price * item.productNum + item.postFee || 0) /100}} + diff --git a/pages/order/postOrder/index.wxss b/pages/order/postOrder/index.wxss index fde5a52..b85f0ea 100644 --- a/pages/order/postOrder/index.wxss +++ b/pages/order/postOrder/index.wxss @@ -222,4 +222,33 @@ page { .mask-allowance .mask-content .rule-title { text-align: center; margin-bottom: 20rpx; +} + +.batch-view{ + display: flex; +} +.batch-view .flex{ + display: flex; + align-items: center; +} +.batch-view .no-select{ + width: 30rpx; + height: 30rpx; + background: #FFFFFF; + border-radius: 50%; + border: 1px solid #999999; + margin-right: 10rpx; +} +.batch-view .select-img{ + width: 30rpx; + height: 30rpx; + margin-right: 10rpx; +} +.batch-view .batch-info-tip{ + position: absolute; + right: 0; + bottom: 6rpx; + font-weight: 500; + font-size: 23rpx; + color: #D62828; } \ No newline at end of file diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js index 7a5ac84..a607d73 100644 --- a/pages/user/order/postOrderInfo/index.js +++ b/pages/user/order/postOrderInfo/index.js @@ -188,6 +188,51 @@ Page({ url: '/pages/order/comment/index?id='+id, }) }, + goDetail(e){ + console.log(e.currentTarget.dataset); + let item = e.currentTarget.dataset.set + if (item.is_package == 1) { + wx.navigateTo({ + url:"/pages/info/postProductInfo/index?id="+item.product_id + }) + return + } else if (item.is_package==2) { + wx.navigateTo({ + url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id + }); + return + } + + if (item.product_model=='ticket') { + wx.navigateTo({ + url:"/pages/info/sceneProductInfo/index?id="+item.scene_id + }) + }else if (item.product_model=='post') { + wx.navigateTo({ + url:"/pages/info/postProductInfo/index?id="+item.product_id + }) + } + }, + + expandPost:function (e) { + let index = e.currentTarget.dataset.index + let productList = this.data.info.order_product_list + let item = productList[index] + item.showMore = !item.showMore + this.setData({ + info: this.data.info + }) + }, + expandMsg: function(e) { + let index = e.currentTarget.dataset.index + let productList = this.data.info.order_product_list + let item = productList[index] + item.showMsg = !item.showMsg + this.setData({ + info: this.data.info + }) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ @@ -314,6 +359,19 @@ getInfo () { state = state + order.state; order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[] }) + + // 2025-7-21能否确认收货 + res.data.is_all_confirm = true; + if (res.data.state=='PAID' && res.data.stateNums.WAIT_DELIVERY==res.data.order_product_list.length) { + res.data.order_product_list.forEach(v=>{ + if (v.shipped_batch_count < v.batch_count ) { + res.data.is_all_confirm = false + } + }) + } else { + res.data.is_all_confirm = true; + } + this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml index 4d3f676..d000b62 100644 --- a/pages/user/order/postOrderInfo/index.wxml +++ b/pages/user/order/postOrderInfo/index.wxml @@ -12,81 +12,176 @@ {{info.order_product_list[0].consignee_info.name}}{{info.order_product_list[0].consignee_info.tel}} {{info.order_product_list[0].consignee_info.address}} - - - - - - - {{item.product_title}} - {{item.sku_name}} - - - ￥ {{item.product_price/100}} - x{{item.product_num}} - + + + + + + + + {{item.product_title}} + {{item.sku_name}} + + + ￥ {{item.product_price/100}} + x{{item.product_num}} + + + {{item.state_text}} + + + 收货方式： + 分批收货 (共{{item.batch_count}}次) + 一次性收货 + + + 运费： + + ￥{{item.post_fee/item.batch_count/100}} x{{info.order_product_list[0].batch_count}} + {{item.post_fee?("￥"+item.post_fee/100):"包邮"}} + + + + 小计： + ￥{{item.paid_money/100}} + + + + + + 物流信息 + + {{item.showMore?"收起":"展开"}} + + + + + + 当前已发：{{item.shipped_batch_count}} + + + 当前待发：{{item.batch_count - item.shipped_batch_count}} + + + 物流备注：{{item.batch_remark}} + + + + + 快递{{shipIndex+1}} + + 快递公司：{{shipment.express_name}} + + + 快递单号： + + {{shipment.courier_number}} 复制 + + + + 发货时间：{{shipment.post_time}} + + + + + + + + + + + + + 快递公司：{{item.post_detail_list[0].express_name}} + + + 快递单号： + + {{item.post_detail_list[0].courier_number}} 复制 + + + + 发货时间：{{item.post_detail_list[0].post_time}} + + + + + + + 使用说明 + + {{item.showMsg?"收起":"展开"}} + + + + - 邮费：{{item.post_fee==0?'包邮':('￥'+item.post_fee/100)}} 实付：￥{{item.paid_money/100}} - {{item.state_text}} - - - 商品总价 - ￥{{info.total_money/100}} - - - 运费 - {{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}} - - - 优惠券抵扣 - -￥{{info.preference_money/100}} - - - 需付款 - {{info.paid_money/100}} - - - 剩余时间：00:{{minute}}:{{second}} - 再次购买 - 退款详情 - 确认收货 - 申请退款 - 取消订单 - 去评价 - 立即支付 - 查询快递 - + - 订单信息 - - 订单编号：{{info.order_id}} - - - 下单时间：{{info.create_time}} - - - 支付时间：{{info.pay_at}} - - - 支付方式：{{pay_methods[info.pay_method]}} - - - 快递公司： - - {{item.express_name}} + 订单信息 + + 商品总价： + ￥{{info.total_money/100}} - - - 快递单号： - - {{item.courier_number}}复制 + + 运费： + + + ￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}} + + {{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}} + + + + 优惠券： + -￥{{info.preference_money/100}} + + + 实付款 + ￥{{info.paid_money/100}} + + + + + + 订单编号： + {{info.order_id}} 复制 + + + 下单时间： + {{info.create_time}} + + + 支付时间： + {{info.pay_at}} + + + 支付方式： + {{pay_methods[info.pay_method]}} + + + + + + 退款详情 + 确认收货 + 申请退款 + 取消订单 + 去评价 + 立即支付 + - + + + 联系客服 + diff --git a/pages/user/order/postOrderInfo/index.wxss b/pages/user/order/postOrderInfo/index.wxss index eeab2be..6d3e75b 100644 --- a/pages/user/order/postOrderInfo/index.wxss +++ b/pages/user/order/postOrderInfo/index.wxss @@ -38,7 +38,6 @@ page { color: #666; } .product-state { - margin-top: 10rpx; color: #0B898E; } .product-info image { @@ -67,8 +66,8 @@ page { display: flex; justify-content: space-between; align-items: center; - height: 45rpx; - color: #333; + height: 50rpx; + color: #666; font-size: 26rpx; } .all-total-item { @@ -344,4 +343,39 @@ color: #333333; content:'起'; color: #999999; font-size: 10px; +} +.post-line-info{ + height: auto; + min-height: 48rpx; +} + +.post-child-item{ + background: #F5F5F5; + border-radius: 20rpx; + padding:10rpx 20rpx; + width: 100%; + box-sizing: border-box; + margin-bottom: 20rpx; +} +.post-child-item .detail-item{ + color: #333; +} +.post-child-btn{ + font-weight: 500; + font-size: 27rpx; + color: #0B898E; + background: #FFFFFF; + border-radius: 50rpx; + border: 1px solid #0B898E; + padding:4rpx 40rpx; + width: fit-content; + margin: 0 auto; + box-sizing: border-box; + margin-top: 20rpx; +} +.expand-tip{ + position: absolute; + color: #0B898E; + right: 0; + bottom: 0; } \ No newline at end of file diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js index 93faa07..f65c46d 100644 --- a/pages/user/order/sceneOrderInfo/index.js +++ b/pages/user/order/sceneOrderInfo/index.js @@ -49,9 +49,10 @@ Page({ }) }) }, - copy:function(){ + copy:function(e){ + let code = e.currentTarget.dataset.num; wx.setClipboardData({ - data: this.data.codeImgs[this.data.codeIndex].code, + data: code, success: function (res) { wx.showToast({ title: '复制成功', @@ -351,6 +352,26 @@ Page({ }) }, + expandPost:function (e) { + let index = e.currentTarget.dataset.index + let productList = this.data.info.order_product_list + let item = productList[index] + item.showMore = !item.showMore + this.setData({ + info: this.data.info + }) + }, + + expandMsg: function(e) { + let index = e.currentTarget.dataset.index + let productList = this.data.info.order_product_list + let item = productList[index] + item.showMsg = !item.showMsg + this.setData({ + info: this.data.info + }) + }, + /** * 生命周期函数--监听页面隐藏 */ diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 8129fcb..53b8c57 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -34,10 +34,10 @@ - + - + + + + + + + + {{item.product_title}} + + + {{ item.state_text }} + + + + 出行日期： + + {{item.use_date}}{{ item.start_time }}-{{ item.end_time }} + + + + + 使用日期： + {{ item.order_advance.start_time }}-{{ item.order_advance.end_time }} + + + + {{item.sku_name}} + + ￥ {{item.product_price/100}} + x{{item.product_num}} + + + + 小计： + ￥{{item.paid_money/100}} + + + + + + 出行人 + + {{item.showMore?"收起":"展开"}} + + + + + + 手机号： {{item.phone}} + + + + + + 姓名： {{item.name}} + + + 手机号：{{item.tel}} + + + {{item.title}}：{{item.id_number}} + + + + + + + + + + + 使用说明 + + {{item.showMsg?"收起":"展开"}} + + + + + + - 再次购买 - - - 退款详情 - 取消预订 - 取消预订 - 去评价 - 立即支付 - - - - - - - - {{item.product_title}} - - - - {{item.sku_name}} - x{{item.product_num}} - - - {{ item.state_text }} - - - 出行日期： - {{item.use_date}}{{ item.start_time }}-{{ item.end_time }} - - - 使用日期： - {{ item.order_advance.start_time }}-{{ item.order_advance.end_time }} - - - - 出行人信息 - {{cxr1Text}} + + + + + + {{item.product_title}} + {{item.sku_name}} + + + ￥ {{item.product_price/100}} + x{{item.product_num}} + + + {{item.state_text}} + + + 收货方式： + 分批收货 (共{{item.batch_count}}次) + 一次性收货 - - - 手机号： {{item.phone}} + + 运费： + + ￥{{item.post_fee/item.batch_count/100}} x{{info.order_product_list[0].batch_count}} + {{item.post_fee?("￥"+item.post_fee/100):"包邮"}} - - - - - 姓名： {{item.name}} - + + 小计： + ￥{{item.paid_money/100}} + + + + + + + 物流信息 + + {{item.showMore?"收起":"展开"}} + - - - {{item.title}}：{{item.id_number}} - + + + + 当前已发：{{item.shipped_batch_count}} + + + 当前待发：{{item.batch_count - item.shipped_batch_count}} + + + 物流备注：{{item.batch_remark}} + + + + + 快递{{shipIndex+1}} + + 快递公司：{{shipment.express_name}} + + + 快递单号： + + {{shipment.courier_number}} 复制 + + + + 发货时间：{{shipment.post_time}} + + + + + - - 手机号： {{item.tel}} - + + + + + 快递公司：{{item.post_detail_list[0].express_name}} + + + 快递单号： + + {{item.post_detail_list[0].courier_number}} 复制 + + + + 发货时间：{{item.post_detail_list[0].post_time}} + + + + + + 使用说明 + + {{item.showMsg?"收起":"展开"}} + + + - - - - 使用说明 - {{sysmText}} + + + + + + 订单信息 + + 商品总价： + ￥{{info.total_money/100}} + + + 运费： + + + ￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}} + + {{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}} - - - - - 使用说明 - {{sysm2Text}} + + + 优惠券： + -￥{{info.preference_money/100}} + + + 实付款 + ￥{{info.paid_money/100}} + + + + + + 订单编号： + {{info.order_id}} 复制 + + + 下单时间： + {{info.create_time}} + + + 支付时间： + {{info.pay_at}} + + + 支付方式： + {{pay_methods[info.pay_method]}} + + + + + 剩余时间：00:{{minute}}:{{second}} + + + + 退款详情 + 取消预订 + 取消预订 + 去评价 + 立即支付 - - - - - + + + + 联系客服 + + + + diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss index 1f34eac..69d4dcd 100644 --- a/pages/user/order/sceneOrderInfo/index.wxss +++ b/pages/user/order/sceneOrderInfo/index.wxss @@ -23,14 +23,23 @@ page { margin: 20rpx 30rpx; } .product-info { - display: flex; - justify-content: space-between; - color: #333; - font-size: 24rpx; - padding-bottom: 20rpx; - border-bottom: 1rpx solid #d8d8d8; - margin-bottom: 10rpx; -} + color: #333; + font-size: 24rpx; + padding-bottom: 20rpx; + border-bottom: 1rpx solid #d8d8d8; + margin-bottom: 20rpx; + } + .product-info-top { + display: flex; + justify-content: space-between; + } + .product-price,.product-state { + text-align: right; + color: #666; + } + .product-state { + color: #0B898E; + } .product-info image { width: 140rpx; height: 140rpx; @@ -54,13 +63,12 @@ page { text-align: right; } .detail-item { - display: flex; - justify-content: space-between; - align-items: center; - min-height: 45rpx; - color: #000; - font-size: 30rpx; - padding-bottom:30rpx ; + display: flex; + justify-content: space-between; + align-items: center; + height: 50rpx; + color: #666; + font-size: 26rpx; } .all-total-item { font-weight: bold; @@ -106,37 +114,13 @@ page { text-align: center; justify-content: space-between; } -.box-title.tflex{ - display: flex; - align-items: center; - justify-content: space-between; -} + .title-content{ overflow-x: hidden; overflow-y: inherit; text-overflow: ellipsis; white-space: nowrap; } -.scene-box { - display: flex; - justify-content: space-between; -} -.scene-box-left { - width: 400rpx; - font-size: 26rpx; - color: #333; -} -.scene-box-right { - flex-shrink: 0; - font-size: 24rpx; - color: #999; - text-align: right; -} -.scene-box-right .price { - color: #D62828; - font-size: 36rpx; - font-weight: bold; -} .scene-btns { display: flex; justify-content: flex-end; @@ -144,7 +128,7 @@ page { font-size: 26rpx; color: #333; text-align: center; - margin-top: 50rpx; + margin-top: 20rpx; } .scene-btn { width: 160rpx; @@ -304,12 +288,7 @@ page { color: #999; margin-top: 30rpx; } -.row{ - display: flex; - align-items: center; - justify-content:space-between; - padding-bottom: 30rpx; -} + .showmsg{ display: none; } @@ -351,4 +330,49 @@ page { font-weight: 500; font-size: 23rpx; color: #0E8790; +} + +.goods-line{ + border-top: 1px solid #ccc; + margin: 12rpx 0; +} +.child-status{ + font-weight: bold; + font-size: 31rpx; + color: #0B898E; +} +.post-line-info{ + height: auto; + min-height: 48rpx; +} + +.post-child-item{ + background: #F5F5F5; + border-radius: 20rpx; + padding:10rpx 20rpx; + width: 100%; + box-sizing: border-box; + margin-bottom: 20rpx; +} +.post-child-item .detail-item{ + color: #333; +} +.post-child-btn{ + font-weight: 500; + font-size: 27rpx; + color: #0B898E; + background: #FFFFFF; + border-radius: 50rpx; + border: 1px solid #0B898E; + padding:4rpx 40rpx; + width: fit-content; + margin: 0 auto; + box-sizing: border-box; + margin-top: 20rpx; +} +.expand-tip{ + position: absolute; + color: #0B898E; + right: 0; + bottom: 0; } \ No newline at end of file From 691e356a136c475c54bf292a394301d0c8355155 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Tue, 22 Jul 2025 18:36:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E6=89=B9=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/user/order/postOrderInfo/index.js | 2 +- pages/user/order/postOrderInfo/index.wxml | 6 ++---- pages/user/order/sceneOrderInfo/index.wxml | 2 +- project.private.config.json | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js index a607d73..0d6a56a 100644 --- a/pages/user/order/postOrderInfo/index.js +++ b/pages/user/order/postOrderInfo/index.js @@ -369,7 +369,7 @@ getInfo () { } }) } else { - res.data.is_all_confirm = true; + res.data.is_all_confirm = false; } this.setData({ diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml index d000b62..f0d8ffc 100644 --- a/pages/user/order/postOrderInfo/index.wxml +++ b/pages/user/order/postOrderInfo/index.wxml @@ -129,9 +129,7 @@ 运费： - - ￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}} - + ￥{{info.total_post_fee/info.order_product_list[0].batch_count/100}} x{{info.order_product_list[0].batch_count}} {{info.total_post_fee?("￥"+info.total_post_fee/100):"包邮"}} @@ -160,7 +158,7 @@ 支付方式： - {{pay_methods[info.pay_method]}} + {{info.pay_method_text}} diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 53b8c57..118ce54 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -280,7 +280,7 @@ 支付方式： - {{pay_methods[info.pay_method]}} + {{info.pay_method_text}} diff --git a/project.private.config.json b/project.private.config.json index ed33811..6275b78 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,7 +9,7 @@ { "name": "pages/info/postProductInfo/index", "pathName": "pages/info/postProductInfo/index", - "query": "id=457634", + "query": "id=457632", "launchMode": "default", "scene": null }, From cb2e9e7292869c8d76bbce1af76c2cc272503644 Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Mon, 4 Aug 2025 14:28:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=86=E6=89=B9=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/orderList/index.js | 4 ++-- pages/order/orderList/index.wxml | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js index 5ffd963..48b3f7a 100644 --- a/pages/order/orderList/index.js +++ b/pages/order/orderList/index.js @@ -52,8 +52,8 @@ Page({ } if (!app.globalData.kjId && !this.data.gp_id) { - price = price + item.sku.price * item.productNum; - postFee += item.postFee + price = price + item.sku.price * item.productNum ; + postFee += item.sku.batch_shipment?item.postFee*(item.sku.batch_count || 0):item.postFee; } else if (this.data.gp_id) { price = price + item.sku.event_price * item.productNum; diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml index c0c25bb..d5c8c9c 100644 --- a/pages/order/orderList/index.wxml +++ b/pages/order/orderList/index.wxml @@ -11,7 +11,13 @@ 运费 - ￥{{item.postFee/100 || 0}} + + ￥{{item.postFee/100 || 0}} + + x{{item.sku.batch_count}} + ￥{{(item.postFee/100)*item.sku.batch_count}} + + 物流信息