优惠券活动

wx_application/src/views/active/activeDetail.vue

@@ -8,14 +8,14 @@
         <div class="coupon-content">
           <img src="../../../public/img/coupon.png" alt="coupon_bg" />
           <div class="content">
-            <div class="money">10元</div>
+            <div class="money">{{ couponDetail.unit }}元</div>
             <div class="split">
               <img src="../../../public/img/split.png" alt="split" />
             </div>
             <div class="other">
-              <p>满50元可用</p>
-              <p>有效期：09.09-09.10</p>
-              <p>全店通用</p>
+              <p>满{{couponDetail.salesUnit}}元可用</p>
+              <p>有效期：<span style="font-size: 12px;">{{ couponDetail.end_date }}</span></p>
+              <p>{{ couponDetail.deptId }}号店通用</p>
             </div>
           </div>
         </div>
@@ -102,6 +102,7 @@ export default {
   components: { wxAuth },
   data() {
     return {
+      couponDetail: {},
       game_end: false,
       res_error: false,
       error_message: "",
@@ -173,7 +174,7 @@ export default {
     if (!sessionStorage.getItem("userId")) {
       // 1.获取code
       if (this.$route.query.unionid === undefined) {
-        this.getUnionid();
+        // this.getUnionid();
       } else {
         console.log("有unionid");
         this.userBaseInfo.unionid = JSON.stringify(this.$route.query.unionid);
@@ -224,12 +225,12 @@ export default {
   methods: {
     // 领取
     handleGet() {
-      console.log("中奖奖品信息", this.awardGood);
       let params = {
-        couponId: this.awardGood.activityPrize.couponId,
+        couponId: this.awardGood.activityPrize ? this.awardGood.activityPrize.couponId : this.couponDetail.couponId,
         unionId: this.userBaseInfo.unionid,
         vipId: this.userBaseInfo.vipId
       };
+      console.log('领取', params);
       APi_Active.collectMyCoupon(params).then(res => {
         this.showAward = false;
         this.$toast(
@@ -249,7 +250,14 @@ export default {
             8
           )}` + time.substring(8);
         this.prizeListOrigin = res.data.list;
+        let time2 = res.data.coupon.end_date;
+        res.data.coupon.end_date = `${time2.substring(0, 4)}-${time2.substring(4, 6)}-${time2.substring(
+            6,
+            8
+          )}` + time2.substring(8);
+        this.couponDetail = res.data.coupon;
       });
+
     },
     handleCheckAuth() {
       this.showAuthDialog = false;
@@ -396,7 +404,7 @@ export default {
         left: 0;
         right: 0;
         bottom: 0;
-        width: 80%;
+        width: 85%;
         height: 92%;
         margin: 0 auto;
         display: flex;

wx_application/src/views/active/createActive.vue

@@ -191,7 +191,10 @@ export default {
         this.logo_imgs[0] = { url: res.data.activityInfo.logo };
         this.maxNumber = res.data.activityInfo.joinLimit?.toString();
         this.totalLimit = res.data.activityInfo.totalLimit?.toString();
-        this.couponId = res.data.activityInfo.couponId;
+        this.checked_coupon = {
+          couponId: res.data.activityInfo.couponId,
+          name: res.data.activityInfo.couponName
+        }
         this.message = res.activityInfo.des;
         let imgs = JSON.parse(res.data.activityInfo.image);
         let img_list = [];
@@ -204,6 +207,7 @@ export default {
       });
     },
     onSelect(val) {
+      console.log(val);
       this.checked_coupon = val;
       this.showCoupon = false;
     },
@@ -280,6 +284,7 @@ export default {
           joinLimit: Number(this.maxNumber),
           // 总发放数量
           totalLimit: Number(this.totalLimit),
+          couponName: this.checked_coupon.name,
           couponId: this.checked_coupon.couponId,
 
           des: this.message,

wx_application/src/views/active/createBigWheelActive.vue

@@ -367,8 +367,8 @@ export default {
           )}-${end_time.substring(6, 8)}` + end_time.substring(8);
         this.bg_imgs[0] = { url: res.data.activityInfo.backImage };
         this.logo_imgs[0] = { url: res.data.activityInfo.logo };
-        this.basicInfo.jointimes = res.data.activityInfo.joinLimit.toString();
-        this.basicInfo.total_join = res.data.activityInfo.totalLimit.toString();
+        this.basicInfo.jointimes = res.data.activityInfo.joinLimit?.toString();
+        this.basicInfo.total_join = res.data.activityInfo.totalLimit?.toString();
         this.message = res.data.activityInfo.des;
         let imgs = JSON.parse(res.data.activityInfo.image);
         let img_list = [];
@@ -419,7 +419,10 @@ export default {
           item.limit = p.personLimit?.toString();
           item.probability = p.probability?.toString();
           item.preLimit = p.limitReceive?.toString();
-          item.checked_coupon.couponId = p.coupon_id;
+          this.checked_coupon = {
+            couponId: p.coupon_id,
+            name: p.couponName
+          };
           prizes.push(item);
         });
         this.prizeList = prizes;
@@ -493,7 +496,9 @@ export default {
       // console.log(val);
     },
     handleCreate() {
-      if (new Date(this.basicInfo.startTime1) >= new Date(this.basicInfo.endTime1)) {
+      if (
+        new Date(this.basicInfo.startTime1) >= new Date(this.basicInfo.endTime1)
+      ) {
         this.$toast("活动开始时间应小于活动开始时间");
         return;
       }
@@ -514,7 +519,8 @@ export default {
         temp.probability = p.probability;
         total_probability += Number(p.probability);
         temp.limitReceive = p.preLimit;
-        temp.coupon_id = p.checked_coupon.couponId;
+        temp.couponId = p.checked_coupon.couponId;
+        temp.couponName = p.checked_coupon.name;
         params_prizeList.push(temp);
       });
       if (total_probability != 100) {