发货及后台文件上传优化

This commit is contained in:
Dev
2026-10-14 16:26:41 +08:00
parent 8eb253784a
commit 645a037126
6 changed files with 162 additions and 44 deletions
@@ -4,6 +4,10 @@ import { commitPay, wechatPayOrder } from './pay';
import { getAddressPromise } from '../../usercenter/address/list/util';
const stripeImg = `https://cdn-we-retail.ym.tencent.com/miniapp/order/stripe.png`;
// 与后端 OrderService::ORDER_TYPE_SOFTWARE 一致
const ORDER_TYPE_SOFTWARE = 0;
// 订单发货通知模板,与后端 SubscribeMessageService::MSG_TEMP_ORDER_SHIPPED 一致
const MSG_TEMP_ORDER_SHIPPED = 'jGxNQ11on1yD0d5tGwk4S8jP_CEdddfAkrp9-xVeeZY';
Page({
data: {
@@ -73,8 +77,8 @@ Page({
},
// 处理不同情况下跳转到结算页时需要的参数
handleOptionsParams(options, couponList) {
console.log(options);
let orderNo = options?.orderNo;
//选优惠券、改数量等重新结算时不会再传 orderNo,沿用首次进入时的订单号
const orderNo = options?.orderNo || this.data.orderNo;
this.setData({
orderNo: orderNo
});
@@ -112,6 +116,7 @@ Page({
storeInfoList,
userAddressReq,
couponList,
orderNo,
};
fetchSettleDetail(params).then(
(res) => {
@@ -360,6 +365,23 @@ Page({
},
// 提交订单
submitOrder() {
const { settleDetailData } = this.data;
if (this.payLock || !settleDetailData.settleType || !settleDetailData.totalAmount) {
return;
}
// 软件订单需授权「订单发货」通知;requestSubscribeMessage 必须在点击事件中同步调用,不能放到接口回调里
if (settleDetailData.orderType === ORDER_TYPE_SOFTWARE) {
wx.requestSubscribeMessage({
tmplIds: [MSG_TEMP_ORDER_SHIPPED],
complete: () => {
this.doSubmitOrder();
},
});
return;
}
this.doSubmitOrder();
},
doSubmitOrder() {
const {
settleDetailData,
// userAddressReq,
@@ -429,16 +451,6 @@ Page({
});
return;
}
//订阅发货通知
if (data.order_type == 0) {
wx.requestSubscribeMessage({
tmplIds: ['jGxNQ11on1yD0d5tGwk4S8jP_CEdddfAkrp9-xVeeZY'],
complete: (re) => {
this.handlePay(data, settleDetailData);
}
});
return;
}
this.handlePay(data, settleDetailData);
} else {
Toast({