front/merchapp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: front:49dd906bcaa55e332fd1ab3c5d2defdcef8f9658
Branches Tags
front:main
front:feat-tanjy
..
compare: front:da52f07cbe00b2f23fb438ae7e1e0f549023ebed
Branches Tags
front:main
front:feat-tanjy

No commits in common. "49dd906bcaa55e332fd1ab3c5d2defdcef8f9658" and "da52f07cbe00b2f23fb438ae7e1e0f549023ebed" have entirely different histories.
49dd906bca ... da52f07cbe

2 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
java-mall-app-shop-admin/.hbuilderx/launch.json
View File

@ -24,7 +24,7 @@
},
{
"customPlaygroundType" : "device",
"playground" : "custom",
"playground" : "standard",
"type" : "uni-app:app-android"
},
{

9
java-mall-app-shop-admin/pages/order/order.vue
View File

@ -543,7 +543,7 @@ export default {
width: "170rpx",
},
],
salesReturnBtnSearchAcitve: null,
salesReturnBtnSearchAcitve: 3105,
salesReturnOrderList: [],
showImgList: [],
showImg: false,
@ -634,7 +634,7 @@ export default {
this.pageNum = 1;
if (newValue == "mchRetrunOrderList") {
if (this.currentTab2 == 2) {
this.getSalesReturnOrderList(null);
this.getSalesReturnOrderList();
console.log("触发getSalesReturnOrderList");
}
} else {
@ -658,9 +658,6 @@ export default {
} else {
this.getOrderList();
}
if (this.currentTab2 === 2) {
this.getSalesReturnOrderList(null);
}
},
onPullDownRefresh() {
this.pageNum = 1;
@ -965,7 +962,7 @@ export default {
this.isDownNoSalesReturnData = false;
if (this.currentTab2 == 2) {
this.getSalesReturnOrderList(null);
this.getSalesReturnOrderList();
} else {
this.getOrderList();
}