diff --git a/model/order/orderConfirm.js b/model/order/orderConfirm.js index 230707d..5923678 100644 --- a/model/order/orderConfirm.js +++ b/model/order/orderConfirm.js @@ -127,6 +127,7 @@ export async function genSettleDetail(params) { storeName: "", goodsCount: 0, deliveryFee: 0, + storeTotalPayAmount: 0, storeTotalAmount: 0, storeTotalDiscountAmount: 0, storeTotalCouponAmount: 0, @@ -149,12 +150,12 @@ export async function genSettleDetail(params) { GoodsRequestList: storeGoodsRequestList, CustomerAddressGuid: userAddressReq.customerAddressGuid } - getGoodsFreight(data).then((res) => { - if (res.code === 0) { - resp.data.abnormalDeliveryGoodsList = storeGoodsRequestList - } - storeGoods.deliveryFee = res.data - }) + getGoodsFreight(data).then((res) => { + if (res.code === 0) { + resp.data.abnormalDeliveryGoodsList = storeGoodsRequestList + } + storeGoods.deliveryFee = res.data + }) } // 计算优惠券价格 @@ -172,7 +173,8 @@ export async function genSettleDetail(params) { }); } storeGoods.storeTotalCouponAmount = storeTotalCouponAmount; - storeGoods.storeTotalAmount += item.quantity * item.price + storeGoods.deliveryFee - storeTotalCouponAmount; + storeGoods.storeTotalAmount += item.quantity * item.price; + storeGoods.storeTotalPayAmount += item.quantity * item.price + storeGoods.deliveryFee - storeTotalCouponAmount; } }); diff --git a/pages/goods/comments/create/index.wxml b/pages/goods/comments/create/index.wxml index 52cb6d8..5009beb 100644 --- a/pages/goods/comments/create/index.wxml +++ b/pages/goods/comments/create/index.wxml @@ -42,13 +42,13 @@ /> - + - + 选择优惠券 - + diff --git a/pages/order/order-confirm/index.js b/pages/order/order-confirm/index.js index 5804f7a..7206d14 100644 --- a/pages/order/order-confirm/index.js +++ b/pages/order/order-confirm/index.js @@ -435,7 +435,8 @@ Page({ invoiceData, storeInfoList, submitCouponList, - resSubmitCouponList + resSubmitCouponList, + noteInfo } = this.data; const { goodsRequestList diff --git a/pages/order/order-confirm/index.wxml b/pages/order/order-confirm/index.wxml index 67edfaa..b729704 100644 --- a/pages/order/order-confirm/index.wxml +++ b/pages/order/order-confirm/index.wxml @@ -87,7 +87,7 @@ 共{{stores.goodsCount}}件 小计 - + diff --git a/pages/usercenter/index.js b/pages/usercenter/index.js index c6cf16d..81bb51a 100644 --- a/pages/usercenter/index.js +++ b/pages/usercenter/index.js @@ -7,13 +7,14 @@ import { import Toast from 'tdesign-miniprogram/toast/index'; const menuData = [ - [{ - title: '申请开店', - tit: '', - url: '', - status: 0, - type: 'apply-shop', - }, + [ + // { + // title: '申请开店', + // tit: '', + // url: '', + // status: 0, + // type: 'apply-shop', + // }, { title: '收货地址', tit: '',