1. 新增

src/views/tourism/membershipManagement/giftcard/detailsBox/equityCardManagementDetails.vue

@@ -20,63 +20,25 @@
         >
         <el-form :model="form" ref="form" :rules="rules" label-width="150px">
           <div class="form-title"><span>基本信息</span></div>
-          <el-form-item label="权益卡号：" prop="cardNo">
-            <span>{{ form.cardNo }}</span>
-          </el-form-item>
-          <el-form-item label="办卡类型：" prop="equitycardName">
-            <span>{{ form.equitycardName }}</span>
+          <el-form-item label="卡状态：" prop="cardType">
+            <dict-tag :options="dict.type.gift_type" :value="form.cardType"/>
           </el-form-item>
-          <el-form-item label="持卡人：" prop="name">
-            <span>{{ form.name }}</span>
+          <el-form-item label="卡号：" prop="cardNo">
+            <span>{{ form.cardNo }}</span>
           </el-form-item>
-          <el-form-item label="身份证号：" prop="idcard">
-            <span>{{ form.idcard }}</span>
+          <el-form-item label="卡面金额：" prop="amount">
+            <span>{{ form.amount }}</span>
+            元
           </el-form-item>
-          <el-form-item label="手机号：" prop="mobile">
-            <span>{{ form.mobile }}</span>
+          <el-form-item label="开始时间：" prop="startTime">
+            <span>{{ form.startTime }}</span>
           </el-form-item>
-          <el-form-item label="卡状态：" prop="actStatus">
-            <dict-tag :options="dict.type.activate_status" :value="form.actStatus"/>
+          <el-form-item label="到期时间：" prop="endTime">
+            <span>{{ form.endTime }}</span>
           </el-form-item>
-          <div class="form-title"><span>验证信息</span></div>
-          <el-form-item label="人脸图片：" prop="ocrPic">
-            <div style="display: flex;">
-              <div 
-              v-for="(item,index) in form.ocrPic" 
-              :key="index"
-              style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
-                <el-image 
-                  style="width: 100%; height: 100%"
-                  :src="item" 
-                  :preview-src-list="form.ocrPic">
-                </el-image>
-              </div>  
-            </div>
+          <el-form-item label="核销密码：" prop="checkPassword">
+            <span>{{ form.checkPassword }}</span>
           </el-form-item>
-          <div class="form-title" v-if="form.actStatus != 0"><span>审核信息</span></div>
-          <el-form-item v-if="form.errReason_1" label="审核备注：" label-width="100px">{{ form.errReason_1 }}</el-form-item>
-          <div v-if="model=='DEATILSADD'">
-            <div class="form-title" style="display: flex;align-items: flex-end;"><span>审核操作</span><i>(注意：驳回时需填写驳回原因)</i></div>
-              <div>
-                <el-form-item label="审核备注：" :error="errReasonText" label-width="100px"></el-form-item>
-                <div>
-                  <el-input
-                    type="textarea"
-                    :rows="2"
-                    placeholder="请输入审核备注"
-                    v-model="form.errReason">
-                  </el-input>
-                </div>
-              </div>
-              <div style="display: flex;margin-top: 10px;justify-content: center;">
-                <el-button 
-                type="danger" 
-                @click="refundAudit(2)"
-                :loading="loading"
-                >驳回</el-button>
-                <el-button type="primary" :loading="loading" @click="refundAudit(1)">同意</el-button>
-              </div>
-          </div>
         </el-form>
       </div>
     </div>
