wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-23 00:47:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
uniapp【优化】：优化商家管理查找需要核销券的提示

See merge request jianweie/coreshoppro!103
This commit is contained in:
花城
2024-12-02 10:12:26 +00:00
parent 533dec4722 fb2b466f6f
commit 36bef20413
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/serviceVerification/index/index.vue
View File

@@ -107,12 +107,15 @@
} }
const getServiceVerificationTicketInfo = async () => { const getServiceVerificationTicketInfo = async () => {
if (!state.id) { return };
const ladingInfo : Response<any> = await queryServiceVerificationTicketInfo({ id: state.id }); const ladingInfo : Response<any> = await queryServiceVerificationTicketInfo({ id: state.id });
if (ladingInfo.status) { if (ladingInfo.status) {
state.ticket = ladingInfo.data.ticket; state.ticket = ladingInfo.data.ticket;
state.service = ladingInfo.data.service; state.service = ladingInfo.data.service;
state.serviceOrder = ladingInfo.data.serviceOrder; state.serviceOrder = ladingInfo.data.serviceOrder;
state.ticket['checkboxValue'] = [`${ladingInfo.data.ticket?.redeemCode}`]; state.ticket['checkboxValue'] = [`${ladingInfo.data.ticket?.redeemCode}`];
}else{
handleShowToast(ladingInfo.msg);
} }
} }

3
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/takeDelivery/index/index.vue
View File

@@ -97,12 +97,15 @@
} }
const getLadingInfo = async () => { const getLadingInfo = async () => {
if (!state.id) { return };
const ladingInfo : Response<any> = await queryLadingInfo({ id: state.id }); const ladingInfo : Response<any> = await queryLadingInfo({ id: state.id });
if (ladingInfo.status) { if (ladingInfo.status) {
state.list = ladingInfo.data.map((item : any) => { state.list = ladingInfo.data.map((item : any) => {
item['checkboxValue'] = [`${item.id}`]; item['checkboxValue'] = [`${item.id}`];
return item; return item;
}); });
}else{
handleShowToast(ladingInfo.msg);
} }
} }