更新

Merge branch 'new' of https://gitea.lihaink.cn/mkm/shop-applet into new
更新
2024-03-22 14:51:05 +08:00 · 2024-03-22 10:52:03 +08:00 · 2024-03-22 10:51:54 +08:00
2 changed files with 1154 additions and 988 deletions
--- a/pages/activeCode/subsidy.vue
+++ b/pages/activeCode/subsidy.vue
@ -193,7 +193,7 @@
      this.mer_info.type_code = user.mer_info.type_code;
      this.mer_id = user.service.mer_id;
      this.getSubsidy();
-      if(this.type==2)this.getSubsidyRecord();
+      this.getSubsidyRecord();
      // this.$nextTick(res=>{
      //   this.$refs.pupRef.open();
      // })
@ -214,6 +214,7 @@
      },
      changeType(type){
        this.type = type;
+        this.where.type = type;
        this.getSubsidy();
        this.getSubsidyRecord();
      },
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
Author	SHA1	Message	Date
weipengfei	d80bac72e2	更新	2024-03-22 14:51:05 +08:00
weipengfei	4ae04408b4	Merge branch 'new' of https://gitea.lihaink.cn/mkm/shop-applet into new	2024-03-22 10:52:03 +08:00
weipengfei	00f2d3487a	更新	2024-03-22 10:51:54 +08:00