@@ -95,7 +57,7 @@ import {
 
 export default {
   name: "addAndEdit",
-  dicts: ['activate_status'],
+  dicts: ['gift_type'],
   data() {
     return {
       title: "",

src/views/tourism/membershipManagement/giftcard/formBox/checkPassword.vue

@@ -0,0 +1,330 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="50%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box"
+    v-loading="loading"
+    :element-loading-text="loadingText"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0)">
+      <div
+        v-loading="loading"
+        :element-loading-text="''"
+        element-loading-spinner="''"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        >
+        <el-form :model="form" ref="form" :rules="rules" label-width="150px">
+          <div class="form-title"><span>基本信息</span></div>
+          <el-form-item label="卡号：" prop="cardNo">
+            <span>{{ form.cardNo }}</span>
+          </el-form-item>
+          <el-form-item label="核销密码：" prop="checkPassword">
+            <el-input v-model="form.checkPassword" controls-position="right" placeholder="请输入核销密码"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        :loading="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      > 
+        {{ loading ? '提交中...' : '保存' }}
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  addTableApi,
+ } from '@/api/CURD'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['gift_type'],
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantGiftCard/updatePassword', // 新增地址
+        details: '/merchant/merchantGiftCard/selectById', // 详情地址
+        edit: '/merchant/merchantGiftCard/updatePassword', // 编辑地址
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        cardType: [{ required: true, message: "请选择办卡卡种", trigger: ["change","blur"] }],
+        cardNo: [{ required: true, message: "请输入卡号", trigger: ["change","blur"] }],
+        amount: [{ required: true, message: "请输入卡面金额", trigger: ["change","blur"] }],
+        startTime: [{ required: true, trigger: ["change","blur"], message: "请输入开始时间" }],
+        endTime: [{ required: true, message: "请输入到期时间", trigger: ["change","blur"] }],
+        checkPassword: [{ required: true, message: "请输入核销密码", trigger: ["change","blur"] }]
+      },
+    };
+  },
+  methods: {
+    async initData(title , model,row){
+      this.title = title
+      this.open = true
+      this.loadingText = "拼命加载数据中..."
+      this.loading = true
+      this.actionUrlLoading = false
+      this.model = model
+      this.formStatus = 0
+      this.phoneCodeLoading = 0
+      if(model=='ADD') { // 新增
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row,
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='EDITInit') { // 新增
+        await this.getTableDeatilsFun(row)
+      }
+      this.loading = false
+      this.$nextTick(()=>{
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      })
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
+        if(res.code == 200) {
+          let obj = {
+            ...res.data,
+        }
+          this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.formStatus = 1
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          this.loading = false
+          this.open = false;
+        }
+        this.loading = false
+      } catch (error) {
+        console.error('获取详情失败!!!!',error)
+        this.formStatus = 2
+        this.loading = false
+        this.open = false;
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async valid => {
+        if (valid) {
+          this.loadingText = "提交数据中..."
+          this.loading = true
+          try {
+            let res = await addTableApi(this.configUrl.add,{
+              id: this.form.id,  
+              checkPassword: this.form.checkPassword
+            })
+            if(res.code == 200) {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
+            }else {
+              this.$message.error("修改失败!!!");
+              this.loading = false
+            }
+          } catch (error) {
+            this.$message.error(`${this.form.id?'修改':'新增'}失败!!!`);
+            this.loading = false
+          }
+          
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  min-height: 50vh;
+  max-height: 65vh;
+  overflow-y: auto;
+  >div {
+    width: 100%;
+    min-height: 50vh;
+  }
+  .form-title {
+    padding: 0 0 10px 0;
+    span {
+      display: flex;
+      color: rgba(65,80,88,1);
+      font-size: 16px;
+      font-family: SourceHanSansSC;
+      font-weight: 700;
+      line-height: 23px;
+      border-left: 4px solid rgb(22, 132, 252);
+      padding-left: 10px;
+    }
+    
+  }
+  ::v-deep .ql-editor {
+    height: 400px;
+  }
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

src/views/tourism/membershipManagement/giftcard/formBox/equityCardManagementForm.vue

@@ -20,81 +20,40 @@
         >
         <el-form :model="form" ref="form" :rules="rules" label-width="150px">
           <div class="form-title"><span>基本信息</span></div>
-          <el-form-item label="办卡类型：" prop="equityCardId">
-            <el-select style="width: 100%;" v-model="form.equityCardId" clearable placeholder="请选择卡类型">
+          <el-form-item label="办卡卡种：" prop="cardType">
+            <el-select style="width: 100%;" v-model="form.cardType" clearable placeholder="请选择卡卡种">
               <el-option
-                v-for="dict in tableList"
-                :key="dict.id"
-                :label="dict.name"
-                :value="dict.id">
+                v-for="dict in dict.type.gift_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="持卡人：" prop="memberId">
-            <el-select style="width: 100%;" v-model="form.memberId" @change="selectUser" clearable placeholder="请选择持卡人">
-              <el-option
-                v-for="dict in tableUseList"
-                :key="dict.id"
-                :label="dict.name"
-                :value="dict.id">
-              </el-option>
-            </el-select>
+          <el-form-item label="卡号：" prop="cardNo">
+            <el-input v-model="form.cardNo" controls-position="right" placeholder="请输入卡号"></el-input>
           </el-form-item>
-          <el-form-item label="身份证号：" prop="idcard">
-            <el-input v-model="form.idcard" controls-position="right" placeholder="请输入身份证号"></el-input>
+          <el-form-item label="卡面金额：" prop="amount">
+            <el-input-number v-model="form.amount" controls-position="right" placeholder="请输入卡面金额"></el-input-number>
+            元
           </el-form-item>
-          <el-form-item label="手机号：" prop="mobile">
-            <div style="display: flex;">
-              <el-input v-model="form.mobile" controls-position="right" placeholder="请输入手机号"></el-input>
-              <el-button @click="getCode" style="margin-left: 20px;" type="primary" :loading="phoneCodeLoading == 1">{{ phoneCodeLoading == 1 ? '获取中...' : phoneCodeLoading == 0 ? '获取验证码' : '已发送成功，重新获取' }}</el-button>
-            </div>
+          <el-form-item label="开始时间：" prop="startTime">
+            <el-date-picker
+              v-model="form.startTime"
+              type="datetime"
+              placeholder="选择开始时间">
+            </el-date-picker>
           </el-form-item>
-          <el-form-item label="短信验证码：" prop="code">
-            <el-input v-model="form.code" controls-position="right" placeholder="请输入短信验证码"></el-input>
+          <el-form-item label="到期时间：" prop="endTime">
+            <el-date-picker
+              v-model="form.endTime"
+              type="datetime"
+              placeholder="选择到期时间">
+            </el-date-picker>
           </el-form-item>
-          <div class="form-title"><span>验证信息</span></div>
-          <el-form-item label="人脸图片：" prop="ocrPic">
-            <div style="display: flex;">
-              <div 
-              v-for="(item,index) in form.ocrPic" 
-              :key="index"
-              style="width: 100px; height: 100px;position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
-                <el-image 
-                  style="width: 100%; height: 100%"
-                  :src="item" 
-                  :preview-src-list="form.ocrPic">
-                </el-image>
-                <span @click="handleRemove(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
-                  <i class="el-icon-error"></i>
-                </span>
-              </div>
-              <div 
-              style="width: 100px; height: 100px;" 
-              v-if="!form.ocrPic||form.ocrPic.length<1"
-              v-loading="actionUrlLoading"
-              element-loading-text="上传中..."
-              element-loading-spinner="el-icon-loading"
-              element-loading-background="rgba(0, 0, 0, 0.8)"
-              >
-                <el-upload
-                  class="avatar-uploader"
-                  :action="actionUrl"
-                  :data="{
-                    bucket: 'tourism'
-                  }"
-                  :show-file-list="false"
-                  :before-upload="beforeAvatarUpload"
-                  :on-success="handleAvatarSuccess"
-                  :on-progress="handleAvatarProgress"
-                  :disabled="actionUrlLoading"
-                  :on-error="handleAvatarError"
-                  >
-                  <i class="el-icon-plus avatar-uploader-icon"></i>
-                </el-upload>
-              </div>
-              
-            </div>
-            <span>支持jpg、png,支持5MB大小以内的图片上传</span>
+          <el-form-item label="核销密码：" prop="checkPassword">
+            <span v-if="model !== 'ADD'"></span>
+            <el-input v-else v-model="form.checkPassword" controls-position="right" placeholder="请输入核销密码"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -126,7 +85,7 @@ import {
 
 export default {
   name: "addAndEdit",
-  dicts: [],
+  dicts: ['gift_type'],
   data() {
     return {
       title: "",
@@ -136,72 +95,24 @@ export default {
       loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/merchant/memberEquityCard', // 新增地址
-        details: '/merchant/memberEquityCard/detail', // 详情地址
-        edit: '/merchant/memberEquityCard', // 编辑地址
-        list: '/merchant/equityCard', // 权益卡类型
-        codeList: '/merchant/merchantAuth/getVerifyCode', // 获取验证码
-        merchantRealAuth: '/merchant/merchantAuth/merchantRealAuth', // 验证
-        useCode: '/member/memberInfo/list', // 
+        add: '/merchant/merchantGiftCard/insertOrUpdate', // 新增地址
+        details: '/merchant/merchantGiftCard/selectById', // 详情地址
+        edit: '/merchant/merchantGiftCard/insertOrUpdate', // 编辑地址
       },
       form: {
         id: undefined,
-        ocrPic: []
       },
       rules: {
-        equityCardId: [{ required: true, message: "请选择办卡类型", trigger: ["change","blur"] }],
-        memberId: [{ required: true, message: "请输入持卡人", trigger: ["change","blur"] }],
-        idcard: [{ required: true, message: "请输入身份证号", trigger: ["change","blur"] }],
-        mobile: [
-          { required: true, trigger: ["change","blur"], message: "请输入您的账号" },
-          { pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: ["change","blur"] }
-        ],
-        code: [{ required: true, message: "请输入短信验证码", trigger: ["change","blur"] }],
-        ocrPic: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }]
+        cardType: [{ required: true, message: "请选择办卡卡种", trigger: ["change","blur"] }],
+        cardNo: [{ required: true, message: "请输入卡号", trigger: ["change","blur"] }],
+        amount: [{ required: true, message: "请输入卡面金额", trigger: ["change","blur"] }],
+        startTime: [{ required: true, trigger: ["change","blur"], message: "请输入开始时间" }],
+        endTime: [{ required: true, message: "请输入到期时间", trigger: ["change","blur"] }],
+        checkPassword: [{ required: true, message: "请输入核销密码", trigger: ["change","blur"] }]
       },
-      scenicAreaProducts: [],// 景点产品关联
-
-      tableList: [], // 权益卡类型
-      tableUseList: [], // 用户
-      phoneCodeLoading: 0,
-      //  上传文件
-      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
-      actionUrlLoading: false,
     };
   },
-  created() {
-    this.getList()
-    this.getUseList()
-  },
   methods: {
-    /** 查询体卡类型列表 */
-    getList() {
-      listTableApi(
-        this.configUrl.list,
-        this.addDateRange({
-          pageNum: 1,
-          pageSize: 9999,
-        })).then(response => {
-              this.tableList = response.rows;
-          }
-        ).catch (error=>{
-          this.tableList = [];
-        }) 
-    },
-    /** 查询体卡类型列表 */
-    getUseList() {
-      listTableApi(
-        this.configUrl.useCode,
-        this.addDateRange({
-          pageNum: 1,
-          pageSize: 9999,
-        })).then(response => {
-              this.tableUseList = response.data.rows;
-          }
-        ).catch (error=>{
-          this.tableUseList = [];
-        }) 
-    },
     async initData(title , model,row){
       this.title = title
       this.open = true
@@ -212,12 +123,10 @@ export default {
       this.formStatus = 0
       this.phoneCodeLoading = 0
       if(model=='ADD') { // 新增
-        this.$set(this,'form',{...row,ocrPic:[]})
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
         let obj = {
           ...row,
-          ocrPic: row.ocrPic?row.ocrPic.split(','):[]
         }
         this.$set(this,'form',obj)
         this.formStatus = 1
@@ -240,7 +149,6 @@ export default {
         if(res.code == 200) {
           let obj = {
             ...res.data,
-            ocrPic: res.data.ocrPic?res.data.ocrPic.split(','):[]
         }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
@@ -269,43 +177,17 @@ export default {
           this.loadingText = "提交数据中..."
           this.loading = true
           try {
-            let resCode = await addTableApi(
-              this.configUrl.merchantRealAuth,
-              this.addDateRange({
-                idCard: this.form.idcard,
-                userName: this.form.userName,
-            }))
-            if(resCode.code == 200) {
-
+            let res = await addTableApi(this.configUrl.add,{
+                ...this.form
+            })
+            if(res.code == 200) {
+              this.$modal.msgSuccess("修改成功");
+              this.loading = false
+              this.open = false;
+              this.$emit('refresh')
             }else {
-              this.$message.error("身份证信息错误!!!");
-              return
-            }
-            if (this.model != 'ADD') {
-              let res = await addTableApi(this.configUrl.edit,{
-                ...this.form,
-                ocrPic: this.form.ocrPic.join(',')
-              })
-              if(res.code == 200) {
-                this.$modal.msgSuccess("修改成功");
-                this.loading = false
-                this.open = false;
-                this.$emit('refresh')
-              }else {
-                this.$message.error("修改失败!!!");
-                this.loading = false
-              }
-            } else {
-              let res = await addTableApi(this.configUrl.edit,{...this.form,ocrPic: this.form.ocrPic.join(',')})
-              if(res.code == 200) {
-                this.$modal.msgSuccess("新增成功");
-                this.loading = false
-                this.open = false;
-                this.$emit('refresh')
-              }else {
-                this.$message.error("新增失败!!!");
-                this.loading = false
-              }
+              this.$message.error("修改失败!!!");
+              this.loading = false
             }
           } catch (error) {
             this.$message.error(`${this.form.id?'修改':'新增'}失败!!!`);

src/views/tourism/membershipManagement/giftcard/giftcardList.vue

@@ -118,19 +118,25 @@
                   @click="handleDetails(scope.row)"
                   v-hasPermi="configPermi.details"
                 >详情</el-button>
+                <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    style="color: #f56c6c;"
+                    @click="handleDelete(scope.row)"
+                    v-hasPermi="configPermi.delect"
+                  >删除</el-button>
                 <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right" v-if="checkPermi(configPermi.Password) && checkPermi(configPermi.AuthRole)">更多</el-button>
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right" v-else-if="checkPermi(configPermi.AuthRole) && !checkPermi(configPermi.Password) && scope.row.actStatus != 1">更多</el-button>
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right" v-else-if="!checkPermi(configPermi.AuthRole) && checkPermi(configPermi.Password)">更多</el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item command="handleAuthRole" v-if="scope.row.actStatus != 1" icon="el-icon-circle-check"
-                        v-hasPermi="configPermi.AuthRole">审核</el-dropdown-item>
-                        <!-- <el-dropdown-item command="handleEdit" icon="el-icon-circle-check"
-                        v-hasPermi="configPermi.edit">编辑</el-dropdown-item> -->
+                        <!-- <el-dropdown-item command="handleAuthRole" v-if="scope.row.actStatus != 1" icon="el-icon-circle-check"
+                        v-hasPermi="configPermi.AuthRole">审核</el-dropdown-item> -->
+                        <el-dropdown-item command="handleEdit" icon="el-icon-circle-check"
+                        v-hasPermi="configPermi.edit">编辑</el-dropdown-item>
                         <el-dropdown-item command="handleResetPassword" icon="el-icon-circle-check"
                         v-hasPermi="configPermi.Password">重置密码</el-dropdown-item>
-                        <el-dropdown-item command="handletUseList" icon="el-icon-circle-check"
-                        v-hasPermi="configPermi.useList">使用记录</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
               </template>
@@ -150,7 +156,8 @@
       <addAndEdit ref="addAndEdit" @refresh="getList" />
       <!--  详情 -->
       <detailsBox ref="detailsBox" />
-  
+      
+      <checkPassword ref="checkPassword"/>
     </div>
   </template>
   
@@ -158,19 +165,19 @@
   import { 
     listTableApi, 
     delTableParamsApi,
-    updateTableApi,
     addTableApi
   } from "@/api/CURD";
   import addAndEdit from "./formBox/equityCardManagementForm.vue"
   import detailsBox from "./detailsBox/equityCardManagementDetails.vue"
   import { checkPermi } from "@/utils/permission"
+  import checkPassword from "./formBox/checkPassword.vue";
   export default {
     name: "User",
     dicts: ['activate_status','gift_type'],
-    components: {addAndEdit,detailsBox},
+    components: {addAndEdit,detailsBox,checkPassword},
     data() {
       return {
-        title: "权益卡管理",// 通用标题
+        title: "礼品卡管理",// 通用标题
         configPermi: {
           add: ['equityCard:equityCardManagement:add'], // 新增权限
           details: ['equityCard:equityCardManagement:details'], // 详情权限
@@ -184,7 +191,7 @@
         },
         configUrl: {
           list: '/merchant/merchantGiftCard/pageList', // 列表地址
-          delect: '', // 删除地址
+          delect: '/merchant/merchantGiftCard/deleteById', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
@@ -337,27 +344,16 @@
       },
       /**  重置密码   */
       handleResetPassword(row){
-        this.$modal.confirm(`是否确认重置卡号 ${row.cardNo||''}的密码吗？`).then( () => {
-          return addTableApi(this.configUrl.resetPassword,{
-            id: row.id,
-          });
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess(`重置成功`);
-        }).catch((e) => {
-          console.error("失败====",e)
-        });
+        if(this.$refs.checkPassword) {
+          this.$refs.checkPassword.initData(this.title + '重置密码', "EDIT",{...row})
+        }
+        
       },
         handleAuthRole(row) {
             if(this.$refs.detailsBox) {
             this.$refs.detailsBox.initData(this.title + '审核', "DEATILSADD",{...row})
             }
         },
-        handletUseList(row){
-          if(this.$refs.useList) {
-            this.$refs.useList.initData(this.title + '使用详情', "DEATILSADD",{...row})
-          }
-        },
         // 更多操作触发
         handleCommand(command, row) {
           switch (command) {
@@ -370,7 +366,6 @@
               case "handleResetPassword":
               this.handleResetPassword(row);
               break;
-              case "handletUseList": this.handletUseList(row);
               default:
               break;
           }