From ce2574a60b3a17483033cda6260cd761ea99db3e Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 16 Oct 2024 09:49:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/coupon/userCouponList.vue | 35 ++++++++++++---------
 src/views/modules/user/user.vue             |  2 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/coupon/userCouponList.vue b/src/views/modules/coupon/userCouponList.vue
index fdec737..28e6649 100644
--- a/src/views/modules/coupon/userCouponList.vue
+++ b/src/views/modules/coupon/userCouponList.vue
@@ -78,12 +78,14 @@
           <el-table-column prop="id" label="名称">
             <template slot-scope="scope">{{scope.row.couponEntity.couponName}}</template>
         </el-table-column>
-        <!-- <el-table-column prop="id" label="作用时间">
+        <el-table-column prop="id" label="获得途径">
             <template slot-scope="scope">
-                生效时间：{{scope.row.couponEntity.effectTime}}<br/>
-                结束时间：{{scope.row.couponEntity.expireTime}}
+                <span v-if="scope.row.getType == 0">后台赠送<br/>
+                  <i>原因：{{scope.row.remark}}</i>
+                </span>
+                <span v-if="scope.row.getType == 1">主动获取</span>
             </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="id" label="使用上限（x张）">
             <template slot-scope="scope">
                 {{scope.row.couponEntity.limitedCollar}}               
@@ -160,7 +162,7 @@
         </el-form-item>
         <el-form-item label="赠送原因">
           <el-input
-            v-model="youForm.reason" type="textarea"
+            v-model="youForm.remark" type="textarea"
             placeholder="请输入"
             clearable
           ></el-input>          
@@ -230,7 +232,7 @@ export default {
       dataListLoading: false,
       youForm: {
         couponName:'',
-        reason:'后台客服操作赠送',
+        remark:'后台客服操作赠送',
         ids:undefined
       },
       loading: false,
@@ -278,12 +280,14 @@ export default {
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/common/coupon/delCoupon'),
+            url: this.$http.adornUrl('/common/coupon/delCouponHistory'),
             method: 'post',
             data: this.$http.adornData({
-              id: id
+              couponHistoryId: id
             })
           }).then(({data}) => {
+            if(data.code!== 0) return this.$message.error(data.msg)
+
             if (data && data.code === 0) {
               this.$message({
                 message: '操作成功',
@@ -302,6 +306,7 @@ export default {
     dialogHandleClose(){
       this.youVisible = false
       this.youForm.ids = undefined
+      this.youForm.remark = ''
 
     },
     surYou() {
@@ -315,6 +320,7 @@ export default {
         }
        var data = {
         "couponId": this.youForm.ids,
+        "remark": this.youForm.remark,
         "userId": this.userId,
         "getType":0 //获取类型 0 后台赠送 1 主动获取
        }
@@ -335,13 +341,14 @@ export default {
             })  
             this.dialogHandleClose()          
             this.getDataList()
-          }else{
-            this.$message({
-              message: data.msg,
-              type: 'error',
-              duration: 1500,
-            })
           }
+          // else{
+          //   this.$message({
+          //     message: data.msg,
+          //     type: 'error',
+          //     duration: 1500,
+          //   })
+          // }
         })
       },
     givePersonCoupon() {
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 65f4fa8..c5935a0 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -110,7 +110,7 @@
                   <el-button type="text" size="small">充/扣天医币记录</el-button>
                 </router-link>
               </el-dropdown-item>
-              <el-dropdown-item><el-button type="text" size="small" @click=" thisUserID = scope.row.id; youVisible = true">优惠券列表</el-button></el-dropdown-item>              
+              <el-dropdown-item><el-button type="text" size="small" @click=" thisUserID = scope.row.id; youVisible = true">优惠券管理</el-button></el-dropdown-item>              
               <el-dropdown-item><el-button type="text" size="small" @click="resetPassword(scope.row)">修改密码</el-button></el-dropdown-item> 
               <el-dropdown-item>
                 <router-link :to="{ path: '/userCourse', query: {id:scope.row.id} }">