添加优惠券余额功能

src/components/Mcoupon.vue

@@ -167,7 +167,7 @@ export default {
   border-radius: 0.08rem 0.08rem 0 0;
 }
 .pay-section {
-  margin: 0 0.12rem 0.1rem;
+  margin: 0 0.15rem 0.1rem;
   // margin-bottom: 0.1rem;
   padding: 0.05rem 0rem;
   border-radius: 0.1rem;

src/constant/index.js

@@ -1,49 +1,50 @@
 export const courseType = {
-  NORMAL: '声部课',
-  SINGLE: '声部课',
+  NORMAL: "声部课",
+  SINGLE: "声部课",
   MIX: "合奏课",
   HIGH: "基础技能课",
   VIP: "VIP课",
   DEMO: "试听课",
-  COMPREHENSIVE: '综合课',
-  ENLIGHTENMENT: '启蒙课',
-  TRAINING: '集训课',
-  TRAINING_SINGLE: '集训声部课',
-  TRAINING_MIX: '集训合奏课',
-  CLASSROOM: '课堂课',
-  PRACTICE: '网管课',
-  COMM: '对外课',
-  MUSIC: '乐团课',
-  HIGH_ONLINE: '线上基础技能课',
-  MUSIC_NETWORK: '乐团网管课'
-}
+  COMPREHENSIVE: "综合课",
+  ENLIGHTENMENT: "启蒙课",
+  TRAINING: "集训课",
+  TRAINING_SINGLE: "集训声部课",
+  TRAINING_MIX: "集训合奏课",
+  CLASSROOM: "课堂课",
+  PRACTICE: "网管课",
+  COMM: "对外课",
+  MUSIC: "乐团课",
+  HIGH_ONLINE: "线上基础技能课",
+  MUSIC_NETWORK: "乐团网管课",
+};
 
 export const musicGroupType = {
-  DRAFT: '编辑中',
-  AUDIT: '审核中',
-  PRE_APPLY:'预报名中',
-  PRE_BUILD_FEE:'创建缴费中',
-  FEE_AUDIT:'费用审核中',
+  DRAFT: "编辑中",
+  AUDIT: "审核中",
+  PRE_APPLY: "预报名中",
+  PRE_BUILD_FEE: "创建缴费中",
+  FEE_AUDIT: "费用审核中",
   APPLY: "报名中",
   PAY: "缴费中",
   PREPARE: "筹备中",
   PROGRESS: "进行中",
-  CANCELED: '取消',
-  PAUSE: '暂停',
-  AUDIT_FAILED: '审核失败',
-  CLOSE:'关闭'
-}
+  CANCELED: "取消",
+  PAUSE: "暂停",
+  AUDIT_FAILED: "审核失败",
+  CLOSE: "关闭",
+};
 
 export const coupontypeDetail = {
-  OTHER:'其他',
-  MUSICAL:'乐器',
-  ACCESSORIES:'辅件',
-  MAINTENANCE:'乐保服务',
-  TEACHING:'教材',
-  PRACTICE:'网管课',
-  SINGLE:'声部课',
-  MIX:'合奏课',
-  VIP:'VIP',
-  FULLCOUPON:'全类券',
-  MEMBER:'云教练'
-}
+  OTHER: "其他",
+  MALLCOUPON: "商城",
+  MUSICAL: "乐器",
+  ACCESSORIES: "辅件",
+  MAINTENANCE: "乐保服务",
+  TEACHING: "教材",
+  PRACTICE: "网管课",
+  SINGLE: "声部课",
+  MIX: "合奏课",
+  VIP: "VIP",
+  FULLCOUPON: "全类券",
+  MEMBER: "云教练",
+};

src/views/shopMall/GoodsSale.vue

@@ -245,9 +245,8 @@
         @onClose="refundStatus = !refundStatus"
         @onPopupSure="onRefundSure"
         :ids="[1]"
-        :showCoupon="false"
         :buyList="buyList"
-        :balance="0"
+        :balance="balance"
       />
       <!-- :balance="this.orderType == 1 ? balance : 0" -->
     </van-popup>
@@ -348,12 +347,12 @@ export default {
       orderText: null,
     };
   },
-  mounted() {
+  async mounted() {
     // 插入token
     if (browser().android || browser().iPhone) {
       this.headerStatus = false;
     }
-    this.__init();
+    await this.__init();
 
     window.addEventListener("hashchange", this.onHash, false);
   },
@@ -540,8 +539,10 @@ export default {
         const body = {
           cartIds: ids,
           memberReceiveAddressId: this.addressInfo.id,
-          orderAmount: this.payCountMoney,
           userId: this.studentId,
+          orderAmount: this.obj.amount,
+          useBalance: this.obj.payType,
+          couponId: this.obj.couponIdList.join(","),
         };
         const res = await mallGenerateOrder(body);
         if (res.data.orderType == "success") {
@@ -596,7 +597,8 @@ export default {
     },
     async onChangeStatus(val) {
       this.isStatus = val;
-      this.__init();
+      await this.__init();
+      this.obj = null;
       this.payType = false;
       this.calcPrice();
     },
@@ -715,7 +717,7 @@ export default {
             item.goodsNum > 1 ? `${item.name} * ${item.goodsNum}` : item.name,
           type: "购买",
           price: price,
-          couponType: this.couponObj[item.type],
+          couponType: "MALLCOUPON",
         });
         tempPrice += price;
         this.groupPrice += price;
@@ -1044,4 +1046,4 @@ export default {
     height: 0.2rem;
   }
 }
-</style>
+</style>

vue.config.js

@@ -1,5 +1,5 @@
-let targetUrl = "https://mteatest.dayaedu.com";
-// let targetUrl = "http://192.168.3.26:8000";
+// let targetUrl = "https://mteatest.dayaedu.com";
+let targetUrl = "http://192.168.3.26:8000";
 // let targetUrl = 'http://192.168.3.20:8000'
 // let targetUrl = 'https://online.dayaedu.com'
 // let targetUrl = 'http://dev.dayaedu.com/'