1. 新增

src/myComponents/qqMap.vue

@@ -48,6 +48,9 @@
             this.map.on("click", (evt) => {
 
                 this.setMakerLayer(evt.latLng)
+                this.$emit('setDot',{
+                    ...evt.latLng
+                })
                 this.geocoder.getAddress({ location: evt.latLng }).then((result) => {
                     console.log("result===",result.result.address)
                     this.$emit('setDot',{

src/views/tourism/membershipManagement/equityCard/detailsBox/equityCardManagementUseList.vue

@@ -0,0 +1,148 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="60%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="form-dialog-box">
+      <div style="height: calc( 100% - 80px );">
+        <el-table 
+        v-loading="loading" 
+        :data="tableList" 
+        height="100%">
+          <el-table-column type="index" label="序号" align="center"  />
+          <el-table-column label="消费产品" align="center" key="projectName" prop="projectName" />
+          <el-table-column label="使用设备" align="center" key="deviceName" prop="deviceName" />
+          <el-table-column label="使用时间" align="center" key="createTime" prop="createTime" />
+        </el-table>
+      </div>
+      <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getTableDeatilsFun"
+      />
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">关闭</el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  addTableApi
+ } from '@/api/CURD'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['activate_status'],
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      configUrl: {
+        add: '', // 新增地址
+        details: '/merchant/memberEquityCard/wipeList', // 详情地址
+        edit: '', // 编辑地址     
+      },
+      form: {
+        id: undefined,
+      },
+      errReasonText: '',
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      tableList: [],
+      total: 0,
+    };
+  },
+  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.queryParams.pageNum = 1
+      this.total = 0
+      await this.getTableDeatilsFun(row)
+    },
+    /** 获取详情 */
+    async getTableDeatilsFun(row) {
+      const id = row.id
+      this.loading = true
+      try {
+        let res = await getTableDeatilsByIdApi(this.configUrl.details,{
+          merchantId: id,
+          ...this.queryParams
+        })
+        if(res.code == 200) {
+          this.tableList = res.rows
+          this.total = res.total
+        }else {
+          this.$message.error('获取详情失败!!!');
+          this.formStatus = 2
+          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}
+     */
+    cancel() {
+      this.open = false;
+    },
+    /**  审核操作  */
+    refundAudit(type){
+      if(type == 2 && !this.form.errReason) {
+        this.errReasonText = "请输入驳回原因"
+        return
+      } 
+      this.loading = true
+      addTableApi(
+        type == 2?'/merchant/memberEquityCard/authReject':'/merchant/memberEquityCard/authPass',{
+          id: this.form.id,// 退款ID-列表ID
+          errReason: this.form.errReason,
+        }).then(response => {
+          this.$modal.msgSuccess(`提交成功`);
+          this.loading = false
+          this.open = false;
+          this.$emit('refresh')
+        }).catch(()=>{
+          this.$message.error("提交失败!!!");
+          this.loading = false
+        })
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form-dialog-box {
+  padding: 0 30px;
+  padding: 0 30px;
+  height: 65vh;
+}
+
+</style>

src/views/tourism/membershipManagement/equityCard/equityCardManage.vue

@@ -116,6 +116,8 @@
                       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>
@@ -135,6 +137,9 @@
     <addAndEdit ref="addAndEdit" @refresh="getList" />
     <!--  详情 -->
     <detailsBox ref="detailsBox" />
+
+    <!--  详情 -->
+    <useList ref="useList" />
   </div>
 </template>
 
@@ -147,11 +152,12 @@ import {
 } from "@/api/CURD";
 import addAndEdit from "./formBox/equityCardManagementForm.vue"
 import detailsBox from "./detailsBox/equityCardManagementDetails.vue"
+import useList from "./detailsBox/equityCardManagementUseList.vue"
 import { checkPermi } from "@/utils/permission"
 export default {
   name: "User",
   dicts: ['activate_status'],
-  components: {addAndEdit,detailsBox},
+  components: {addAndEdit,detailsBox,useList},
   data() {
     return {
       title: "权益卡管理",// 通用标题
@@ -164,6 +170,7 @@ export default {
         export: [''],// 导出权限
         AuthRole: ['equityCard:equityCardManagement:AuthRole'],// 设置审核
         Password: ['equityCard:equityCardManagement:Password'], // 重置密码
+        useList: ['equityCard:equityCardManagement:uselist'], // 重置密码
       },
       configUrl: {
         list: '/merchant/memberEquityCard/pageList', // 列表地址
@@ -352,6 +359,11 @@ export default {
           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) {
@@ -364,6 +376,7 @@ export default {
             case "handleResetPassword":
             this.handleResetPassword(row);
             break;
+            case "handletUseList": this.handletUseList(row);
             default:
             break;
         }

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

@@ -0,0 +1,350 @@
+<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="equitycardName">
+            <span>{{ form.equitycardName }}</span>
+          </el-form-item>
+          <el-form-item label="持卡人：" prop="name">
+            <span>{{ form.name }}</span>
+          </el-form-item>
+          <el-form-item label="身份证号：" prop="idcard">
+            <span>{{ form.idcard }}</span>
+          </el-form-item>
+          <el-form-item label="手机号：" prop="mobile">
+            <span>{{ form.mobile }}</span>
+          </el-form-item>
+          <el-form-item label="卡状态：" prop="actStatus">
+            <dict-tag :options="dict.type.activate_status" :value="form.actStatus"/>
+          </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>
+          <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>
+    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
+      <el-button @click="cancel">关闭</el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { 
+  getTableDeatilsByIdApi,
+  addTableApi
+ } from '@/api/CURD'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['activate_status'],
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '', // 新增地址
+        details: '/merchant/merchantGiftCard/selectById', // 详情地址
+        edit: '', // 编辑地址     
+      },
+      form: {
+        id: undefined,
+        ocrPic: []
+      },
+      rules: {},
+      scenicAreaProducts: [],// 景点产品关联
+      errReasonText: ''
+    };
+  },
+  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
+      if(model=='EDITInit' || model == 'DEATILSADD') { // 新增
+        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,
+            ocrPic: res.data.ocrPic?res.data.ocrPic.split(','):[],
+            errReason_1: res.data.errReason
+        }
+        this.errReasonText = ''
+          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}
+     */
+    reset() {
+      if(this.$refs["form"]) {
+        this.$refs["form"].clearValidate();
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /**  审核操作  */
+    refundAudit(type){
+      if(type == 2 && !this.form.errReason) {
+        this.errReasonText = "请输入驳回原因"
+        return
+      } 
+      this.loading = true
+      addTableApi(
+        type == 2?'/merchant/memberEquityCard/authReject':'/merchant/memberEquityCard/authPass',{
+          id: this.form.id,// 退款ID-列表ID
+          errReason: this.form.errReason,
+        }).then(response => {
+          this.$modal.msgSuccess(`提交成功`);
+          this.loading = false
+          this.open = false;
+          this.$emit('refresh')
+        }).catch(()=>{
+          this.$message.error("提交失败!!!");
+          this.loading = 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

@@ -0,0 +1,537 @@
+<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="equityCardId">
+            <el-select style="width: 100%;" v-model="form.equityCardId" clearable placeholder="请选择卡类型">
+              <el-option
+                v-for="dict in tableList"
+                :key="dict.id"
+                :label="dict.name"
+                :value="dict.id">
+              </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>
+          <el-form-item label="身份证号：" prop="idcard">
+            <el-input v-model="form.idcard" controls-position="right" placeholder="请输入身份证号"></el-input>
+          </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>
+          <el-form-item label="短信验证码：" prop="code">
+            <el-input v-model="form.code" controls-position="right" placeholder="请输入短信验证码"></el-input>
+          </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>
+        </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,
+  updateTableApi,
+  addTableApi,
+  listTableApi,
+ } from '@/api/CURD'
+
+export default {
+  name: "addAndEdit",
+  dicts: [],
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      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', // 
+      },
+      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"] }]
+      },
+      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
+      this.loadingText = "拼命加载数据中..."
+      this.loading = true
+      this.actionUrlLoading = false
+      this.model = model
+      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
+      }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,
+            ocrPic: res.data.ocrPic?res.data.ocrPic.split(','):[]
+        }
+          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 resCode = await addTableApi(
+              this.configUrl.merchantRealAuth,
+              this.addDateRange({
+                idCard: this.form.idcard,
+                userName: this.form.userName,
+            }))
+            if(resCode.code == 200) {
+
+            }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
+              }
+            }
+          } 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;
+    },
+    /**
+     * 获取验证码
+     */
+     getCode() {
+      if(this.phoneCodeLoading == 1) return
+      let reg = /^1[3-9]\d{9}$/
+      if(!reg.test(this.form.mobile)) {
+        this.$message.error("手机号输入不正确!!!");
+        return
+      }
+      this.phoneCodeLoading = 1
+      addTableApi(
+        this.configUrl.codeList,
+        this.addDateRange({
+          phone: this.form.mobile,
+        })).then(response => {
+          this.phoneCodeLoading = 2
+        }).catch (error=>{
+          this.phoneCodeLoading = 0
+        }) 
+     },
+     /**  上传图片 单张  */
+    handleAvatarSuccess(response, file, fileList) {
+      console.log("res, file",response, file, fileList)
+      this.actionUrlLoading = false
+      if(response.code == 200) {
+        this.form.ocrPic.push(response.data.url)
+      }
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 <= 5;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg']
+      const isJPG = typeList.includes(testmsg);
+      if (!isJPG) {
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片图片大小不能超过 5MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarProgress(){
+      this.actionUrlLoading = true
+    },
+    handleAvatarError() {
+      this.actionUrlLoading = false
+    },
+    handleRemove(index) {
+      this.form.ocrPic.splice(index,1)
+    },
+    selectUser(value) {
+      console.log(value)
+      this.tableUseList.forEach((item,index) => {
+        if(item.id == value) {
+          this.$set(this.form,'userName',item.name)
+        }
+      });
+    }
+  },
+};
+</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/giftcardList.vue

@@ -0,0 +1,393 @@
+<template>
+    <div class="app-container">
+      <el-row :gutter="20">
+        <!--用户数据-->
+        <el-col :span="24" :xs="24">
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="卡号" label-width="48px" prop="cardNo">
+              <el-input
+                v-model="queryParams.cardNo"
+                placeholder="请输入卡号"
+                clearable
+                style="width: 150px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="使用账户" prop="name">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入使用账户"
+                clearable
+                style="width: 140px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="手机号" prop="mobile">
+              <el-input
+                v-model="queryParams.mobile"
+                placeholder="请输入手机号"
+                clearable
+                style="width: 140px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="卡种" prop="cardType">
+              <el-select v-model="queryParams.cardType" clearable placeholder="请选择卡种">
+                <el-option
+                  v-for="dict in dict.type.gift_type"
+                  :key="dict.id"
+                  :label="dict.name"
+                  :value="dict.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="卡状态" prop="cardFlag">
+              <el-select v-model="queryParams.cardFlag" clearable placeholder="请选择卡状态">
+                <el-option
+                  v-for="dict in dict.type.activate_status"
+                  :key="dict.id"
+                  :label="dict.name"
+                  :value="dict.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+  
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="configPermi.add"
+              >添加新卡</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          </el-row>
+  
+          <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+            <el-table-column type="index" label="序号" align="center"  />
+            <el-table-column label="卡号" align="center" key="cardNo" prop="cardNo" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="卡种" align="center" key="cardType" prop="cardType" v-if="columns[1].visible" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.gift_type" :value="scope.row.cardType"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="卡面金额" align="center" key="amount" prop="amount" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="开始时间" align="center" key="startTime" prop="startTime" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="到期时间" align="center" key="endTime" prop="endTime" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+
+            <el-table-column label="状态" align="center" key="cardFlag" prop="cardFlag" v-if="columns[5].visible" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.activate_status" :value="scope.row.cardFlag"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="禁用/启用" align="center" key="status1" prop="status1" v-if="columns[6].visible" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <switchBox 
+                :defaultChecked="true" 
+                v-model="scope.row.status" 
+                @changeFun="openAttraction(scope.row)" 
+                :disabled="false"
+                :active-value="1"
+                :inactive-value="0"
+                 />
+              </template>
+            </el-table-column>
+
+            <el-table-column label="使用账户" align="center" key="name" prop="name" v-if="columns[7].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="账户手机号" align="center" key="mobile" prop="mobile" v-if="columns[8].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="使用时间" align="center" key="checkTime" prop="checkTime" v-if="columns[9].visible" :show-overflow-tooltip="true" />
+            <el-table-column
+              label="操作"
+              align="center"
+              width="160"
+              class-name="small-padding fixed-width"
+            >
+              <template slot-scope="scope" >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-document"
+                  @click="handleDetails(scope.row)"
+                  v-hasPermi="configPermi.details"
+                >详情</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="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>
+            </el-table-column>
+          </el-table>
+  
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-col>
+      </el-row>
+      <!--  新增或修改  -->
+      <addAndEdit ref="addAndEdit" @refresh="getList" />
+      <!--  详情 -->
+      <detailsBox ref="detailsBox" />
+  
+    </div>
+  </template>
+  
+  <script>
+  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"
+  export default {
+    name: "User",
+    dicts: ['activate_status','gift_type'],
+    components: {addAndEdit,detailsBox},
+    data() {
+      return {
+        title: "权益卡管理",// 通用标题
+        configPermi: {
+          add: ['equityCard:equityCardManagement:add'], // 新增权限
+          details: ['equityCard:equityCardManagement:details'], // 详情权限
+          delect: [], // 删除权限
+          edit: [], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          AuthRole: ['equityCard:equityCardManagement:AuthRole'],// 设置审核
+          Password: ['equityCard:equityCardManagement:Password'], // 重置密码
+          useList: ['equityCard:equityCardManagement:uselist'], // 重置密码
+        },
+        configUrl: {
+          list: '/merchant/merchantGiftCard/pageList', // 列表地址
+          delect: '', // 删除地址
+          upload: '',// 导入地址
+          download:'', // 下载模板地址
+          export: '',// 导出地址
+          updateStatus: '/merchant/merchantGiftCard/updateStatus', // 禁用/启用
+          resetPassword: '/merchant/merchantGiftCard/updatePassword', //重置密码
+        },
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 用户表格数据
+        tableList: null,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        dateRange: [],
+        // 控制列表是否显示
+        columns: [
+          { key: 0, label: `卡号`, visible: true },
+          { key: 1, label: `卡种`, visible: true },
+          { key: 2, label: `卡面金额`, visible: true },
+          { key: 3, label: `开始时间`, visible: true },
+          { key: 5, label: `到期时间`, visible: true },
+          { key: 6, label: `状态`, visible: true },
+          { key: 9, label: `禁用/启用`, visible: true },
+          { key: 10, label: `使用账户`, visible: true },
+          { key: 11, label: `账户手机号`, visible: true },
+          { key: 12, label: `使用时间`, visible: true },
+        ],
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      checkPermi,
+      /** 查询用户列表 */
+      getList() {
+        this.loading = true;
+        listTableApi(
+          this.configUrl.list,
+          this.addDateRange(
+            this.queryParams, 
+            this.dateRange)).then(response => {
+              this.tableList = response.data.rows;
+              this.total = response.data.total;
+              this.loading = false;
+          }
+        ).catch (error=>{
+          console.error('获取列表失败!!!!',error)
+          this.tableList = [];
+          this.total = 0;
+          this.loading = false
+        }) 
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+        }
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id);
+        this.single = selection.length != 1;
+        this.multiple = !selection.length;
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        if(this.$refs.addAndEdit) {
+          this.$refs.addAndEdit.initData(this.title + '新增', "ADD",{})
+        }
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        if(this.$refs.addAndEdit) {
+          this.$refs.addAndEdit.initData(this.title + '编辑', "EDITInit",{...row})
+        }
+      },
+      handleDetails(row){
+        if(this.$refs.detailsBox) {
+          this.$refs.detailsBox.initData(this.title + '详情', "EDITInit",{...row})
+        }
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除数据项？').then( () => {
+          return delTableParamsApi(this.configUrl.delect,{
+            id: ids
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch((e) => {
+          console.error("删除失败====",e)
+        });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download(this.configUrl.export, {
+          ...this.queryParams
+        }, `${this.title }_${new Date().getTime()}.xlsx`)
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        if(this.$refs.upload) {
+          this.$refs.upload.initData({
+            width: '400px',
+            // 弹出层标题（用户导入）
+            title: this.title + "导入",
+            // 下载模板地址
+            importTemplate: this.configUrl.download,
+            // 上传的地址
+            url: this.configUrl.upload
+          })
+        }
+      },
+      /** 开/闭 园 */
+      openAttraction(row) {
+        this.$modal.confirm(`是否确认${row.status == 0 ? '启用' : '禁用'} ${row.cardNo||''}吗？`).then( () => {
+          return addTableApi(this.configUrl.updateStatus,{
+            id: row.id,
+            status: row.status == 1 ? 0 : 1
+          });
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess(`${row.status == 0 ? '启用' : '禁用'}成功`);
+        }).catch((e) => {
+          console.error("失败====",e)
+        });
+      },
+      /**  重置密码   */
+      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)
+        });
+      },
+        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) {
+              case "handleAuthRole":
+              this.handleAuthRole(row);
+              break;
+              case "handleEdit":
+              this.handleUpdate(row);
+              break;
+              case "handleResetPassword":
+              this.handleResetPassword(row);
+              break;
+              case "handletUseList": this.handletUseList(row);
+              default:
+              break;
+          }
+        },
+        /** 设置使用期限  */
+        setUseType(row){
+          if(row.useType == 1) {
+            return '永久生效'
+          }else if(row.useType == 2) {
+            return '' + (row.useDay || '') + '天有效'
+          }else if(row.useType == 3) {
+            return '' + row.useEndDay + '内有效'
+          }else{
+            return '--'
+          }
+        },
+    }
+  };
+  </script>
+  

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/scenicGuideForm.vue

@@ -413,7 +413,7 @@ export default {
     setDot(params){
       this.$set(this.form,'longitude',params.lng)
       this.$set(this.form,'latitude',params.lat)
-      this.$set(this.form,'address',params.address)
+      this.$set(this.form,'address',params.address ? params.address:'')
     },
     handleRemove(index) {
       this.form.imgUrl.splice(index,1)