核销优惠券

src/pages/customerMan/myOrder/index.vue

@@ -252,17 +252,12 @@ type: "全额券" -->
               <el-table-column
                 prop="name"
                 label="卡卷名称"
-                width="200"
               ></el-table-column>
               <el-table-column
                 prop="type"
                 label="卡卷类型"
                 show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="price"
-                label="总价格"
-                show-overflow-tooltip
+                width="100"
               ></el-table-column>
               <el-table-column
                 prop="ex_time"
@@ -276,13 +271,28 @@ type: "全额券" -->
                 width="180"
                 show-overflow-tooltip
               ></el-table-column>
-              <el-table-column prop="status" label="状态" show-overflow-tooltip>
+              <el-table-column width="100" prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'colorA' + scope.row.status">
                     {{ couponStatus[scope.row.status] }}
                   </div>
                 </template>
               </el-table-column>
+              <el-table-column
+                prop=""
+                label="操作"
+                width="100"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope" v-if="scope.row.status==0">
+                  <div
+                    class="cancleCoupon"
+                    @click.stop="cancleCoupon(scope.row)"
+                  >
+                    操作
+                  </div>
+                </template>
+              </el-table-column>
             </el-table>
 
             <div class="pagin">
@@ -318,7 +328,7 @@ type: "全额券" -->
                 :key="index"
               >
                 <div class="name-text">{{ item.project_name }}</div>
-                <div class="change-num" v-if="cardInfo.card_type==1">
+                <div class="change-num" v-if="cardInfo.card_type == 1">
                   <div class="num-content">
                     <div class="content-left" @click="reduce(index)">-</div>
                     <div class="content-num">{{ item.num || 0 }}</div>
@@ -389,6 +399,30 @@ type: "全额券" -->
         </div>
       </div>
     </mine-pupop>
+    <!-- 操作核销优惠券 -->
+    <mine-pupop :show="isCancelCoupon">
+      <div class="CouponPop">
+        <div class="image">
+          <img
+            src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
+            alt
+            @click="closeCouponPop"
+          />
+        </div>
+        <div class="title">核销优惠券</div>
+        <div class="couponName">
+          <div class="one">优惠券名称:</div>
+          <div>{{ cancelCouponInfo.name }}</div>
+        </div>
+        <div class="couponRemark">
+          <div class="one">备注信息:</div>
+          <el-input v-model.trim="couponRemark"></el-input>
+        </div>
+        <div class="radio">
+          <button class="affirmBtn" @click="checkCoupon">确定</button>
+        </div>
+      </div>
+    </mine-pupop>
   </div>
 </template>
 
@@ -453,12 +487,43 @@ export default {
       isAmend: false, //修改次卡时间弹窗
       amendCardInfo: "", // 要修改次卡的信息
       cardTime: "", //次卡修改时间(年月日)
+      isCancelCoupon: false, //核销优惠券界面
+      cancelCouponInfo: "", //核销优惠券名称
+      couponRemark: "", //核销优惠券备注信息
     };
   },
   computed: {},
   watch: {},
 
   methods: {
+    // 打开核销优惠券界面
+    cancleCoupon(e) {
+      this.isCancelCoupon = true;
+      this.cancelCouponInfo = e;
+    },
+    // 关闭核销优惠券页面
+    closeCouponPop() {
+      this.isCancelCoupon = false;
+      this.couponRemark = ''
+    },
+    // 核销优惠券
+    checkCoupon(){
+      if(this.couponRemark==''){
+        this.$message.error('请填写备注信息')
+        return
+      }
+      api.checkCoupon({
+        id:this.cancelCouponInfo.id,
+        remark:this.couponRemark
+      }).then(res=>{
+        if(res.code==200){
+          this.$message.success('核销成功')
+          this.isCancelCoupon = false;
+          // 刷新优惠券列表
+          this.getUserCoupon()
+        }
+      })
+    },
     // 阻止修改次卡时间时键盘弹出
     forbid() {
       //禁止软键盘弹出
@@ -526,7 +591,7 @@ export default {
       this.isPore = true;
       api.cardInfo({ id: row.id }).then((res) => {
         if (res.code == 200) {
-          res.data.card_type = row.card_type
+          res.data.card_type = row.card_type;
           this.cardInfo = res.data;
         }
       });
@@ -679,6 +744,15 @@ export default {
 .order {
   height: 100%;
   width: 100%;
+  .cancleCoupon {
+    width: 50px;
+    height: 25px;
+    background: #fa7d22;
+    border-radius: 2px;
+    line-height: 25px;
+    text-align: center;
+    color: #fff;
+  }
   .pagin {
     padding: 20px 0;
     .el-pagination {
@@ -914,6 +988,70 @@ export default {
     }
   }
 }
+// 核销优惠券
+.CouponPop {
+  width: 440px;
+  height: 300px;
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 15px;
+  .image {
+    height: 30px;
+    width: 30px;
+    img {
+      width: 100%;
+    }
+  }
+  .title {
+    text-align: center;
+    font-weight: 700;
+    font-size: 16px;
+    margin-bottom: 40px;
+  }
+  .couponName {
+    display: flex;
+    margin-bottom: 40px;
+    .one {
+      font-weight: 600;
+      margin-right: 20px;
+      width: 90px;
+    }
+  }
+  .couponRemark {
+    display: flex;
+    align-items: center;
+    .one {
+      margin-right: 22px;
+      font-weight: 600;
+      width: 90px;
+    }
+    .el-input {
+      width: 300px;
+      /deep/.el-input__inner:focus {
+        // el-input输入时设置边框颜色
+        border: #fa7d22 1px solid;
+      }
+    }
+  }
+    .radio {
+    width: 100%;
+    display: flex;
+    justify-content: space-evenly;
+    button {
+      width: 176px;
+      height: 28px;
+      border-radius: 14px;
+      background-color: #fff;
+      border: none;
+      margin-top: 50px;
+    }
+    .affirmBtn {
+      background-color: #fa7d22;
+      color: #fff;
+      margin-left: 15px;
+    }
+  }
+}
 .expir_time {
   color: #3115cc;
 }

src/server/home.js

@@ -301,4 +301,8 @@ export default class Home {
   static goodsTakeOut(params) {
     return $http.post(url.goodsTakeOut, params)
   }
+  // 优惠券取消
+  static checkCoupon(params) {
+    return $http.post(url.checkCoupon, params)
+  }
 }

src/server/urls.js

@@ -194,5 +194,8 @@ export default {
   goodsPickUp: '/v2/pad/order/pick_up',
 
   // 美妆产品取货
-  goodsTakeOut: '/v2/pad/order/take_out'
+  goodsTakeOut: '/v2/pad/order/take_out',
+
+  // 优惠券取货
+  checkCoupon: '/v2/pad/coupon/check'
 }