mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mkm:d80bac72e26ffeecff8085db60ab1bb234f247d1
Branches Tags
mkm:main
mkm:pre-release
mkm:master
mkm:dev
mkm:feature-releaseGoods
mkm:hotfixbug
..
compare: mkm:47b428432635d26f54ef749f17a021a1eabc9a59
Branches Tags
mkm:pre-release
mkm:master
mkm:dev
mkm:feature-releaseGoods
mkm:hotfixbug
mkm:main

No commits in common. "d80bac72e26ffeecff8085db60ab1bb234f247d1" and "47b428432635d26f54ef749f17a021a1eabc9a59" have entirely different histories.
d80bac72e2 ... 47b4284326

2 changed files with 986 additions and 1152 deletions
Show Stats Expand all files Collapse all files

3
pages/activeCode/subsidy.vue
View File

@ -193,7 +193,7 @@
this.mer_info.type_code = user.mer_info.type_code; this.mer_info.type_code = user.mer_info.type_code;
this.mer_id = user.service.mer_id; this.mer_id = user.service.mer_id;
this.getSubsidy(); this.getSubsidy();
this.getSubsidyRecord(); if(this.type==2)this.getSubsidyRecord();
// this.$nextTick(res=>{ // this.$nextTick(res=>{
// this.$refs.pupRef.open(); // this.$refs.pupRef.open();
// }) // })
@ -214,7 +214,6 @@
}, },
changeType(type){ changeType(type){
this.type = type; this.type = type;
this.where.type = type;
this.getSubsidy(); this.getSubsidy();
this.getSubsidyRecord(); this.getSubsidyRecord();
}, },

2135
pages/admin/orderDetail/index.vue
View File

File diff suppressed because it is too large Load Diff