增加优惠券查看

src/pages/customerMan/myOrder/index.vue

@@ -7,8 +7,7 @@
           type="primary"
           @click="refreshList"
           :loading="refresh"
-          >{{ refresh ? "加载中..." : "刷新" }}</el-button
-        >
+        >{{ refresh ? "加载中..." : "刷新" }}</el-button>
       </div>
       <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
         <el-tab-pane label="项目订单" name="first">
@@ -33,40 +32,27 @@
                   <div>{{ scope.row.goods.length }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="price"
-                label="总价格"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="order_time"
-                label="预约时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="store_name"
-                label="预约店铺"
-                show-overflow-tooltip
-              ></el-table-column>
+              <el-table-column prop="price" label="总价格" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="order_time" label="预约时间" width="180" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="store_name" label="预约店铺" show-overflow-tooltip></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'color' + scope.row.status">
                     <!-- 状态：0已预约，未支付，1已支付，待使用，2正在使用，3已结算，-1已取消，-2退款审核中，-3已退款 -->
                     {{
-                      scope.row.status == 0
-                        ? "已预约"
-                        : scope.row.status == 1
-                        ? "待使用"
-                        : scope.row.status == 2
-                        ? "正在使用"
-                        : scope.row.status == 3
-                        ? "已结算"
-                        : scope.row.status == -1
-                        ? "已取消"
-                        : scope.row.status == -2
-                        ? "退款审核中"
-                        : "已退款"
+                    scope.row.status == 0
+                    ? "已预约"
+                    : scope.row.status == 1
+                    ? "待使用"
+                    : scope.row.status == 2
+                    ? "正在使用"
+                    : scope.row.status == 3
+                    ? "已结算"
+                    : scope.row.status == -1
+                    ? "已取消"
+                    : scope.row.status == -2
+                    ? "退款审核中"
+                    : "已退款"
                     }}
                   </div>
                 </template>
@@ -99,25 +85,11 @@
                   <div>{{ scope.row.card_name | ellipsis(8) }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="total_num"
-                label="总次数"
-                show-overflow-tooltip
-                align="center"
-              >
-                <template slot-scope="{ row }" v-if="row.card_type == 1">
-                  {{ row.total_num }}
-                </template>
+              <el-table-column prop="total_num" label="总次数" show-overflow-tooltip align="center">
+                <template slot-scope="{ row }" v-if="row.card_type == 1">{{ row.total_num }}</template>
               </el-table-column>
-              <el-table-column
-                prop="num"
-                label="剩余次数"
-                show-overflow-tooltip
-                align="center"
-              >
-                <template slot-scope="{ row }" v-if="row.card_type == 1">
-                  {{ row.num }}
-                </template>
+              <el-table-column prop="num" label="剩余次数" show-overflow-tooltip align="center">
+                <template slot-scope="{ row }" v-if="row.card_type == 1">{{ row.num }}</template>
               </el-table-column>
               <el-table-column
                 prop="used_num"
@@ -126,49 +98,30 @@
                 show-overflow-tooltip
                 align="center"
               ></el-table-column>
-              <el-table-column
-                prop="expir_time"
-                label="过期时间"
-                width="180"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="expir_time" label="过期时间" width="180" show-overflow-tooltip>
                 <template slot-scope="{ row }">
-                  <div class="expir_time" @click.stop="amendCardTime(row)">
-                    {{ row.expir_time }}
-                  </div>
+                  <div class="expir_time" @click.stop="amendCardTime(row)">{{ row.expir_time }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="create_time"
-                label="创建时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
+              <el-table-column prop="create_time" label="创建时间" width="180" show-overflow-tooltip></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'colorB' + scope.row.status">
                     {{
-                      scope.row.status == -2
-                        ? "已注销"
-                        : scope.row.status == -1
-                        ? "已过期"
-                        : scope.row.status == -0
-                        ? "已使用"
-                        : "待使用"
+                    scope.row.status == -2
+                    ? "已注销"
+                    : scope.row.status == -1
+                    ? "已过期"
+                    : scope.row.status == -0
+                    ? "已使用"
+                    : "待使用"
                     }}
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop=""
-                label="操作"
-                width="100"
-                show-overflow-tooltip
-              >
+              <el-table-column prop label="操作" width="100" show-overflow-tooltip>
                 <template slot-scope="scope" v-if="scope.row.status == 1">
-                  <div class="cancleCoupon" @click.stop="cancleCard(scope.row)">
-                    操作
-                  </div>
+                  <div class="cancleCoupon" @click.stop="cancleCard(scope.row)">操作</div>
                 </template>
               </el-table-column>
             </el-table>
@@ -198,7 +151,7 @@
 goods: [{order_id: 47, name: "润百颜玻尿酸屏障调理面膜", num: 1}]
 id: 47
 price: "0.01"
-status: 5 -->
+              status: 5-->
 
               <el-table-column prop="goods" label="商品名称" width="200">
                 <template slot-scope="scope">
@@ -212,33 +165,24 @@ status: 5 -->
                   <div>{{ scope.row.goods.length }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="price"
-                label="实付款"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="create_time"
-                label="下单时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
+              <el-table-column prop="price" label="实付款" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="create_time" label="下单时间" width="180" show-overflow-tooltip></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'color' + scope.row.status">
                     <!-- 状态，0未支付，1已支付，待取货，2已取货，-1已取消，-2退款审核中，-3已退款 -->
                     {{
-                      scope.row.status == 0
-                        ? "未支付"
-                        : scope.row.status == 1
-                        ? "待取货"
-                        : scope.row.status == 2
-                        ? "已取货"
-                        : scope.row.status == -1
-                        ? "已取消"
-                        : scope.row.status == -2
-                        ? "退款审核中"
-                        : "已退款"
+                    scope.row.status == 0
+                    ? "未支付"
+                    : scope.row.status == 1
+                    ? "待取货"
+                    : scope.row.status == 2
+                    ? "已取货"
+                    : scope.row.status == -1
+                    ? "已取消"
+                    : scope.row.status == -2
+                    ? "退款审核中"
+                    : "已退款"
                     }}
                   </div>
                 </template>
@@ -270,52 +214,25 @@ ex_time: "2022.03.17 23:59"
 id: 2517
 name: "新人体验券"
 status: 2
-type: "全额券" -->
+              type: "全额券"-->
 
               <el-table-column prop="name" label="卡卷名称"></el-table-column>
-              <el-table-column
-                prop="type"
-                label="卡卷类型"
-                show-overflow-tooltip
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="ex_time"
-                label="到期时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="create_time"
-                label="创建时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                width="100"
-                prop="status"
-                label="状态"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="type" label="卡卷类型" show-overflow-tooltip width="100"></el-table-column>
+              <el-table-column prop="ex_time" label="到期时间" width="180" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="create_time" label="创建时间" width="180" show-overflow-tooltip></el-table-column>
+              <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>
+                  <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
-              >
+              <el-table-column prop label="备注" width="90" show-overflow-tooltip>
+                <template slot-scope="scope" v-if="scope.row.is_send == 1">
+                  <button class="examineCoupon" @click.stop="cancleCoupon(scope.row,true)">查看</button>
+                </template>
+              </el-table-column>
+              <el-table-column prop label="操作" width="80" show-overflow-tooltip>
                 <template slot-scope="scope" v-if="scope.row.status == 0">
-                  <div
-                    class="cancleCoupon"
-                    @click.stop="cancleCoupon(scope.row)"
-                  >
-                    操作
-                  </div>
+                  <div class="cancleCoupon" @click.stop="cancleCoupon(scope.row,false)">操作</div>
                 </template>
               </el-table-column>
             </el-table>
@@ -347,11 +264,7 @@ type: "全额券" -->
           <div class="project">
             <div class="project-title">项目名称：</div>
             <div class="project-list">
-              <div
-                class="project-info"
-                v-for="(item, index) in cardInfo.project_list"
-                :key="index"
-              >
+              <div class="project-info" v-for="(item, index) in cardInfo.project_list" :key="index">
                 <div class="name-text">{{ item.project_name }}</div>
                 <div class="change-num" v-if="cardInfo.card_type == 1">
                   <div class="num-content">
@@ -364,33 +277,27 @@ type: "全额券" -->
             </div>
           </div>
           <div class="common">
-            <span class="common-title">支付方式：</span
-            ><span>{{ cardInfo.pay_way }}</span>
+            <span class="common-title">支付方式：</span>
+            <span>{{ cardInfo.pay_way }}</span>
           </div>
           <div class="common">
-            <span class="common-title">有效期限：</span
-            ><span>{{ cardInfo.ex_time }}</span>
+            <span class="common-title">有效期限：</span>
+            <span>{{ cardInfo.ex_time }}</span>
           </div>
           <div class="common">
-            <span class="common-title">实付金额：</span
-            ><span>￥{{ cardInfo.price }}</span>
+            <span class="common-title">实付金额：</span>
+            <span>￥{{ cardInfo.price }}</span>
           </div>
           <div class="consume-list">
             <div class="consume-title">消耗信息：</div>
-            <div
-              class="consume-info min-size"
-              v-for="(item, index) in cardLogList"
-              :key="index"
-            >
+            <div class="consume-info min-size" v-for="(item, index) in cardLogList" :key="index">
               <div class="shop">{{ item.store_name }}</div>
               <div class="project-tips">{{ item.remark }}</div>
               <div class="project-ts">{{ item.create_time }}</div>
             </div>
           </div>
         </div>
-        <div v-if="cardInfo.card_type == 1" class="confirm" @click="confirm">
-          确定
-        </div>
+        <div v-if="cardInfo.card_type == 1" class="confirm" @click="confirm">确定</div>
       </div>
     </mine-pupop>
     <!-- 修改次卡时间 -->
@@ -405,7 +312,8 @@ type: "全额券" -->
         </div>
         <div class="admendTime-content">
           <div class="oldTime">
-            次卡过期时间 :<span> {{ amendCardInfo.expir_time }}</span>
+            次卡过期时间 :
+            <span>{{ amendCardInfo.expir_time }}</span>
           </div>
           <div class="newTime">
             选择更改日期:
@@ -416,8 +324,7 @@ type: "全额券" -->
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
               @focus="forbid"
-            >
-            </el-date-picker>
+            ></el-date-picker>
           </div>
           <div class="radio">
             <button class="cancelBtn" @click="cancel">取消</button>
@@ -436,14 +343,15 @@ type: "全额券" -->
             @click="closeCouponPop"
           />
         </div>
-        <div class="title">核销优惠券</div>
+        <div class="title">{{examineCoupon?'发券备注信息':'核销优惠券'}}</div>
         <div class="couponName">
-          <div class="one">优惠券名称:</div>
-          <div>{{ cancelCouponInfo.name }}</div>
+          <div class="one">{{examineCoupon?'发券人:':'优惠券名称:'}}</div>
+          <div>{{ examineCoupon?cancelCouponInfo.send_name:cancelCouponInfo.name }}</div>
         </div>
         <div class="couponRemark">
           <div class="one">备注信息:</div>
-          <el-input v-model.trim="couponRemark"></el-input>
+          <el-input v-if='!examineCoupon' v-model.trim="couponRemark"></el-input>
+          <div v-else>{{cancelCouponInfo.send_remark}}</div>
         </div>
         <div class="radio">
           <button class="affirmBtn" @click="checkCoupon">确定</button>
@@ -483,19 +391,19 @@ import minePupop from "../../../components/minePupop/index.vue";
 
 export default {
   components: {
-    minePupop,
+    minePupop
   },
   data() {
     return {
       couponList: [
         {
           value: "选项1",
-          label: "黄金糕",
+          label: "黄金糕"
         },
         {
           value: "选项2",
-          label: "双皮奶",
-        },
+          label: "双皮奶"
+        }
       ],
       tableData: [
         {
@@ -507,7 +415,7 @@ export default {
           numberList: 2,
           price: 100,
           shop: "运用店",
-          status: 2,
+          status: 2
         },
         {
           date: "2022.04.25  14:30",
@@ -518,8 +426,8 @@ export default {
           numberList: 5,
           price: 800,
           shop: "武昌店",
-          status: 1,
-        },
+          status: 1
+        }
       ],
       couponStatus: ["待使用", "已使用", "已过期"],
       goodStatus: ["未支付", "已支付", "已取货"],
@@ -539,12 +447,13 @@ export default {
       amendCardInfo: "", // 要修改次卡的信息
       cardTime: "", //次卡修改时间(年月日)
       isCancelCoupon: false, //核销优惠券界面
-      cancelCouponInfo: "", //核销优惠券名称
+      cancelCouponInfo: "", //核销优惠券信息
       couponRemark: "", //核销优惠券备注信息
       refresh: false, //刷新页面数据
       isCancelCard: false, //核销次卡界面
-      cancelCardInfo: "", //核销次卡名称
-      cardRemark: "", //核销优惠券备注信息
+      cancelCardInfo: "", //核销次卡信息
+      cardRemark: "", //核销次卡备注信息
+      examineCoupon:false,//是否是查看优惠券
     };
   },
   computed: {},
@@ -554,7 +463,7 @@ export default {
     // 刷新页面数据
     refreshList() {
       this.refresh = true;
-      api.syncErpOrder({}).then((res) => {
+      api.syncErpOrder({}).then(res => {
         if (res.code == 200) {
           this.currentPage1 = 1;
           if (this.activeName == "first") {
@@ -570,7 +479,8 @@ export default {
       });
     },
     // 打开核销优惠券界面
-    cancleCoupon(e) {
+    cancleCoupon(e,examineCoupon) {
+      this.examineCoupon = examineCoupon
       this.isCancelCoupon = true;
       this.cancelCouponInfo = e;
     },
@@ -581,6 +491,10 @@ export default {
     },
     // 核销优惠券
     checkCoupon() {
+      if(this.examineCoupon){
+        this.isCancelCoupon = false;
+        return
+      }
       if (this.couponRemark == "") {
         this.$message.error("请填写备注信息");
         return;
@@ -588,9 +502,9 @@ export default {
       api
         .checkCoupon({
           id: this.cancelCouponInfo.id,
-          remark: this.couponRemark,
+          remark: this.couponRemark
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.$message.success("核销成功");
             this.isCancelCoupon = false;
@@ -617,9 +531,9 @@ export default {
       api
         .checkCard({
           id: this.cancelCardInfo.id,
-          remark: this.cardRemark,
+          remark: this.cardRemark
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.$message.success("核销成功");
             this.isCancelCard = false;
@@ -648,7 +562,7 @@ export default {
       if (e.status == -2) {
         this.$message({
           message: "该次卡已注销",
-          type: "error",
+          type: "error"
         });
         return;
       }
@@ -666,13 +580,13 @@ export default {
       api
         .amendCardTime({
           id: this.amendCardInfo.id,
-          expire_date: this.cardTime,
+          expire_date: this.cardTime
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: "success",
+              type: "success"
             });
             this.isAmend = false;
             // 更新次卡列表
@@ -685,9 +599,9 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
-      api.getUserCoupon(params).then((res) => {
+      api.getUserCoupon(params).then(res => {
         this.couponData = res.data.list;
         this.total = res.data.total;
         // 关闭刷新动画
@@ -705,18 +619,18 @@ export default {
       if (row.status == -2) {
         this.$message({
           message: "该次卡已注销",
-          type: "error",
+          type: "error"
         });
         return;
       }
       this.isPore = true;
-      api.cardInfo({ id: row.id }).then((res) => {
+      api.cardInfo({ id: row.id }).then(res => {
         if (res.code == 200) {
           res.data.card_type = row.card_type;
           this.cardInfo = res.data;
         }
       });
-      api.cardLog({ id: row.id }).then((res) => {
+      api.cardLog({ id: row.id }).then(res => {
         if (res.code == 200) {
           this.cardLogList = res.data.list;
         }
@@ -726,19 +640,19 @@ export default {
       // 项目ID，json字符，格式如：[{"project_id":"10","num":5}]，project_id：适用项目ID，num：剩余次数
       let project_data = [],
         project_info = {};
-      this.cardInfo.project_list.forEach((res) => {
+      this.cardInfo.project_list.forEach(res => {
         project_info = {
           project_id: res.id,
-          num: res.num,
+          num: res.num
         };
         project_data.push(project_info);
       });
       api
         .cardUpdate({
           id: this.cardInfo.id,
-          project_data: JSON.stringify(project_data),
+          project_data: JSON.stringify(project_data)
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.$message.success("更改成功！");
             this.isPore = false;
@@ -753,9 +667,9 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
-      api.getUserGoods(params).then((res) => {
+      api.getUserGoods(params).then(res => {
         this.goodData = res.data.list;
         this.total = res.data.total;
         // 关闭刷新动画
@@ -768,9 +682,9 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
-      api.getUserProject(params).then((res) => {
+      api.getUserProject(params).then(res => {
         this.projectData = res.data.list;
         this.total = res.data.total;
         // 关闭刷新动画
@@ -797,7 +711,7 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
       let resp = await api.getCardList(params);
       if (resp.code === 200) {
@@ -824,8 +738,8 @@ export default {
       this.$router.push({
         path: "/historicalOrder/details",
         query: {
-          id: row.id,
-        },
+          id: row.id
+        }
       });
     },
     onSubmit() {},
@@ -842,7 +756,7 @@ export default {
       } else if (e.index == 3) {
         this.getUserCoupon();
       }
-    },
+    }
   },
 
   created() {
@@ -862,7 +776,7 @@ export default {
     }
   },
 
-  mounted() {},
+  mounted() {}
 };
 </script>
 
@@ -891,6 +805,11 @@ export default {
     text-align: center;
     color: #fff;
   }
+  .examineCoupon {
+    width: 50px;
+    height: 25px;
+
+  }
   .pagin {
     padding: 20px 0;
     .el-pagination {

src/pages/payUser/myOrder/index.vue

@@ -7,8 +7,7 @@
           type="primary"
           @click="refreshList"
           :loading="refresh"
-          >{{ refresh ? "加载中..." : "刷新" }}</el-button
-        >
+        >{{ refresh ? "加载中..." : "刷新" }}</el-button>
       </div>
       <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
         <el-tab-pane label="项目订单" name="first">
@@ -33,40 +32,27 @@
                   <div>{{ scope.row.goods.length }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="price"
-                label="总价格"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="order_time"
-                label="预约时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="store_name"
-                label="预约店铺"
-                show-overflow-tooltip
-              ></el-table-column>
+              <el-table-column prop="price" label="总价格" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="order_time" label="预约时间" width="180" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="store_name" label="预约店铺" show-overflow-tooltip></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'color' + scope.row.status">
                     <!-- 状态：0已预约，未支付，1已支付，待使用，2正在使用，3已结算，-1已取消，-2退款审核中，-3已退款 -->
                     {{
-                      scope.row.status == 0
-                        ? "已预约"
-                        : scope.row.status == 1
-                        ? "待使用"
-                        : scope.row.status == 2
-                        ? "正在使用"
-                        : scope.row.status == 3
-                        ? "已结算"
-                        : scope.row.status == -1
-                        ? "已取消"
-                        : scope.row.status == -2
-                        ? "退款审核中"
-                        : "已退款"
+                    scope.row.status == 0
+                    ? "已预约"
+                    : scope.row.status == 1
+                    ? "待使用"
+                    : scope.row.status == 2
+                    ? "正在使用"
+                    : scope.row.status == 3
+                    ? "已结算"
+                    : scope.row.status == -1
+                    ? "已取消"
+                    : scope.row.status == -2
+                    ? "退款审核中"
+                    : "已退款"
                     }}
                   </div>
                 </template>
@@ -99,25 +85,19 @@
                   <div>{{ scope.row.card_name | ellipsis(8) }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="total_num"
-                label="总次数"
-                show-overflow-tooltip
-                align="center"
-              >
-                <template slot-scope="{ row }" v-if="row.card_type == 1">{{
+              <el-table-column prop="total_num" label="总次数" show-overflow-tooltip align="center">
+                <template slot-scope="{ row }" v-if="row.card_type == 1">
+                  {{
                   row.total_num
-                }}</template>
+                  }}
+                </template>
               </el-table-column>
-              <el-table-column
-                prop="num"
-                label="剩余次数"
-                show-overflow-tooltip
-                align="center"
-              >
-                <template slot-scope="{ row }" v-if="row.card_type == 1">{{
+              <el-table-column prop="num" label="剩余次数" show-overflow-tooltip align="center">
+                <template slot-scope="{ row }" v-if="row.card_type == 1">
+                  {{
                   row.num
-                }}</template>
+                  }}
+                </template>
               </el-table-column>
 
               <el-table-column
@@ -127,49 +107,30 @@
                 show-overflow-tooltip
                 align="center"
               ></el-table-column>
-              <el-table-column
-                prop="expir_time"
-                label="过期时间"
-                width="180"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="expir_time" label="过期时间" width="180" show-overflow-tooltip>
                 <template slot-scope="{ row }">
-                  <div class="expir_time" @click.stop="amendCardTime(row)">
-                    {{ row.expir_time }}
-                  </div>
+                  <div class="expir_time" @click.stop="amendCardTime(row)">{{ row.expir_time }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="create_time"
-                label="创建时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
+              <el-table-column prop="create_time" label="创建时间" width="180" show-overflow-tooltip></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'colorB' + scope.row.status">
                     {{
-                      scope.row.status == -2
-                        ? "已注销"
-                        : scope.row.status == -1
-                        ? "已过期"
-                        : scope.row.status == -0
-                        ? "已使用"
-                        : "待使用"
+                    scope.row.status == -2
+                    ? "已注销"
+                    : scope.row.status == -1
+                    ? "已过期"
+                    : scope.row.status == -0
+                    ? "已使用"
+                    : "待使用"
                     }}
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop=""
-                label="操作"
-                width="100"
-                show-overflow-tooltip
-              >
+              <el-table-column prop label="操作" width="100" show-overflow-tooltip>
                 <template slot-scope="scope" v-if="scope.row.status == 1">
-                  <div class="cancleCoupon" @click.stop="cancleCard(scope.row)">
-                    操作
-                  </div>
+                  <div class="cancleCoupon" @click.stop="cancleCard(scope.row)">操作</div>
                 </template>
               </el-table-column>
             </el-table>
@@ -199,7 +160,7 @@
 goods: [{order_id: 47, name: "润百颜玻尿酸屏障调理面膜", num: 1}]
 id: 47
 price: "0.01"
-status: 5 -->
+              status: 5-->
 
               <el-table-column prop="goods" label="商品名称" width="200">
                 <template slot-scope="scope">
@@ -213,32 +174,23 @@ status: 5 -->
                   <div>{{ scope.row.goods.length }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="price"
-                label="实付款"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="create_time"
-                label="下单时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
+              <el-table-column prop="price" label="实付款" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="create_time" label="下单时间" width="180" show-overflow-tooltip></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div :class="'color' + scope.row.status">
                     {{
-                      scope.row.status == 0
-                        ? "未支付"
-                        : scope.row.status == 1
-                        ? "待取货"
-                        : scope.row.status == 2
-                        ? "已取货"
-                        : scope.row.status == -1
-                        ? "已取消"
-                        : scope.row.status == -2
-                        ? "退款审核中"
-                        : "已退款"
+                    scope.row.status == 0
+                    ? "未支付"
+                    : scope.row.status == 1
+                    ? "待取货"
+                    : scope.row.status == 2
+                    ? "已取货"
+                    : scope.row.status == -1
+                    ? "已取消"
+                    : scope.row.status == -2
+                    ? "退款审核中"
+                    : "已退款"
                     }}
                   </div>
                 </template>
@@ -270,50 +222,25 @@ ex_time: "2022.03.17 23:59"
 id: 2517
 name: "新人体验券"
 status: 2
-type: "全额券" -->
+              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="create_time"
-                label="到期时间"
-                width="180"
-                show-overflow-tooltip
-              ></el-table-column>
-              <el-table-column
-                prop="create_time"
-                label="创建时间"
-                width="180"
-                show-overflow-tooltipA
-              ></el-table-column>
+              <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="create_time" label="到期时间" width="180" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="create_time" label="创建时间" width="180" show-overflow-tooltipA></el-table-column>
               <el-table-column prop="status" label="状态" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'colorA' + scope.row.status">
-                    {{ couponStatus[scope.row.status] }}
-                  </div>
+                  <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
-              >
+              <el-table-column prop label="备注" width="90" show-overflow-tooltip>
+                <template slot-scope="scope" v-if="scope.row.is_send == 1">
+                  <button class="examineCoupon" @click.stop="cancleCoupon(scope.row,true)">查看</button>
+                </template>
+              </el-table-column>
+              <el-table-column prop label="操作" width="80" show-overflow-tooltip>
                 <template slot-scope="scope" v-if="scope.row.status == 0">
-                  <div
-                    class="cancleCoupon"
-                    @click.stop="cancleCoupon(scope.row)"
-                  >
-                    操作
-                  </div>
+                  <div class="cancleCoupon" @click.stop="cancleCoupon(scope.row,false)">操作</div>
                 </template>
               </el-table-column>
             </el-table>
@@ -348,20 +275,12 @@ type: "全额券" -->
                   <div>{{ scope.row.before_amount }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="goods"
-                label="变更后金额"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="goods" label="变更后金额" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div>{{ scope.row.after_amount }}</div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="price"
-                label="变更金额"
-                show-overflow-tooltip
-              >
+              <el-table-column prop="price" label="变更金额" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div>
                     {{ scope.row.is_add == 1 ? "+" : "-"
@@ -373,29 +292,29 @@ type: "全额券" -->
                 <template slot-scope="scope">
                   <div>{{ scope.row.msg }}</div>
                 </template>
-              </el-table-column> -->
+              </el-table-column>-->
               <!--  余额类型(记录类型，1充值，2充值赠送，3订单退款，5提现驳回，-1消费，-2提现冻结，10客服添加，-10客服扣除) -->
               <el-table-column prop="status" label="类型" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div>
                     {{
-                      scope.row.type == 1
-                        ? "充值"
-                        : scope.row.type == 2
-                        ? "充值赠送"
-                        : scope.row.type == 3
-                        ? "订单退款"
-                        : scope.row.type == 5
-                        ? "提现驳回"
-                        : scope.row.type == -1
-                        ? "消费"
-                        : scope.row.type == -2
-                        ? "提现冻结"
-                        : scope.row.type == 10
-                        ? "客服添加"
-                        : scope.row.type == -10
-                        ? "客服扣除"
-                        : ""
+                    scope.row.type == 1
+                    ? "充值"
+                    : scope.row.type == 2
+                    ? "充值赠送"
+                    : scope.row.type == 3
+                    ? "订单退款"
+                    : scope.row.type == 5
+                    ? "提现驳回"
+                    : scope.row.type == -1
+                    ? "消费"
+                    : scope.row.type == -2
+                    ? "提现冻结"
+                    : scope.row.type == 10
+                    ? "客服添加"
+                    : scope.row.type == -10
+                    ? "客服扣除"
+                    : ""
                     }}
                   </div>
                 </template>
@@ -428,11 +347,7 @@ type: "全额券" -->
           <div class="project">
             <div class="project-title">项目名称：</div>
             <div class="project-list">
-              <div
-                class="project-info"
-                v-for="(item, index) in cardInfo.project_list"
-                :key="index"
-              >
+              <div class="project-info" v-for="(item, index) in cardInfo.project_list" :key="index">
                 <div class="name-text">{{ item.project_name }}</div>
                 <div class="change-num" v-if="cardInfo.card_type == 1">
                   <div class="num-content">
@@ -445,33 +360,27 @@ type: "全额券" -->
             </div>
           </div>
           <div class="common">
-            <span class="common-title">支付方式：</span
-            ><span>{{ cardInfo.pay_way }}</span>
+            <span class="common-title">支付方式：</span>
+            <span>{{ cardInfo.pay_way }}</span>
           </div>
           <div class="common">
-            <span class="common-title">有效期限：</span
-            ><span>{{ cardInfo.ex_time }}</span>
+            <span class="common-title">有效期限：</span>
+            <span>{{ cardInfo.ex_time }}</span>
           </div>
           <div class="common">
-            <span class="common-title">实付金额：</span
-            ><span>￥{{ cardInfo.price }}</span>
+            <span class="common-title">实付金额：</span>
+            <span>￥{{ cardInfo.price }}</span>
           </div>
           <div class="consume-list">
             <div class="consume-title">消耗信息：</div>
-            <div
-              class="consume-info min-size"
-              v-for="(item, index) in cardLogList"
-              :key="index"
-            >
+            <div class="consume-info min-size" v-for="(item, index) in cardLogList" :key="index">
               <div class="shop">{{ item.store_name }}</div>
               <div class="project-tips">{{ item.remark }}</div>
               <div class="project-ts">{{ item.create_time }}</div>
             </div>
           </div>
         </div>
-        <div v-if="cardInfo.card_type == 1" class="confirm" @click="confirm">
-          确定
-        </div>
+        <div v-if="cardInfo.card_type == 1" class="confirm" @click="confirm">确定</div>
       </div>
     </mine-pupop>
     <!-- 修改次卡时间 -->
@@ -486,7 +395,8 @@ type: "全额券" -->
         </div>
         <div class="admendTime-content">
           <div class="oldTime">
-            次卡过期时间 :<span> {{ amendCardInfo.expir_time }}</span>
+            次卡过期时间 :
+            <span>{{ amendCardInfo.expir_time }}</span>
           </div>
           <div class="newTime">
             选择更改日期:
@@ -497,8 +407,7 @@ type: "全额券" -->
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
               @focus="forbid"
-            >
-            </el-date-picker>
+            ></el-date-picker>
           </div>
           <div class="radio">
             <button class="cancelBtn" @click="cancel">取消</button>
@@ -517,14 +426,15 @@ type: "全额券" -->
             @click="closeCouponPop"
           />
         </div>
-        <div class="title">核销优惠券</div>
+        <div class="title">{{examineCoupon?'发券备注信息':'核销优惠券'}}</div>
         <div class="couponName">
-          <div class="one">优惠券名称:</div>
-          <div>{{ cancelCouponInfo.name }}</div>
+          <div class="one">{{examineCoupon?'发券人:':'优惠券名称:'}}</div>
+          <div>{{ examineCoupon?cancelCouponInfo.send_name:cancelCouponInfo.name }}</div>
         </div>
         <div class="couponRemark">
           <div class="one">备注信息:</div>
-          <el-input v-model.trim="couponRemark"></el-input>
+          <el-input v-if="!examineCoupon" v-model.trim="couponRemark"></el-input>
+          <div v-else>{{cancelCouponInfo.send_remark}}</div>
         </div>
         <div class="radio">
           <button class="affirmBtn" @click="checkCoupon">确定</button>
@@ -565,19 +475,19 @@ import { log } from "console";
 
 export default {
   components: {
-    minePupop,
+    minePupop
   },
   data() {
     return {
       couponList: [
         {
           value: "选项1",
-          label: "黄金糕",
+          label: "黄金糕"
         },
         {
           value: "选项2",
-          label: "双皮奶",
-        },
+          label: "双皮奶"
+        }
       ],
       tableData: [
         {
@@ -589,7 +499,7 @@ export default {
           numberList: 2,
           price: 100,
           shop: "运用店",
-          status: 2,
+          status: 2
         },
         {
           date: "2022.04.25  14:30",
@@ -600,8 +510,8 @@ export default {
           numberList: 5,
           price: 800,
           shop: "武昌店",
-          status: 1,
-        },
+          status: 1
+        }
       ],
       couponStatus: ["待使用", "已使用", "已过期"],
       goodStatus: ["未支付", "已支付", "已取货"],
@@ -622,12 +532,13 @@ export default {
       amendCardInfo: "", // 要修改次卡的信息
       cardTime: "", //次卡修改时间(年月日)
       isCancelCoupon: false, //核销优惠券界面
-      cancelCouponInfo: "", //核销优惠券名称
+      cancelCouponInfo: "", //核销优惠券信息
       couponRemark: "", //核销优惠券备注信息
       refresh: false, //刷新页面数据
       isCancelCard: false, //核销次卡界面
-      cancelCardInfo: "", //核销次卡名称
-      cardRemark: "", //核销优惠券备注信息
+      cancelCardInfo: "", //核销次卡信息
+      cardRemark: "", //核销次卡备注信息
+      examineCoupon: false //是否是查看优惠券
     };
   },
   computed: {},
@@ -651,7 +562,8 @@ export default {
       }
     },
     // 打开核销优惠券界面
-    cancleCoupon(e) {
+    cancleCoupon(e, examineCoupon) {
+      this.examineCoupon = examineCoupon;
       this.isCancelCoupon = true;
       this.cancelCouponInfo = e;
     },
@@ -662,6 +574,10 @@ export default {
     },
     // 核销优惠券
     checkCoupon() {
+      if (this.examineCoupon) {
+        this.isCancelCoupon = false;
+        return;
+      }
       if (this.couponRemark == "") {
         this.$message.error("请填写备注信息");
         return;
@@ -669,9 +585,9 @@ export default {
       api
         .checkCoupon({
           id: this.cancelCouponInfo.id,
-          remark: this.couponRemark,
+          remark: this.couponRemark
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.$message.success("核销成功");
             this.isCancelCoupon = false;
@@ -698,9 +614,9 @@ export default {
       api
         .checkCard({
           id: this.cancelCardInfo.id,
-          remark: this.cardRemark,
+          remark: this.cardRemark
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.$message.success("核销成功");
             this.isCancelCard = false;
@@ -728,7 +644,7 @@ export default {
       if (e.status == -2) {
         this.$message({
           message: "该次卡已注销",
-          type: "error",
+          type: "error"
         });
         return;
       }
@@ -746,13 +662,13 @@ export default {
       api
         .amendCardTime({
           id: this.amendCardInfo.id,
-          expire_date: this.cardTime,
+          expire_date: this.cardTime
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: "success",
+              type: "success"
             });
             this.isAmend = false;
             // 更新次卡列表
@@ -765,9 +681,9 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
-      api.getUserCoupon(params).then((res) => {
+      api.getUserCoupon(params).then(res => {
         this.couponData = res.data.list;
         this.total = res.data.total;
         // 关闭刷新动画
@@ -785,18 +701,18 @@ export default {
       if (row.status == -2) {
         this.$message({
           message: "该次卡已注销",
-          type: "error",
+          type: "error"
         });
         return;
       }
       this.isPore = true;
-      api.cardInfo({ id: row.id }).then((res) => {
+      api.cardInfo({ id: row.id }).then(res => {
         if (res.code == 200) {
           res.data.card_type = row.card_type;
           this.cardInfo = res.data;
         }
       });
-      api.cardLog({ id: row.id }).then((res) => {
+      api.cardLog({ id: row.id }).then(res => {
         if (res.code == 200) {
           this.cardLogList = res.data.list;
         }
@@ -806,19 +722,19 @@ export default {
       // 项目ID，json字符，格式如：[{"project_id":"10","num":5}]，project_id：适用项目ID，num：剩余次数
       let project_data = [],
         project_info = {};
-      this.cardInfo.project_list.forEach((res) => {
+      this.cardInfo.project_list.forEach(res => {
         project_info = {
           project_id: res.id,
-          num: res.num,
+          num: res.num
         };
         project_data.push(project_info);
       });
       api
         .cardUpdate({
           id: this.cardInfo.id,
-          project_data: JSON.stringify(project_data),
+          project_data: JSON.stringify(project_data)
         })
-        .then((res) => {
+        .then(res => {
           if (res.code == 200) {
             this.$message.success("更改成功！");
             this.isPore = false;
@@ -833,9 +749,9 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
-      api.getUserGoods(params).then((res) => {
+      api.getUserGoods(params).then(res => {
         this.goodData = res.data.list;
         this.total = res.data.total;
         // 关闭刷新动画
@@ -848,9 +764,9 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
-      api.getUserProject(params).then((res) => {
+      api.getUserProject(params).then(res => {
         this.projectData = res.data.list;
         this.total = res.data.total;
         // 关闭刷新动画
@@ -877,7 +793,7 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
       let resp = await api.getCardList(params);
       if (resp.code === 200) {
@@ -892,7 +808,7 @@ export default {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        id: this.id,
+        id: this.id
       };
       let resp = await api.getBalanceRecord(params);
       if (resp.code === 200) {
@@ -921,8 +837,8 @@ export default {
       this.$router.push({
         path: "/historicalOrder/details",
         query: {
-          id: row.id,
-        },
+          id: row.id
+        }
       });
     },
     onSubmit() {},
@@ -942,7 +858,7 @@ export default {
       } else if (e.index == 4) {
         this.getBalanceRecord();
       }
-    },
+    }
   },
 
   created() {
@@ -981,7 +897,7 @@ export default {
     }
   },
 
-  mounted() {},
+  mounted() {}
 };
 </script>
 
@@ -1010,6 +926,10 @@ export default {
     text-align: center;
     color: #fff;
   }
+  .examineCoupon {
+    width: 50px;
+    height: 25px;
+  }
   .pagin {
     padding: 20px 0;
     .el-pagination {