Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/api/member/active/index.js

@@ -18,6 +18,24 @@ export function attendActive(data) {
   })
 }
 
+// 参加营销活动
+export function attendActiveOrder(data) {
+  return request({
+    url: '/base/customer-active/attendActiveOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 充值
+export function recharge(data) {
+  return request({
+    url: '/base/customer-active/recharge',
+    method: 'post',
+    data: data
+  })
+}
+
 // 获得营销活动分页
 export function joinActive(params) {
   return request({

src/views/base/customer/ReceiveCouponForm.vue

@@ -202,7 +202,7 @@ export default {
           selectCoupon:this.multipleSelection,
           accountType: this.accountType
         }
-        await ActiveMainApi.attendActive(data);
+        await ActiveMainApi.attendActiveOrder(data);
         if (this.formData.isPack == '0'){
           this.$modal.msgSuccess("已生成订单，请客户尽快支付");
         } else {

src/views/base/customer/RuchForm.vue

@@ -141,7 +141,7 @@ export default {
           topUpAmount: this.topUpAmount,
           accountType: this.accountType
         }
-        await ActiveMainApi.attendActive(data);
+        await ActiveMainApi.attendActiveOrder(data);
         this.$modal.msgSuccess("已生成订单，请客户尽快支付");
         this.dialogVisible = false
         this.$emit('success');