发货通知

pull/8/head
kele 2023-10-20 18:57:10 +08:00
parent a2a7bb2121
commit 2a949d1b1f
2 changed files with 62 additions and 18 deletions

View File

@ -401,11 +401,14 @@
// todo:
// 1.return
// 2.mpConfirm,App.vueshow
if (sheep.$platform.name === 'WechatMiniProgram' && !ignore) {
if (!isEmpty(state.orderInfo.wechat_extra_data) && tradeManaged.value === 1) {
mpConfirm(orderId);
return;
}
let isOpenBusinessView = true;
if (
sheep.$platform.name === 'WechatMiniProgram' &&
!isEmpty(state.orderInfo.wechat_extra_data) &&
isOpenBusinessView &&
!ignore
) {
mpConfirm(orderId);
return;
}
@ -426,8 +429,7 @@
wx.openBusinessView({
businessType: 'weappOrderConfirm',
extraData: {
// merchant_id: '1481069012',
// merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
},
success(response) {

View File

@ -157,7 +157,7 @@
<button
v-if="order.btns.includes('confirm')"
class="tool-btn ss-reset-button"
@tap.stop="onConfirm(order.id)"
@tap.stop="onConfirm(order)"
>
确认收货
</button>
@ -239,6 +239,7 @@
import { formatOrderColor } from '@/sheep/hooks/useGoods';
import sheep from '@/sheep';
import _ from 'lodash';
import { isEmpty } from 'lodash';
const pagination = {
data: [],
@ -329,21 +330,62 @@
}
//
async function onConfirm(orderId) {
uni.showModal({
title: '提示',
content: '请确认包裹全部到达后再确认收货',
success: async function (res) {
if (res.confirm) {
const { error, data } = await sheep.$api.order.confirm(orderId);
if (error === 0) {
let index = state.pagination.data.findIndex((order) => order.id === orderId);
state.pagination.data[index] = data;
async function onConfirm(order, ignore = false) {
//
// todo:
// 1.return
// 2.mpConfirm,App.vueshow
let isOpenBusinessView = true;
if (
sheep.$platform.name === 'WechatMiniProgram' &&
!isEmpty(order.wechat_extra_data) &&
isOpenBusinessView &&
!ignore
) {
mpConfirm(order);
return;
}
//
const { error } = await sheep.$api.order.confirm(order.id);
if (error === 0) {
state.pagination = pagination;
getOrderList();
}
}
// #ifdef MP-WEIXIN
//
function mpConfirm(order) {
if (!wx.openBusinessView) {
sheep.$helper.toast(`请升级微信版本`);
return;
}
wx.openBusinessView({
businessType: 'weappOrderConfirm',
extraData: {
merchant_id: '1481069012',
merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
transaction_id: order.wechat_extra_data.transaction_id,
},
success(response) {
console.log('success:', response);
if (response.errMsg === 'openBusinessView:ok') {
if (response.extraData.status === 'success') {
onConfirm(order, true);
}
}
},
fail(error) {
console.log('error:', error);
},
complete(result) {
console.log('result:', result);
},
});
}
// #endif
//
async function onExpress(orderId) {