Merge branch 'shop-mall' into online

src/components/MRefund.vue

@@ -54,6 +54,7 @@
     <Mcoupon
       class="Mcoupon"
       ref="Mcoupon"
+      :useSystem="useSystem"
       :showCoupon="showCoupon"
       :showBalance="balance > 0"
       :balance="balance"
@@ -192,6 +193,10 @@ export default {
     disCountList: {
       type: Array,
     },
+    useSystem: {
+      type: String,
+      default: "MEC",
+    },
     showCoupon: {
       type: Boolean,
       default: true,

src/components/Mcoupon.vue

@@ -65,6 +65,7 @@
           :status="0"
           :isEdit="true"
           :buyList="buyList"
+          :useSystem="useSystem"
           :all="true"
           :studentId="studentIds"
           @resetTitle="resetTitle"
@@ -88,6 +89,7 @@ export default {
     "showCoupon",
     "balance",
     "payType",
+    "useSystem",
     "buyList",
     "studentId",
     "iconSrc",
@@ -167,7 +169,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/coupon/list.vue

@@ -47,7 +47,7 @@ import item from "./item";
 import { sysCouponCode } from "./api";
 import { isDuringDate } from "@/helpers/utils";
 export default {
-  props: ["status", "isEdit", "allMoney", "all", "buyList"],
+  props: ["status", "isEdit", "allMoney", "all", "buyList", "useSystem"],
   components: {
     MEmpty,
     "coupon-item": item,
@@ -61,6 +61,7 @@ export default {
       dataList: [],
       params: {
         page: 1,
+        useSystem: this.useSystem || "",
         usageStatus: this.status,
         rows: this.all ? 9999 : 10,
       },
@@ -126,7 +127,7 @@ export default {
       let faceValueList = {};
       let shopType = []; // 所以类型的商品
       this.buyList.forEach((item) => {
-        if (shopObj[item.couponType]) {
+        if (shopObj[item.couponType] || shopType.includes(item.couponType)) {
           shopObj[item.couponType] += Number(item.price);
         } else {
           shopObj[item.couponType] = Number(item.price);
@@ -147,7 +148,7 @@ export default {
        *      if (shopType.indexOf(copon.typeDetail) == -1) {
           copon.disabled = true;
         }
-       * 
+       *
        */
       this.dataList.forEach((item) => {
         if (list.indexOf(item.couponCodeId) != -1) {

src/views/shopMall/GoodsOrder.vue

@@ -65,7 +65,12 @@
               class="van-hairline--top"
             >
               <template #title>
-                订单金额：<span>¥{{ list.totalAmount | moneyFormat }}</span>
+                订单金额：<span
+                  >¥{{
+                    (list.actualAmount + list.balancePaymentAmount)
+                      | moneyFormat
+                  }}</span
+                >
               </template>
               <template>
                 <van-button
@@ -147,7 +152,12 @@
               title=" "
             >
               <template #title>
-                订单金额：<span>¥{{ list.totalAmount | moneyFormat }}</span>
+                订单金额：<span
+                  >¥{{
+                    (list.actualAmount + list.balancePaymentAmount)
+                      | moneyFormat
+                  }}</span
+                >
               </template>
               <template>
                 <div>

src/views/shopMall/GoodsOrderDetail.vue

@@ -37,13 +37,16 @@
       <p class="order-item">
         <span>应付金额</span
         ><span style="color: #ff3535"
-          >￥{{ goodsDetail.totalAmount | moneyFormat }}</span
+          >￥{{
+            (goodsDetail.actualAmount + goodsDetail.balancePaymentAmount)
+              | moneyFormat
+          }}</span
         >
       </p>
-      <p class="order-item">
+      <!-- <p class="order-item">
         <span>乐器减免</span
         ><span>￥{{ -goodsDetail.marketAmount | moneyFormat }}</span>
-      </p>
+      </p> -->
       <p class="order-item">
         <span>优惠券</span
         ><span>￥{{ -goodsDetail.couponRemitFee | moneyFormat }}</span>
@@ -403,4 +406,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/shopMall/GoodsSale.vue

@@ -240,14 +240,15 @@
       position="bottom"
       v-if="refundStatus"
       style="border-radius: 0 !important"
+      get-container="#app"
     >
       <m-refund
         @onClose="refundStatus = !refundStatus"
         @onPopupSure="onRefundSure"
+        useSystem="MALL"
         :ids="[1]"
-        :showCoupon="false"
         :buyList="buyList"
-        :balance="0"
+        :balance="balance"
       />
       <!-- :balance="this.orderType == 1 ? balance : 0" -->
     </van-popup>
@@ -348,12 +349,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);
   },
@@ -462,7 +463,7 @@ export default {
         return;
       }
       // 确认退费规则
-      if (!this.refundSure && this.payCountMoney - this.marketAmount > 0) {
+      if (!this.refundSure) {
         this.refundStatus = true;
         this.hashState();
         return;
@@ -540,8 +541,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 +599,8 @@ export default {
     },
     async onChangeStatus(val) {
       this.isStatus = val;
-      this.__init();
+      await this.__init();
+      this.obj = null;
       this.payType = false;
       this.calcPrice();
     },
@@ -605,7 +609,7 @@ export default {
         return;
       }
       // 确认退费规则
-      if (!this.refundSure && this.payCountMoney > 0) {
+      if (!this.refundSure) {
         this.refundStatus = true;
         return;
       }
@@ -715,7 +719,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 +1048,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/'