Merge branch 'master' of http://dzgogs.hw.hongweisoft.com/tourism_project/tourism_merchant_ui

src/views/tourism/financialManagement/balanceChangeDetails.vue

@@ -127,12 +127,12 @@
       return {
         title: "门票退款管理",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
+          add: [''], // 新增权限
+          details: [''], // 详情权限
+          delect: [''], // 删除权限
+          edit: [''], // 编辑权限
+          upload: [''],// 导入权限
+          export: ['financialManagement:balanceChangeDetails:export'],// 导出权限
         },
         configUrl: {
           list: '/member/memberBalanceRecord/list', // 列表地址

src/views/tourism/financialManagement/ticketRefundOrder.vue

@@ -142,12 +142,12 @@ export default {
     return {
       title: "门票退款管理",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
+        add: [''], // 新增权限
+        details: ['financialManagement:ticketRefundOrder:details'], // 详情权限
+        delect: [''], // 删除权限
+        edit: [''], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
       },
       configUrl: {
         list: '/order/orderRefund/pageList', // 列表地址

src/views/tourism/membershipManagement/electronicMembership/formBox/membershipLevelForm.vue

@@ -313,10 +313,10 @@ export default {
       let typeList = ['png','jepg','jpg']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 1MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/membershipManagement/electronicMembership/memberInformation.vue

@@ -118,9 +118,9 @@
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                     <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                        v-hasPermi="['system:user:resetPwd']">设置积分</el-dropdown-item>
+                        v-hasPermi="configPermi.resetPwd">设置积分</el-dropdown-item>
                     <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                        v-hasPermi="['system:user:edit']">设置储值</el-dropdown-item>
+                        v-hasPermi="configPermi.AuthRole">设置储值</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
               </template>
@@ -162,12 +162,14 @@
       return {
         title: "会员信息",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
+          add: [''], // 新增权限
+          details: ['electronicMembership:memberInformation:details'], // 详情权限
+          delect: ['electronicMembership:memberInformation:delect'], // 删除权限
+          edit: [''], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          resetPwd: ['electronicMembership:memberInformation:resetPwd'], // 设置积分
+          AuthRole: ['electronicMembership:memberInformation:AuthRole'], // 设置储值
         },
         configUrl: {
           list: '/member/memberInfo/list', // 列表地址

src/views/tourism/membershipManagement/electronicMembership/membershipLevel.vue

@@ -111,12 +111,12 @@
       return {
         title: "会员体系",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
+          add: ['electronicMembership:membershipLevel:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: ['electronicMembership:membershipLevel:delect'], // 删除权限
+          edit: ['electronicMembership:membershipLevel:edit'], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
         },
         configUrl: {
           list: '/member/memberLevelInfo/pageList', // 列表地址

src/views/tourism/membershipManagement/physicalCard/detailsBox/physicalCardAllocationDetails.vue

@@ -0,0 +1,556 @@
+<template>
+  <el-dialog 
+  :title="title" 
+  :visible.sync="open" 
+  width="70%" 
+  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="cardName">
+            <span style="display: block; min-width: 250px;">{{ form.cardName }}</span>
+          </el-form-item>
+          <el-form-item label="实体卡价格：" prop="price">
+            <span style="display: block; min-width: 250px;">{{ form.price }}<span>元</span></span>
+          </el-form-item>
+          <div class="form-title"><span>使用规则</span></div>
+          <el-form-item label="使用期限：" prop="useType">
+            <el-radio-group v-model="form.useType" @input="radioInputs">
+              <div style="display: flex;flex-direction: column;padding-top: 10px;">
+                <div>
+                  <el-radio :label="1">永久生效</el-radio>
+                </div>
+                <div style="display: flex;align-items: center;margin-top: 25px;">
+                  <el-radio style="display: flex;align-items: center;" :label="2">
+                    <div style="display: flex;align-items: center;">
+                      <el-form-item label="" label-width="0" :prop="'useDay'">
+                        <span>指定</span>
+                        <span>{{ form.useDay }}</span>
+                        <span>天数有效</span>
+                      </el-form-item>
+                    </div>
+                  </el-radio>
+                </div>
+                <div style="display: flex;align-items: center;margin-top: 25px;">
+                  <el-radio style="display: flex;align-items: center;" :label="3">
+                    <div style="display: flex;align-items: center;">
+                      <el-form-item label="" label-width="0" :prop="'useEndDay'">
+                        <span>指定</span>
+                        <span>{{ form.useEndDay }}</span>
+                        <span>结束日期</span>
+                      </el-form-item>
+                    </div>
+                  </el-radio>
+
+                </div>
+              </div>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="生效日期：" prop="effectiveDateType">
+            <el-radio-group v-model="form.effectiveDateType">
+              <el-radio :label="1">制卡之日生效</el-radio>
+              <el-radio :label="2">激活之日生效</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <div class="form-title"><span>激活规则</span></div>
+          <el-form-item label="激活后完善信息：" prop="activationRule">
+            <el-checkbox-group v-model="form.activationRule">
+              <el-checkbox 
+              v-for="dict in dict.type.activation_rule"
+              :key="dict.value"
+              :label="dict.value">{{dict.label}}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <div class="form-title"><span>权益规则</span></div>
+          <el-form-item label="支持储值" prop="isStorageValue">
+            <el-radio-group v-model="form.isStorageValue">
+              <el-radio :label="0">不可储值</el-radio>
+              <el-radio :label="1">可储值</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <div v-if="form.isStorageValue==1">
+            <div class="form-title"><span>实体卡储值规则配置</span></div>
+            <el-form-item label="储值金额范围" label-width="120px">
+              <div style="display: flex;align-items: center;">
+                <el-form-item label="" label-width="0px" prop="minAmount">
+                <el-input-number v-model="form.minAmount" placeholder="请输入最小储值金额"
+                  controls-position="right">
+                  </el-input-number>
+                </el-form-item>
+                <span>--</span>
+                <el-form-item label="" label-width="0px" prop="maxAmount">
+                  <el-input-number v-model="form.maxAmount" placeholder="请输入最大储值金额"
+                    controls-position="right">
+                  </el-input-number>
+                </el-form-item>
+              </div>
+              
+            </el-form-item>
+            <el-form-item label="储值消费可获得积分" prop="storageConfigIsCredit">
+              <el-radio-group v-model="form.storageConfigIsCredit">
+                <el-radio :label="0">不可积分</el-radio>
+                <el-radio :label="1">可积分</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="支持退款" prop="storageConfigRefundType">
+              <el-radio-group v-model="form.storageConfigRefundType">
+                <el-radio :label="0">可退(需审核)</el-radio>
+                <el-radio :label="1">可退(不需审核)</el-radio>
+                <el-radio :label="2">不可退</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="不参与实体卡储值付款商品：" label-width="220px" prop="storageConfigGoodIds">
+              <el-select 
+              v-model="form.storageConfigGoodIds" 
+              multiple
+              clearable 
+              placeholder="请选择不参与实体卡储值付款商品">
+                <el-option
+                  v-for="item in scenicAreaProducts"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+          <el-form-item label="支持积分" prop="isCredit">
+            <el-radio-group v-model="form.isCredit">
+              <el-radio :label="0">不可积分</el-radio>
+              <el-radio :label="1">可积分</el-radio>
+            </el-radio-group>
+            <span style="color: #ccc;">（积分跟随实体卡卡号，实体卡不与电子会员的积分融合，不支持实体卡与电子会员的绑定）</span>
+          </el-form-item>
+          <el-form-item label="折扣权益：">
+            <div style="display: flex;align-items: center;">
+              <el-form-item label="基本折扣：" prop="discountValue" label-width="100px">
+                <el-input-number style="width: 150px;" v-model="form.discountValue" controls-position="right" placeholder="请输入基本折扣"></el-input-number>
+                <span style="padding-bottom: 15px;">%</span>
+              </el-form-item>
+              <el-button style="margin-left: 15px;" v-if="!form.discountGoodList||form.discountGoodList.length==0" type="primary" @click="addClassifyList">添加单品</el-button>
+            </div>
+            
+            <div v-for="(item,index) in form.discountGoodList" :key="index" style="margin-top: 10px;display: flex;align-items: center;">
+              <el-form-item label="单品折扣：" label-width="100px">
+                <el-select v-model="form.discountGoodList[index].goodId" clearable placeholder="请选择单品">
+                  <el-option
+                    v-for="item in scenicAreaProducts"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+                <el-input-number style="width: 150px;margin-left: 20px;" v-model="form.discountGoodList[index].discountValue" placeholder="请输入单品折扣" controls-position="right"></el-input-number>
+                <span style="padding-bottom: 15px;">%</span>
+              </el-form-item>
+              <el-button style="margin-left: 15px;" v-if="form.discountGoodList.length==(index+1)" type="primary" @click="addClassifyList">添加单品</el-button>
+              <el-button style="margin-left: 15px;" type="danger" @click="clearClassifyList(index)">移除</el-button>
+            </div>
+          </el-form-item>
+          <el-form-item label="积分权益：">
+            <el-form-item label="积分成长系数：" prop="integralRatio" label-width="120px">
+              <el-input-number style="width: 150px;" v-model="form.integralRatio" placeholder="请输入积分成长系数" controls-position="right"></el-input-number>
+              <span style="padding-bottom: 15px;font-size: 12px;color: #ccc;">（用户下单获取积分值=实付金额**积分规则基础系数*会员成长系数会员系数越大，获得成长值越多，建议数值设置不要过大）</span>
+            </el-form-item>
+          </el-form-item>
+          <el-form-item label="持卡须知" prop="remark">
+            <el-input style="width: 100%;" type="textarea" v-model="form.remark" placeholder="请输入实体卡名称" maxlength="200"
+              show-word-limit />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="formStatus == 1">
+      <el-button @click="cancel" :loading="loading">关闭</el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import {
+  getTableDeatilsByIdApi,
+  updateTableApi,
+  addTableApi
+} from '@/api/CURD'
+
+export default {
+  name: "addAndEdit",
+  dicts: ['activation_rule'],
+  data() {
+    return {
+      title: "",
+      model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
+      open: false,
+      loading: false,
+      loadingText: "拼命加载数据中...",
+      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
+      configUrl: {
+        add: '/merchant/merchantEntitycardConfig/insertOrUpdate', // 新增地址
+        details: '/merchant/merchantEntitycardConfig/selectById', // 规格详情
+        edit: '/merchant/merchantEntitycardConfig/insertOrUpdate', // 编辑地址
+      },
+      performId: null,
+      form: {
+        id: undefined,
+        activationRule: []
+      },
+      rules: {
+        cardName: [{ required: true, message: "请输入实体卡名称", trigger: ["change", "blur"] }],
+        price: [{ required: true, message: "请输入实体卡价格", trigger: ["change", "blur"] }],
+
+        useType: [{ required: true, message: "请选择使用期限", trigger: ["change", "blur"] }],
+        useDay: [{ required: false, message: "请输入天数", trigger: ["change", "blur"] }],
+        useEndDay: [{ required: false, message: "请选择日期", trigger: ["change", "blur"] }],
+
+        effectiveDateType: [{ required: true, message: "请选择生效日期", trigger: ["change", "blur"] }],
+        activationRule: [{ required: true, message: "请选择激活后完善信息", trigger: ["change", "blur"] }],
+
+        isStorageValue: [{ required: true, message: "请选择支持储值", trigger: ["change", "blur"] }],
+        minAmount: [{ required: true, message: "请输入最小储值金额", trigger: ["change", "blur"] }],
+        maxAmount: [{ required: true, message: "请输入最大储值金额", trigger: ["change", "blur"] }],
+        storageConfigIsCredit: [{ required: true, message: "请选择储值消费可获得积分", trigger: ["change", "blur"] }],
+        storageConfigRefundType: [{ required: true, message: "请选择支持退款", trigger: ["change", "blur"] }],
+        storageConfigGoodIds: [{ required: false, message: "请选择不参与实体卡储值付款商品", trigger: ["change", "blur"] }],
+
+        isCredit: [{ required: true, message: "请选择支持积分", trigger: ["change", "blur"] }],
+
+        discountValue: [{ required: true, message: "请输入基本折扣", trigger: ["change", "blur"] }],
+        integralRatio: [{ required: true, message: "请输入积分成长系数", trigger: ["change", "blur"] }],
+      },
+      tableList: [],// 景点产品关联
+      scenicAreaProducts: [],
+    };
+  },
+  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=='ADD') { // 新增
+        this.$set(this,'form',row)
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row
+        }
+        this.$set(this,'form',obj)
+        this.formStatus = 1
+      }else if(model=='DEATILSInit') { // 新增
+        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,
+            activationRule: res.data.activationRule?res.data.activationRule.split(','):[]
+          }
+          if(obj.isStorageValue==1) {
+            obj['minAmount'] = obj.storageConfig.minAmount
+            obj['maxAmount'] = obj.storageConfig.maxAmount
+            obj['storageConfigIsCredit'] = obj.storageConfig.isCredit
+            obj['storageConfigRefundType'] = obj.storageConfig.refundType
+            obj['storageConfigGoodIds'] = obj.storageConfig.goodIds?obj.storageConfig.goodIds.split(','):[]
+          }
+          this.radioInputs(obj.useType)
+          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(type) {
+      console.log("dsfsfds=======", type, this.form)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.loadingText = "提交数据中..."
+          this.loading = true
+          let params = JSON.parse(JSON.stringify(this.form))
+          if(params.isStorageValue == 1) {
+            params['storageConfig'] = {
+              isCredit: this.form.storageConfigIsCredit,
+              minAmount: this.form.minAmount,
+              maxAmount: this.form.maxAmount,
+              refundType: this.form.storageConfigRefundType,
+              goodIds: this.form.storageConfigGoodIds?this.form.storageConfigGoodIds.join(','):''
+            }
+          }
+          delete params.minAmount
+          delete params.maxAmount
+          delete params.storageConfigIsCredit
+          delete params.storageConfigRefundType
+          delete params.storageConfigGoodIds
+          addTableApi(this.configUrl.edit, {
+            ...params,
+            activationRule: params.activationRule?params.activationRule.join(','):null,
+          }).then(response => {
+            this.$modal.msgSuccess(`${this.form.id ? '编辑' : '新增'}成功`);
+            this.loading = false
+            this.$set(this, 'form', {activationRule:[]})
+            this.$nextTick(() => {
+              this.$refs.form.clearValidate();
+            })
+            this.open = false;
+            this.$emit('refresh')
+          }).catch(() => {
+            this.$message.error(`${this.form.id ? '编辑' : '新增'}失败!!!`);
+            this.loading = false
+          })
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      if (this.$refs["form"]) {
+        //this.$refs["form"].resetFields();
+        this.$set(this, 'form', {activationRule:[]})
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        })
+      }
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /** */
+    radioInputs(value) {
+      if (value == 1) {
+        this.rules.useDay[0].required = false
+        this.rules.useEndDay[0].required = false
+        this.$refs.form.clearValidate('useDay');
+        this.$refs.form.clearValidate('useEndDay');
+      } else if (value == 2) {
+        this.rules.useDay[0].required = true
+        this.rules.useEndDay[0].required = false
+        this.$refs.form.clearValidate('useEndDay');
+      } else if (value == 3) {
+        this.rules.useDay[0].required = false
+        this.rules.useEndDay[0].required = true
+        this.$refs.form.clearValidate('useDay');
+      }
+    },
+    /** 填加单品  */
+    addClassifyList(){
+      let list = []
+      if(this.form.discountGoodList) {
+        list = JSON.parse(JSON.stringify(this.form.discountGoodList))
+      }
+      list.push({
+        goodId: null,
+        discountValue: null
+      })
+      this.$set(this.form,'discountGoodList',list)
+    }, 
+    /** 移除单品  */
+    clearClassifyList(index) {
+      this.form.discountGoodList.splice(index,1)
+    }
+  },
+};
+</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/physicalCard/detailsBox/memberInformationDetails.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :title="title"
     :visible.sync="open"
-    width="70%"
+    width="50%"
     append-to-body
     :close-on-click-modal="false"
     @close="cancel"
@@ -18,57 +18,29 @@
         element-loading-spinner="''"
         element-loading-background="rgba(0, 0, 0, 0.8)"
         >
-        <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form :model="form" ref="form" :rules="rules" label-width="200px">
           <div class="form-title"><span>基本信息</span></div>
-          <div style="display: flex;">
-            <el-form-item label="会员名称：">
-              <span style="display: block; min-width: 250px;">{{ form.realName }}</span>
-            </el-form-item>
-            <el-form-item label="性别：">
-              <dict-tag :options="dict.type.tourism_memberInformation_sex" :value="form.sex"/>
-            </el-form-item>
-          </div>
-          <div style="display: flex;">
-            <el-form-item label="手机号：">
-              <span style="display: block;min-width: 250px;">{{ form.mobile }}</span>
-            </el-form-item>
-            <el-form-item label="身份证号：">
-              <span style="display: block;min-width: 250px;">{{ form.cardId }}</span>
-            </el-form-item>
-          </div>
-          <div style="display: flex;">
-            <el-form-item label="注册时间：">
-              <span style="display: block;min-width: 250px;">{{ form.createTime }}</span>
-            </el-form-item>
-          </div>
-          <div class="form-title"><span>会员信息</span></div>
-          <div style="display: flex;">
-            <el-form-item label="会员类型：">
-              <span style="display: block;min-width: 250px;">
-                <dict-tag :options="dict.type.tourism_memberInformation_user_type" :value="form.type"/>
-              </span>
-            </el-form-item>
-            <el-form-item label="会员卡号：">
-              <span style="display: block;min-width: 250px;">{{ form.name }}</span>
-            </el-form-item>
-          </div>
-          <div style="display: flex;">
-            <el-form-item label="剩余积分：">
-              <span style="display: block;min-width: 250px;">{{ form.credit }}</span>
-            </el-form-item>
-            <el-form-item label="剩余储值：">
-              <span style="display: block;min-width: 250px;">{{ form.balance }}</span>
-            </el-form-item>
-          </div>
-          <div class="form-title"><span>消费数据</span></div>
-          <div style="display: flex;">
-            <el-form-item label="下单数(单)：">
-              <span style="display: block;min-width: 250px;">{{ form.orderCount }}</span>
-            </el-form-item>
-            <el-form-item label="支付成功数(单)：">
-              <span style="display: block;min-width: 250px;">{{ form.buyCount }}</span>
-            </el-form-item>
-          </div>
+          <el-form-item label="实体卡号：" prop="cardNo">
+            <span>{{ form.cardNo }}</span>
+          </el-form-item>
+          <el-form-item label="办卡类型：" prop="cardName">
+            <span>{{ form.cardName }}</span>
+          </el-form-item>
+          <el-form-item label="持卡人：" prop="userName">
+            <span>{{ form.userName }}</span>
+          </el-form-item>
+          <el-form-item label="身份证号：" prop="idCard">
+            <span>{{ form.idCard }}</span>
+          </el-form-item>
+          <el-form-item label="手机号：" prop="phone">
+            <span>{{ form.phone }}</span>
+          </el-form-item>
+          <el-form-item label="可退金额：" prop="refundAmount">
+            <span>{{ form.refundAmount }}</span>
+          </el-form-item>
+          <el-form-item label="余额：" prop="amount">
+            <span>{{ form.amount }}</span>
+          </el-form-item>
         </el-form>
       </div>
     </div>
@@ -97,7 +69,7 @@ export default {
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '', // 新增地址
-        details: '/member/memberInfo/detail', // 详情地址
+        details: '/merchant/merchantEntitycard/selectById', // 详情地址
         edit: '', // 编辑地址
       },
       form: {
@@ -117,12 +89,11 @@ export default {
       this.model = model
       this.formStatus = 0
       if(model=='ADD') { // 新增
-        this.$set(this,'form',{...row,imgUrl:[]})
+        this.$set(this,'form',{...row})
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
         let obj = {
           ...row,
-          imgUrl: row.imgUrl?row.imgUrl.split(','):[]
         }
         this.$set(this,'form',obj)
         this.formStatus = 1
@@ -145,7 +116,6 @@ export default {
         if(res.code == 200) {
           let obj = {
             ...res.data,
-            imgUrl: res.data.imgUrl?res.data.imgUrl.split(','):[],
         }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1

src/views/tourism/membershipManagement/physicalCard/formBox/membershipLevelForm.vue

@@ -1,491 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="75%"
-    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="200px">
-          <div class="form-title"><span>基本信息</span></div>
-          <el-form-item label="等级名称：" prop="name">
-            <el-input style="width: 350px;" v-model="form.name" placeholder="请输入等级名称" maxlength="50" show-word-limit />
-          </el-form-item>
-          <el-form-item label="所需积分值：" prop="upIntegral">
-            <el-input-number style="width: 350px;" v-model="form.upIntegral" controls-position="right" placeholder="请输入所需积分值"></el-input-number>
-          </el-form-item>
-          <el-form-item label="等级图片" prop="logo">
-            <div style="display: flex;">
-              <div 
-              v-for="(item,index) in form.logo" 
-              :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.logo">
-                </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.logo||form.logo.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>建议尺寸XXX*XXX,支持jpg、png,支持100KB大小以内的图片上传</span>
-          </el-form-item>
-          <div class="form-title"><span>会员权益</span></div>
-          <el-form-item label="折扣权益：">
-            <div style="display: flex;align-items: center;">
-              <el-form-item label="基本折扣：" prop="discount" label-width="100px">
-                <el-input-number style="width: 150px;" v-model="form.discount" controls-position="right" placeholder="请输入基本折扣"></el-input-number>
-                <span style="padding-bottom: 15px;">%</span>
-              </el-form-item>
-              <el-button style="margin-left: 15px;" v-if="!form.classifyList||form.classifyList.length==0" type="primary" @click="addClassifyList">添加单品</el-button>
-            </div>
-            
-            <div v-for="(item,index) in form.classifyList" :key="index" style="margin-top: 10px;display: flex;align-items: center;">
-              <el-form-item label="单品折扣：" label-width="100px">
-                <el-select v-model="form.classifyList[index].classifyId" clearable placeholder="请选择单品">
-                  <el-option
-                    v-for="item in scenicAreaProducts"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-                <el-input-number style="width: 150px;margin-left: 20px;" v-model="form.classifyList[index].discount" placeholder="请输入单品折扣" controls-position="right"></el-input-number>
-                <span style="padding-bottom: 15px;">%</span>
-              </el-form-item>
-              <el-button style="margin-left: 15px;" v-if="form.classifyList.length==(index+1)" type="primary" @click="addClassifyList">添加单品</el-button>
-              <el-button style="margin-left: 15px;" type="danger" @click="clearClassifyList(index)">移除</el-button>
-            </div>
-          </el-form-item>
-          <el-form-item label="积分权益：">
-            <el-form-item label="积分成长系数：" prop="integralRatio" label-width="120px">
-              <el-input-number style="width: 150px;" v-model="form.integralRatio" placeholder="请输入积分成长系数" controls-position="right"></el-input-number>
-              <span style="padding-bottom: 15px;font-size: 12px;color: #ccc;">(会员下单获取积分值=实付金额**积分规则基础系数"会员成长系数会员系数越大，获得成长值越多，建议数值设置不要过大)</span>
-            </el-form-item>
-          </el-form-item>
-          <el-form-item label="专属优惠卷：" prop="couponIdList">
-            <el-select v-model="form.couponIdLList" clearable placeholder="请选择专属优惠卷">
-              <el-option
-                v-for="item in scenicAreaProducts"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-                </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="指定产品不参与会员折扣：" prop="goodsIdList">
-            <el-select v-model="form.goodsIdList" clearable placeholder="请选择指定产品不参与会员折扣">
-              <el-option
-                v-for="item in scenicAreaProducts"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-                </el-option>
-            </el-select>
-          </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
- } 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: '/member/memberLevelInfo/insertOrUpdate', // 新增地址
-        details: '/member/memberLevelInfo/selectById', // 详情地址
-        edit: '/member/memberLevelInfo/insertOrUpdate', // 编辑地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        name: [{ required: true, message: "请输入等级名称", trigger: ["change","blur"] }],
-        logo: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
-        upIntegral: [{ required: true, message: "请输入所需积分值", trigger: ["change","blur"] }],
-        discount: [{ required: true, message: "请输入基本折扣", trigger: ["change","blur"] }],
-        integralRatio: [{ required: true, message: "请输入积分成长系数", trigger: ["change","blur"] }],
-      },
-      scenicAreaProducts: [],// 景点产品关联
-
-      //  上传文件
-      actionUrl: process.env.VUE_APP_BASE_API + process.env.VUE_APP_UPLOAD_IMAGE,
-      actionUrlLoading: false,
-    };
-  },
-  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=='ADD') { // 新增
-        this.$set(this,'form',{...row,logo:[]})
-        this.formStatus = 1
-      }else if(model=='EDIT') { // 新增
-        let obj = {
-          ...row,
-          logo: row.logo?row.logo.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,
-            logo: res.data.logo?res.data.logo.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(valid => {
-        if (valid) {
-          this.loadingText = "提交数据中..."
-          this.loading = true
-          if (this.model != 'ADD') {
-            addTableApi(
-              this.configUrl.edit,{
-                ...this.form,
-                logo: this.form.logo ? this.form.logo.join(','):''
-              }).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.loading = false
-              this.open = false;
-              this.$emit('refresh')
-            }).catch(()=>{
-              this.$message.error("修改失败!!!");
-              this.loading = false
-            })
-          } else {
-            addTableApi(this.configUrl.edit,{
-                ...this.form,
-                logo: this.form.logo ? this.form.logo.join(','):''
-              }).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.loading = false
-              this.open = false;
-              this.$emit('refresh')
-            }).catch(()=>{
-              this.$message.error("新增失败!!!");
-              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;
-    },
-
-    /**  上传图片 单张  */
-    handleAvatarSuccess(response, file, fileList) {
-      console.log("res, file",response, file, fileList)
-      this.actionUrlLoading = false
-      if(response.code == 200) {
-        this.form.logo.push(response.data.url)
-      }
-    },
-    beforeAvatarUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      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('上传头像图片大小不能超过 1MB!');
-      }
-      return isJPG && isLt2M;
-    },
-    handleAvatarProgress(){
-      this.actionUrlLoading = true
-    },
-    handleAvatarError() {
-      this.actionUrlLoading = false
-    },
-    handleRemove(index) {
-      this.form.logo.splice(index,1)
-    },
-
-    /** 填加单品  */
-    addClassifyList(){
-      let list = []
-      if(this.form.classifyList) {
-        list = JSON.parse(JSON.stringify(this.form.classifyList))
-      }
-      list.push({
-        classifyId: null,
-        discount: null,
-        classifyName: null
-      })
-      this.$set(this.form,'classifyList',list)
-    }, 
-    /** 移除单品  */
-    clearClassifyList(index) {
-      this.form.classifyList.splice(index,1)
-    }
-  },
-};
-</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/physicalCard/formBox/physicalCardAllocationForm.vue

@@ -76,25 +76,57 @@
           </el-form-item>
           <div class="form-title"><span>权益规则</span></div>
           <el-form-item label="支持储值" prop="isStorageValue">
-            <div style="display: flex;align-items: center;">
-              <el-radio-group v-model="form.isStorageValue" @input="radioInputsss">
-                <el-radio :label="0">不可储值</el-radio>
-                <el-radio :label="1">可储值</el-radio>
-              </el-radio-group>
+            <el-radio-group v-model="form.isStorageValue">
+              <el-radio :label="0">不可储值</el-radio>
+              <el-radio :label="1">可储值</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <div v-if="form.isStorageValue==1">
+            <div class="form-title"><span>实体卡储值规则配置</span></div>
+            <el-form-item label="储值金额范围" label-width="120px">
               <div style="display: flex;align-items: center;">
-                <el-form-item label="最小储值金额" label-width="120px" prop="minAmount">
-                  <el-input-number :disabled="form.isStorageValue != 1" v-model="form.minAmount" placeholder="请输入最小储值金额"
-                    controls-position="right">
+                <el-form-item label="" label-width="0px" prop="minAmount">
+                <el-input-number v-model="form.minAmount" placeholder="请输入最小储值金额"
+                  controls-position="right">
                   </el-input-number>
                 </el-form-item>
-                <el-form-item label="最大储值金额" label-width="120px" prop="maxAmount">
-                  <el-input-number :disabled="form.isStorageValue != 1" v-model="form.maxAmount" placeholder="请输入最大储值金额"
+                <span>--</span>
+                <el-form-item label="" label-width="0px" prop="maxAmount">
+                  <el-input-number v-model="form.maxAmount" placeholder="请输入最大储值金额"
                     controls-position="right">
                   </el-input-number>
                 </el-form-item>
               </div>
-            </div>
-          </el-form-item>
+              
+            </el-form-item>
+            <el-form-item label="储值消费可获得积分" prop="storageConfigIsCredit">
+              <el-radio-group v-model="form.storageConfigIsCredit">
+                <el-radio :label="0">不可积分</el-radio>
+                <el-radio :label="1">可积分</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="支持退款" prop="storageConfigRefundType">
+              <el-radio-group v-model="form.storageConfigRefundType">
+                <el-radio :label="0">可退(需审核)</el-radio>
+                <el-radio :label="1">可退(不需审核)</el-radio>
+                <el-radio :label="2">不可退</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="不参与实体卡储值付款商品：" label-width="220px" prop="storageConfigGoodIds">
+              <el-select 
+              v-model="form.storageConfigGoodIds" 
+              multiple
+              clearable 
+              placeholder="请选择不参与实体卡储值付款商品">
+                <el-option
+                  v-for="item in scenicAreaProducts"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
           <el-form-item label="支持积分" prop="isCredit">
             <el-radio-group v-model="form.isCredit">
               <el-radio :label="0">不可积分</el-radio>
@@ -135,7 +167,7 @@
             </el-form-item>
           </el-form-item>
           <el-form-item label="持卡须知" prop="remark">
-            <el-input style="width: 100%;" type="textarea" v-model="form.remark" placeholder="请输入实体卡名称" maxlength="200"
+            <el-input style="width: 100%;" type="textarea" v-model="form.remark" placeholder="请输入持卡须知" maxlength="200"
               show-word-limit />
           </el-form-item>
         </el-form>
@@ -194,8 +226,11 @@ export default {
         activationRule: [{ required: true, message: "请选择激活后完善信息", trigger: ["change", "blur"] }],
 
         isStorageValue: [{ required: true, message: "请选择支持储值", trigger: ["change", "blur"] }],
-        minAmount: [{ required: false, message: "请输入最小储值金额", trigger: ["change", "blur"] }],
-        maxAmount: [{ required: false, message: "请输入最大储值金额", trigger: ["change", "blur"] }],
+        minAmount: [{ required: true, message: "请输入最小储值金额", trigger: ["change", "blur"] }],
+        maxAmount: [{ required: true, message: "请输入最大储值金额", trigger: ["change", "blur"] }],
+        storageConfigIsCredit: [{ required: true, message: "请选择储值消费可获得积分", trigger: ["change", "blur"] }],
+        storageConfigRefundType: [{ required: true, message: "请选择支持退款", trigger: ["change", "blur"] }],
+        storageConfigGoodIds: [{ required: false, message: "请选择不参与实体卡储值付款商品", trigger: ["change", "blur"] }],
 
         isCredit: [{ required: true, message: "请选择支持积分", trigger: ["change", "blur"] }],
 
@@ -203,6 +238,7 @@ export default {
         integralRatio: [{ required: true, message: "请输入积分成长系数", trigger: ["change", "blur"] }],
       },
       tableList: [],// 景点产品关联
+      scenicAreaProducts: [],
     };
   },
   methods: {
@@ -215,7 +251,10 @@ export default {
       this.model = model
       this.formStatus = 0
       if(model=='ADD') { // 新增
-        this.$set(this,'form',row)
+        this.$set(this,'form',{
+          ...row,
+          activationRule: []
+        })
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
         let obj = {
@@ -247,9 +286,11 @@ export default {
           if(obj.isStorageValue==1) {
             obj['minAmount'] = obj.storageConfig.minAmount
             obj['maxAmount'] = obj.storageConfig.maxAmount
+            obj['storageConfigIsCredit'] = obj.storageConfig.isCredit
+            obj['storageConfigRefundType'] = obj.storageConfig.refundType
+            obj['storageConfigGoodIds'] = obj.storageConfig.goodIds?obj.storageConfig.goodIds.split(','):[]
           }
           this.radioInputs(obj.useType)
-          this.radioInputsss(obj.isStorageValue)
           this.$set(this, 'form', JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
         } else {
@@ -280,22 +321,23 @@ export default {
           let params = JSON.parse(JSON.stringify(this.form))
           if(params.isStorageValue == 1) {
             params['storageConfig'] = {
-              isCredit: this.form.isCredit,
+              isCredit: this.form.storageConfigIsCredit,
               minAmount: this.form.minAmount,
-              maxAmount: this.form.maxAmount
+              maxAmount: this.form.maxAmount,
+              refundType: this.form.storageConfigRefundType,
+              goodIds: this.form.storageConfigGoodIds?this.form.storageConfigGoodIds.join(','):''
             }
           }
           delete params.minAmount
           delete params.maxAmount
+          delete params.storageConfigIsCredit
+          delete params.storageConfigRefundType
+          delete params.storageConfigGoodIds
           addTableApi(this.configUrl.edit, {
-            ...this.form,
-            activationRule: this.form.activationRule?this.form.activationRule.join(','):null,
-            storageConfig: {
-              minAmount: this.form.minAmount,
-              maxAmount: this.form.maxAmount
-            }
+            ...params,
+            activationRule: params.activationRule?params.activationRule.join(','):null,
           }).then(response => {
-            this.$modal.msgSuccess(`${this.form.goodsId ? '编辑' : '新增'}成功`);
+            this.$modal.msgSuccess(`${this.form.id ? '编辑' : '新增'}成功`);
             this.loading = false
             this.$set(this, 'form', {activationRule:[]})
             this.$nextTick(() => {
@@ -304,7 +346,7 @@ export default {
             this.open = false;
             this.$emit('refresh')
           }).catch(() => {
-            this.$message.error(`${this.form.goodsId ? '编辑' : '新增'}失败!!!`);
+            this.$message.error(`${this.form.id ? '编辑' : '新增'}失败!!!`);
             this.loading = false
           })
         }
@@ -350,18 +392,6 @@ export default {
         this.$refs.form.clearValidate('useDay');
       }
     },
-    /** */
-    radioInputsss(value) {
-      if (value == 0) {
-        this.rules.minAmount[0].required = false
-        this.rules.maxAmount[0].required = false
-        this.$refs.form.clearValidate('minAmount');
-        this.$refs.form.clearValidate('maxAmount');
-      } else if (value == 1) {
-        this.rules.minAmount[0].required = true
-        this.rules.maxAmount[0].required = true
-      }
-    },
     /** 填加单品  */
     addClassifyList(){
       let list = []

src/views/tourism/membershipManagement/physicalCard/formBox/physicalCardManagementForm.vue

@@ -0,0 +1,422 @@
+<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="200px">
+          <div class="form-title"><span>基本信息</span></div>
+          <el-form-item label="办卡类型：" prop="entityCardConfigId">
+            <el-select style="width: 100%;" v-model="form.entityCardConfigId" clearable placeholder="请选择卡类型">
+              <el-option
+                v-for="dict in tableList"
+                :key="dict.id"
+                :label="dict.cardName"
+                :value="dict.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="持卡人：" prop="userName">
+            <el-input v-model="form.userName" 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>
+          <el-form-item label="手机号：" prop="phone">
+            <div style="display: flex;">
+              <el-input v-model="form.phone" 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>
+        </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/merchantEntitycard/insertOrUpdate', // 新增地址
+        details: '/merchant/merchantEntitycard/selectById', // 详情地址
+        edit: '/merchant/merchantEntitycard/insertOrUpdate', // 编辑地址
+        list: '/merchant/merchantEntitycardConfig/pageList', // 实体卡类型
+        codeList: '/merchant/merchantAuth/getVerifyCode', // 获取验证码
+        merchantRealAuth: '/merchant/merchantAuth/merchantRealAuth', // 验证
+      },
+      form: {
+        id: undefined,
+      },
+      rules: {
+        entityCardConfigId: [{ required: true, message: "请选择办卡类型", trigger: ["change","blur"] }],
+        userName: [{ required: true, message: "请输入持卡人", trigger: ["change","blur"] }],
+        idCard: [{ required: true, message: "请输入身份证号", trigger: ["change","blur"] }],
+        phone: [
+          { required: true, trigger: ["change","blur"], message: "请输入您的账号" },
+          { pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: ["change","blur"] }
+        ],
+        code: [{ required: true, message: "请输入短信验证码", trigger: ["change","blur"] }],
+      },
+      scenicAreaProducts: [],// 景点产品关联
+
+      tableList: [], // 实体卡类型
+
+      phoneCodeLoading: 0
+    };
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询体卡类型列表 */
+    getList() {
+      listTableApi(
+        this.configUrl.list,
+        this.addDateRange({
+          pageNum: 1,
+          pageSize: 9999,
+        })).then(response => {
+              this.tableList = response.data.rows;
+          }
+        ).catch (error=>{
+          this.tableList = [];
+        }) 
+    },
+    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,logo:[]})
+        this.formStatus = 1
+      }else if(model=='EDIT') { // 新增
+        let obj = {
+          ...row,
+          logo: row.logo?row.logo.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,
+        }
+          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 {
+              return
+            }
+            if (this.model != 'ADD') {
+              let res = await addTableApi(this.configUrl.edit,{...this.form})
+              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})
+              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.phone)) {
+        this.$message.error("手机号输入不正确!!!");
+        return
+      }
+      this.phoneCodeLoading = 1
+      addTableApi(
+        this.configUrl.codeList,
+        this.addDateRange({
+          phone: this.form.phone,
+        })).then(response => {
+          this.phoneCodeLoading = 2
+        }).catch (error=>{
+          this.phoneCodeLoading = 0
+        }) 
+     },
+  },
+};
+</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/physicalCard/formBox/setIntegralForm.vue

@@ -72,9 +72,9 @@ export default {
       loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/member/memberInfo/updateCredit', // 新增地址
-        details: '/member/memberInfo/detail', // 详情地址
-        edit: '/member/memberInfo/updateCredit', // 编辑地址
+        add: '/merchant/merchantEntitycardCreditRecord/systemAdd', // 新增地址
+        details: '', // 详情地址
+        edit: '/merchant/merchantEntitycardCreditRecord/systemAdd', // 编辑地址
       },
       form: {
         id: undefined,
@@ -102,7 +102,7 @@ export default {
           ...row
         }
         this.$set(this,'form',{
-          memberId: row.id
+          entityCardId: row.id
         })
         this.formStatus = 1
       }else if(model=='EDITInit') { // 新增

src/views/tourism/membershipManagement/physicalCard/formBox/setStoredValue.vue

@@ -20,10 +20,10 @@
         >
         <el-form :model="form" ref="form" :rules="rules" label-width="120px">
           <el-form-item label="账户余额">
-            <span>{{ form.balance }}</span>
+            <span>{{ form.amount }}</span>
           </el-form-item>
           <el-form-item label="可退余额">
-            <span>{{ form.refundBalance }}</span>
+            <span>{{ form.refundAmount }}</span>
           </el-form-item>
           <el-form-item label="储值变动" prop="type">
             <el-radio-group v-model="form.type">
@@ -78,9 +78,9 @@ export default {
       loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
-        add: '/member/memberInfo/updateBalance', // 新增地址
-        details: '/member/memberInfo/detail', // 详情地址
-        edit: '/member/memberInfo/updateBalance', // 编辑地址
+        add: '/merchant/merchantEntitycardStorageRecord/systemAdd', // 新增地址
+        details: '/merchant/merchantEntitycard/selectById', // 详情地址
+        edit: '/merchant/merchantEntitycardStorageRecord/systemAdd', // 编辑地址
       },
       form: {
         id: undefined,
@@ -108,9 +108,9 @@ export default {
           ...row
         }
         this.$set(this,'form',{
-          balance: row.balance,
-          refundBalance: row.refundBalance,
-          memberId: row.id 
+          amount: row.amount,
+          refundAmount: row.refundAmount,
+          entityCardId: row.id 
         })
         this.formStatus = 1
       }else if(model=='EDITInit') { // 新增
@@ -162,7 +162,10 @@ export default {
           if (this.model != 'ADD') {
             addTableApi(
               this.configUrl.edit,{
-                ...this.form
+                entityCardId: this.form.entityCardId,
+                type: this.form.type,
+                amount: this.form.num,
+                remark: this.form.remark
               }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.loading = false
@@ -174,7 +177,10 @@ export default {
             })
           } else {
             addTableApi(this.configUrl.edit,{
-                ...this.form
+                entityCardId: this.form.entityCardId,
+                type: this.form.type,
+                amount: this.form.num,
+                remark: this.form.remark
               }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.loading = false

src/views/tourism/membershipManagement/physicalCard/physicalCardAllocation.vue

@@ -3,7 +3,7 @@
       <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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
                 <el-form-item label="实体卡名称" prop="cardName">
                     <el-input
                     v-model="queryParams.cardName"
@@ -67,8 +67,8 @@
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
+                  @click="handleDetails(scope.row)"
+                  v-hasPermi="configPermi.details"
                 >详情</el-button>
                 <el-button
                   size="mini"
@@ -99,6 +99,7 @@
       </el-row>
       <!--  新增或修改  -->
       <addAndEdit ref="addAndEdit" @refresh="getList" />
+      <detailsBox ref="detailsBox"></detailsBox>
     </div>
   </template>
   
@@ -108,25 +109,26 @@
     delTableParamsApi
     } from "@/api/CURD";
   import addAndEdit from "./formBox/physicalCardAllocationForm.vue"
+  import detailsBox from "./detailsBox/physicalCardAllocationDetails.vue"
   export default {
     name: "User",
     dicts: [],
-    components: {addAndEdit},
+    components: {addAndEdit,detailsBox},
     data() {
       return {
-        title: "景区门票",// 通用标题
+        title: "实体卡配置",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-          release: ['system:user:release']
+          add: ['physicalCard:physicalCardAllocation:add'], // 新增权限
+          details: ['physicalCard:physicalCardAllocation:details'], // 详情权限
+          delect: ['physicalCard:physicalCardAllocation:delect'], // 删除权限
+          edit: ['physicalCard:physicalCardAllocation:edit'], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          release: ['']
         },
         configUrl: {
           list: '/merchant/merchantEntitycardConfig/pageList', // 列表地址
-          delect: '', // 删除地址
+          delect: '/merchant/merchantEntitycardConfig/deleteById', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
@@ -295,9 +297,9 @@
       },
       // 生效日期
       setEffectiveDateType(row){
-        if(row.useType == 1) {
+        if(row.effectiveDateType == 1) {
           return '制卡之日生效'
-        }else if(row.useType == 2) {
+        }else if(row.effectiveDateType == 2) {
           return '激活之日生效'
         }else{
           return '--'

src/views/tourism/membershipManagement/physicalCard/physicalCardManagement.vue

@@ -4,9 +4,9 @@
         <!--用户数据-->
         <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="卡号" prop="realName">
+            <el-form-item label="卡号" prop="cardNo">
               <el-input
-                v-model="queryParams.realName"
+                v-model="queryParams.cardNo"
                 placeholder="请输入卡号"
                 clearable
                 style="width: 240px"
@@ -22,24 +22,24 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="手机号" prop="mobile">
+            <el-form-item label="手机号" prop="phone">
               <el-input
-                v-model="queryParams.mobile"
+                v-model="queryParams.phone"
                 placeholder="请输入手机号"
                 clearable
                 style="width: 240px"
                 @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.tourism_IntegralRecord_cardType"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value">
-                  </el-option>
-                </el-select>
+            <el-form-item label="卡类型" prop="entityCardConfigId">
+              <el-select v-model="queryParams.entityCardConfigId" clearable placeholder="请选择卡类型">
+                <el-option
+                  v-for="dict in tableListCopy"
+                  :key="dict.id"
+                  :label="dict.cardName"
+                  :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>
@@ -48,36 +48,52 @@
           </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="realName" prop="realName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="持卡人" align="center" key="memberCode" prop="memberCode" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="卡类型" align="center" key="cardType" prop="cardType" v-if="columns[5].visible" :show-overflow-tooltip="true">
+            <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="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="手机号" align="center" key="phone" prop="phone" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="卡类型" align="center" key="cardName" prop="cardName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="激活时间" align="center" key="effectiveDate" prop="effectiveDate" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="使用期限" align="center" key="useType" prop="useType" v-if="columns[5].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <dict-tag :options="dict.type.tourism_IntegralRecord_cardType" :value="scope.row.cardType"/>
+                <span>{{ setUseType(scope.row) }}</span>
               </template>
             </el-table-column>
-            
-            <el-table-column label="激活时间" align="center" key="cardId" prop="cardId" v-if="columns[4].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="使用期限" align="center" key="credit" prop="credit" v-if="columns[5].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="卡余额" align="center" key="balance" prop="balance" v-if="columns[6].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="卡积分" align="center" key="buyCount" prop="buyCount" v-if="columns[7].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="充值余额" align="center" key="consumeTotal" prop="consumeTotal" v-if="columns[8].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="状态" align="center" key="status" prop="status" v-if="columns[9].visible" :show-overflow-tooltip="true">
+            <el-table-column label="卡余额" align="center" key="amount" prop="amount" v-if="columns[6].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="卡积分" align="center" key="credit" prop="credit" v-if="columns[7].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="充值余额" align="center" key="storageAmount" prop="storageAmount" v-if="columns[8].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="卡状态" align="center" key="cardStatus" prop="cardStatus" v-if="columns[9].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <dict-tag :options="dict.type.tourism_memberInformation_status" :value="scope.row.status"/>
+                <dict-tag :options="dict.type.tourism_physicalCardManagement_cardStatus" :value="scope.row.cardStatus"/>
               </template>
             </el-table-column>
-            <el-table-column label="禁用/启用" align="center" key="status" prop="status" v-if="columns[9].visible" :show-overflow-tooltip="true">
+            <el-table-column label="禁用/启用" align="center" key="status1" prop="status1" v-if="columns[10].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <dict-tag :options="dict.type.tourism_memberInformation_status" :value="scope.row.status"/>
+                <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="lastCreateTime" prop="lastCreateTime" v-if="columns[10].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="最近消费时间" align="center" key="newOrderTime" prop="newOrderTime" v-if="columns[11].visible" :show-overflow-tooltip="true" />
             <el-table-column
               label="操作"
               align="center"
@@ -96,13 +112,13 @@
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                        v-hasPermi="['system:user:resetPwd']">设置积分</el-dropdown-item>
+                        v-hasPermi="configPermi.resetPwd">设置积分</el-dropdown-item>
                         <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                        v-hasPermi="['system:user:edit']">设置储值</el-dropdown-item>
-                        <el-dropdown-item command="handleAuthRole1" icon="el-icon-circle-check"
-                        v-hasPermi="['system:user:edit']">编辑</el-dropdown-item>
-                        <el-dropdown-item command="handleAuthRole2" icon="el-icon-circle-check"
-                        v-hasPermi="['system:user:edit']">重置密码</el-dropdown-item>
+                        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-menu>
                 </el-dropdown>
               </template>
@@ -118,6 +134,8 @@
           />
         </el-col>
       </el-row>
+      <!--  新增或修改  -->
+      <addAndEdit ref="addAndEdit" @refresh="getList" />
       <!--  详情 -->
       <detailsBox ref="detailsBox" />
 
@@ -131,24 +149,29 @@
   import { 
     listTableApi, 
     delTableParamsApi,
+    updateTableApi
   } from "@/api/CURD";
-  import detailsBox from "./detailsBox/memberInformationDetails.vue"
+  import addAndEdit from "./formBox/physicalCardManagementForm.vue"
+  import detailsBox from "./detailsBox/physicalCardManagementDetails.vue"
   import setIntegralForm from "./formBox/setIntegralForm.vue"
   import setStoredValue from "./formBox/setStoredValue.vue"
   export default {
     name: "User",
-    dicts: ['tourism_IntegralRecord_cardType','tourism_memberInformation_status'],
-    components: {detailsBox,setIntegralForm,setStoredValue},
+    dicts: ['tourism_IntegralRecord_cardType','tourism_physicalCardManagement_cardStatus'],
+    components: {addAndEdit,detailsBox,setIntegralForm,setStoredValue},
     data() {
       return {
-        title: "会员信息",// 通用标题
+        title: "实体卡管理",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
+          add: ['physicalCard:physicalCardManagement:add'], // 新增权限
+          details: ['physicalCard:physicalCardManagement:details'], // 详情权限
+          delect: ['physicalCard:physicalCardManagement:delect'], // 删除权限
+          edit: ['physicalCard:physicalCardManagement:edit'], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          resetPwd: ['physicalCard:physicalCardManagement:resetPwd'],// 设置积分
+          AuthRole: ['physicalCard:physicalCardManagement:AuthRole'],// 设置储值
+          Password: ['physicalCard:physicalCardManagement:Password'], // 重置密码
         },
         configUrl: {
           list: '/merchant/merchantEntitycard/pageList', // 列表地址
@@ -156,6 +179,9 @@
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
+          updateStatus: '/merchant/merchantEntitycard/updateStatus', // 编辑地址
+          resetPassword: '/merchant/merchantEntitycard/resetPassword',
+          listCopy: '/merchant/merchantEntitycardConfig/pageList'
         },
         // 遮罩层
         loading: true,
@@ -192,12 +218,28 @@
           { key: 10, label: `禁用/启用`, visible: true },
           { key: 11, label: `最近消费时间`, visible: true },
         ],
+        tableListCopy: []// 实体卡类型
       };
     },
     created() {
+      this.getListCopy()
       this.getList();
     },
     methods: {
+      /** 查询实体卡类型列表 */
+      getListCopy() {
+        listTableApi(
+          this.configUrl.listCopy,
+          this.addDateRange(
+            this.queryParams, 
+            this.dateRange)).then(response => {
+              this.tableListCopy = response.data.rows;
+          }
+        ).catch (error=>{
+          console.error('获取列表失败!!!!',error)
+          this.tableListCopy = [];
+        }) 
+      },
       /** 查询用户列表 */
       getList() {
         this.loading = true;
@@ -290,15 +332,27 @@
       },
       /** 开/闭 园 */
       openAttraction(row) {
-        console.log("row======",row)
-        this.$modal.confirm(`是否确认${row.status == 2 ? '关闭' : '打开'} ${row.name}园区吗？`).then( () => {
-          return addTableApi(this.configUrl.edit,{
-            ...row,
-            status: row.status == 1 ? 2 : 1
+        this.$modal.confirm(`是否确认${row.status == 0 ? '启用' : '禁用'} ${row.cardNo||''}吗？`).then( () => {
+          return updateTableApi(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||''}的密码为000000吗？`).then( () => {
+          return updateTableApi(this.configUrl.resetPassword,{
+            id: row.id,
           });
         }).then(() => {
           this.getList();
-          this.$modal.msgSuccess(`${row.status == 1 ? '打开' : '关闭'}成功`);
+          this.$modal.msgSuccess(`重置成功`);
         }).catch((e) => {
           console.error("失败====",e)
         });
@@ -315,16 +369,34 @@
         },
         // 更多操作触发
         handleCommand(command, row) {
-        switch (command) {
-            case "handleResetPwd":
-            this.handleResetPwd(row);
-            break;
-            case "handleAuthRole":
-            this.handleAuthRole(row);
-            break;
-            default:
-            break;
-        }
+          switch (command) {
+              case "handleResetPwd":
+              this.handleResetPwd(row);
+              break;
+              case "handleAuthRole":
+              this.handleAuthRole(row);
+              break;
+              case "handleEdit":
+              this.handleUpdate(row);
+              break;
+              case "handleResetPassword":
+              this.handleResetPassword(row);
+              break;
+              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 '--'
+          }
         },
     }
   };

src/views/tourism/membershipManagement/pointsManagement/IntegralRecord.vue

@@ -94,7 +94,8 @@
             </el-table-column>
             <el-table-column label="变动量" align="center" key="num" prop="num" v-if="columns[6].visible" :show-overflow-tooltip="true" />
             <el-table-column label="剩余积分" align="center" key="total" prop="total" v-if="columns[7].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="变动时间" align="center" key="createTime" prop="createTime" v-if="columns[8].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="变动原因" align="center" key="remark" prop="remark" v-if="columns[8].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="变动时间" align="center" key="createTime" prop="createTime" v-if="columns[9].visible" :show-overflow-tooltip="true" />
           </el-table>
   
           <pagination
@@ -167,6 +168,7 @@
           { key: 6, label: `变动类型`, visible: true },
           { key: 7, label: `变动量`, visible: true },
           { key: 8, label: `剩余积分`, visible: true },
+          { key: 9.5, label: `变动原因`, visible: true },
           { key: 9, label: `变动时间`, visible: true },
         ],
       };

src/views/tourism/membershipManagement/pointsManagement/IntegralRule.vue

@@ -45,7 +45,8 @@
                     style="width: 300px"
                     v-model="form.cleanTime"
                     type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    format="MM-dd"
+                    value-format="MM-dd"
                     placeholder="请选择每年固定自动清零时间">
                     </el-date-picker>
                 </el-form-item>
@@ -55,6 +56,7 @@
           <el-form-item style="margin-top: 15px;">
             <el-button :loading="loading" @click="initData()">取消</el-button>
             <el-button
+                v-hasPermi="configPermi.seva"
                 type="primary"
                 @click="submitForm"
                 :loading="loading"
@@ -85,13 +87,14 @@ import {
         loading: false,
         loadingText: "拼命加载数据中...",
         configPermi: {
-            add: ['system:user:edit'], // 新增权限
-            details: ['system:user:details'], // 详情权限
-            delect: ['system:user:remove'], // 删除权限
-            edit: ['system:user:edit'], // 编辑权限http://localhost/scenicAreaManagement/contentManagement/scenicAreaManagement/contentManagement/questions
-            upload: ['system:user:upload'],// 导入权限
-            export: ['system:user:export'],// 导出权限http://localhost/scenicAreaManagement/contentManagement/scenicAreaManagement/contentManagement/suggestions
-            release: ['system:user:release']
+            add: [''], // 新增权限
+            details: [''], // 详情权限
+            delect: [''], // 删除权限
+            edit: [''], // 编辑权限http://localhost/scenicAreaManagement/contentManagement/scenicAreaManagement/contentManagement/questions
+            upload: [''],// 导入权限
+            export: [''],// 导出权限http://localhost/scenicAreaManagement/contentManagement/scenicAreaManagement/contentManagement/suggestions
+            release: [''],
+            seva: ['pointsManagement:IntegralRecord:seva'] // 保存
         },
         configUrl: {
             details: '/merchant/creditConfig/getCreditConfig', // 详情地址

src/views/tourism/orderManagement/ticketOrdersAll/ticketOrders.vue

@@ -160,12 +160,12 @@
       return {
         title: "会员信息",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
+          add: [''], // 新增权限
+          details: ['ticketOrdersAll:ticketOrders:details'], // 详情权限
+          delect: [''], // 删除权限
+          edit: [''], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
         },
         configUrl: {
           list: '/order/orderInfo/list', // 列表地址

src/views/tourism/popularCheck/contentManagement.vue

@@ -4,10 +4,10 @@
         <!--用户数据-->
         <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="用户昵称">
+            <el-form-item label="用户名称">
                 <el-input
-                v-model="queryParams.nickName"
-                placeholder="请输入用户昵称"
+                v-model="queryParams.memberName"
+                placeholder="请输入用户名称"
                 clearable
                 style="width: 240px;"
                 @keyup.enter.native="handleQuery"
@@ -30,7 +30,7 @@
                 style="width: 100%"
                 >
                 <el-option
-                    v-for="dict in dict.type.tourism_orderRefund_status"
+                    v-for="dict in dict.type.tourism_contentManagement_status"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -49,7 +49,7 @@
   
           <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="memberName" prop="memberName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="用户名称" align="center" key="memberName" prop="memberName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
             <el-table-column label="标题" align="center" key="title" prop="title" v-if="columns[1].visible" :show-overflow-tooltip="true" />
             <el-table-column label="详情" align="center" key="content" prop="content" v-if="columns[2].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
@@ -62,10 +62,10 @@
             <el-table-column label="提交时间" align="center" key="createTime" prop="createTime" v-if="columns[3].visible" :show-overflow-tooltip="true" />
             <el-table-column label="状态" align="center" key="status" prop="status" v-if="columns[4].visible" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                    <dict-tag :options="dict.type.tourism_ticketOrders_source" :value="scope.row.status"/>
+                    <dict-tag :options="dict.type.tourism_contentManagement_status" :value="scope.row.status"/>
                 </template>
             </el-table-column>
-            <el-table-column label="审核时间" align="center" key="refundTime" prop="refundTime" v-if="columns[5].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="审核时间" align="center" key="updateTime" prop="updateTime" v-if="columns[5].visible" :show-overflow-tooltip="true" />
             <el-table-column label="点赞量(人/次)" align="center" key="praiseNum" prop="praiseNum" v-if="columns[6].visible" :show-overflow-tooltip="true" />
             <el-table-column
               label="操作"
@@ -79,8 +79,8 @@
                 type="text"
                 icon="el-icon-coordinate"
                 v-if="scope.row.status == 0"
-                @click="refundAuditFun(scope.row,)"
-                v-hasPermi="['refundMr:refundMr:delete']"
+                @click="refundAuditFun(scope.row)"
+                v-hasPermi="configPermi.refundAudit"
                 >审核</el-button>
                 <el-button
                   size="mini"
@@ -113,25 +113,26 @@
     delTableParamsApi, 
     updateTableApi
   } from "@/api/CURD";
-  import detailsBox from "./detailsBox/ticketRefundOrderDetails.vue"
+  import detailsBox from "./detailsBox/contentManagementDetails.vue"
   export default {
     name: "User",
-    dicts: ['tourism_orderRefund_status','tourism_ticketOrders_source'],
+    dicts: ['tourism_contentManagement_status'],
     components: {detailsBox},
     data() {
       return {
-        title: "门票退款管理",// 通用标题
+        title: "打卡管理",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
+          add: [''], // 新增权限
+          details: [''], // 详情权限
+          delect: ['popularCheck:contentManagement:delect'], // 删除权限
+          edit: [], // 编辑权限
+          upload: [],// 导入权限
+          export: [],// 导出权限
+          refundAudit: ['popularCheck:contentManagement:refundAudit'], //审核
         },
         configUrl: {
           list: '/member/memberCheckin/pageList', // 列表地址
-          delect: '', // 删除地址
+          delect: '/member/memberCheckin/deleteById', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
@@ -159,7 +160,7 @@
         dateRange: [],
         // 控制列表是否显示
         columns: [
-          { key: 0, label: `用户昵称`, visible: true },
+          { key: 0, label: `用户名称`, visible: true },
           { key: 1, label: `标题`, visible: true },
           { key: 2, label: `详情`, visible: true },
           { key: 3, label: `提交时间`, visible: true },

src/views/tourism/popularCheck/detailsBox/ticketRefundOrderDetails.vue

@@ -24,9 +24,6 @@
             <el-form-item label="用户名称：">
               <span style="display: block; min-width: 250px;">{{ form.memberName }}</span>
             </el-form-item>
-            <el-form-item label="昵称：">
-              <span style="display: block; min-width: 250px;">{{ form.nickName }}</span>
-            </el-form-item>
             <el-form-item label="头像" prop="avatar">
               <div style="display: flex;">
                 <div 
@@ -52,7 +49,7 @@
               <span style="display: block;min-width: 250px;">{{ form.praiseNum }}</span>
             </el-form-item>
             <el-form-item label="打卡距离：">
-              <span style="display: block;min-width: 250px;">{{ form.checkinDistance }}</span>
+              <span style="display: block;min-width: 250px;">{{ form.checkinDistance }}米</span>
             </el-form-item>
           </div>
           <div>
@@ -90,9 +87,9 @@
             </el-form-item>
           </div>
           <div v-if="model=='DEATILSADD'">
-            <div class="form-title"><span>审核操作</span></div>
+            <div class="form-title" style="display: flex;align-items: flex-end;"><span>审核操作</span><i>(注意：驳回时需填写驳回原因)</i></div>
               <div>
-                <el-form-item label="审核备注：" label-width="100px"></el-form-item>
+                <el-form-item label="审核备注：" :error="errReasonText" label-width="100px"></el-form-item>
                 <div>
                   <el-input
                     type="textarea"
@@ -107,8 +104,8 @@
                 type="danger" 
                 @click="refundAudit(2)"
                 :loading="loading"
-                >驳回退款</el-button>
-                <el-button type="primary" :loading="loading" @click="refundAudit(1)">同意退款</el-button>
+                >驳回</el-button>
+                <el-button type="primary" :loading="loading" @click="refundAudit(1)">同意</el-button>
               </div>
           </div>
         </el-form>
@@ -149,6 +146,7 @@ export default {
       },
       rules: {},
       scenicAreaProducts: [],// 景点产品关联
+      errReasonText: ''
     };
   },
   methods: {
@@ -193,6 +191,7 @@ export default {
             imgUrl: res.data.imgUrl?res.data.imgUrl.split(','):[]
         }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
+          this.errReasonText = ''
           this.formStatus = 1
         }else {
           this.$message.error('获取详情失败!!!');
@@ -229,9 +228,14 @@ export default {
     },
     /**  审核操作  */
     refundAudit(type){
+      if(type == 2 && !this.form.errReason) {
+        this.errReasonText = "请输入驳回原因"
+        return
+      } 
+      this.loading = true
       addTableApi(
         this.configUrl.refundAudit,{
-          refundId: this.form.id,// 退款ID-列表ID
+          id: this.form.id,// 退款ID-列表ID
           auditStatus: type,
           errReason: this.form.errReason,
         }).then(response => {

src/views/tourism/productManagement/formBox/scenicAreaTicketsForm.vue

@@ -50,7 +50,7 @@
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
-            <span>建议上传xxx*xxx,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
+            <span>支持jpg/png/gif,支持1MB大小以内的图片上传</span>
           </el-form-item>
           <el-tabs v-model="activeName">
             <el-tab-pane label="产品介绍" name="first">
@@ -59,7 +59,7 @@
               </el-form-item>
             </el-tab-pane>
             <el-tab-pane label="购票须知" name="second">
-              <el-form-item label-width="0" label="0" prop="performNotice">
+              <el-form-item label-width="0" label="" prop="performNotice">
                 <editor ref="editor" v-model="form.performNotice" :fileSize="20" :min-height="200" />
               </el-form-item>
             </el-tab-pane>
@@ -251,15 +251,15 @@ export default {
       
     },
     beforeAvatarUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      const isLt2M = file.size / 1024 / 1024 <= 1;
       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} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/productManagement/formBox/scenicAreaTicketsSpecsForm.vue

@@ -50,7 +50,7 @@
               >
                 <template slot-scope="scope">
                   <el-button type="primary" @click="getTableDeatilsFun(scope.row)" icon="el-icon-edit" circle></el-button>
-                  <el-button type="danger" icon="el-icon-delete" circle></el-button>
+                  <el-button type="danger" @click="handleDelete(scope.row)" icon="el-icon-delete" circle></el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -143,10 +143,10 @@
                       controls-position="right">
                     </el-input-number>
                   </el-form-item>
-                  <el-form-item label="规划价格：" prop="originalPrice">
+                  <el-form-item label="划线价格：" prop="originalPrice">
                     <el-input-number 
                       v-model="form.originalPrice" 
-                      placeholder="请输入规划价格"
+                      placeholder="请输入划线价格"
                       controls-position="right">
                     </el-input-number>
                   </el-form-item>
@@ -171,7 +171,7 @@
                   <el-radio :label="2">不允许退票</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="提前退票" prop="backStatusRadio">
+              <el-form-item label="提前退票" v-if="form.backStatus==1" prop="backStatusRadio">
                 <div style="display: flex;align-items: center;">
                   <el-radio-group v-model="form.backStatusRadio" @input="radioInputss">
                     <el-radio label="-1">不限</el-radio>
@@ -301,6 +301,7 @@
 import { 
   getTableDeatilsByIdApi,
   updateTableApi,
+  delTableParamsApi,
   addTableApi
  } from '@/api/CURD'
 
@@ -322,6 +323,7 @@ export default {
         list: '/merchant/merchantPerformAuditorium/merchantGoodsList',// 规格列表
         edit: '/merchant/merchantPerformAuditorium/saveMerchantGoods', // 编辑地址
         updateStatusById: '/goods/goods/updateStatus',
+        delect: '/merchant/merchantPerformAuditorium/deleteMerchantGoods',
       },
       performId: null,
       form: {
@@ -339,7 +341,7 @@ export default {
         useExpireDateTime: [{ required: false, message: "请选择时间", trigger: ["change","blur"] }],
 
         salePrice: [{ required: true, message: "请输入小程序价格", trigger: ["change","blur"] }],
-        originalPrice: [{ required: true, message: "请输入规划价格", trigger: ["change","blur"] }],
+        originalPrice: [{ required: true, message: "请输入划线价格", trigger: ["change","blur"] }],
         
         isAuth: [{ required: true, message: "请选择实名购票", trigger: ["change","blur"] }],
         oneMany: [{ required: true, message: "请选择实名要求", trigger: ["change","blur"] }],
@@ -426,13 +428,17 @@ export default {
             obj['useExpireDateRadio'] = '1'
           }else {
             let sss = JSON.parse(res.data.useExpireDate)
-            if(sss.type==2){
+            obj['useExpireDateRadio'] = sss.type
+            if(sss.type==1) {
+              obj['useExpireDateRadio'] = '1'
+            }else if(sss.type==2){
               obj['useExpireDateRadio'] = '2'
               obj['useExpireDateDay'] = sss.value
             }else if(sss.type==3) {
               obj['useExpireDateRadio'] = '3'
               obj['useExpireDateTime'] = sss.value.split('~')
             }
+            
           }
           if(res.data.goodsPerformRefundRule) {
             obj['backStatusDay'] = res.data.goodsPerformRefundRule.days
@@ -459,21 +465,25 @@ export default {
           }else {
             obj['areaRadio'] = "-1"
           }
-
+          this.radioInput('dayType',obj.dayTypeRadio)
+          this.radioInputs(obj.useExpireDateRadio)
+          this.radioInputss(obj.backStatusRadio)
+          this.radioInputsss(obj.ageRadio)
+          this.radioInput('area',obj.areaRadio)
           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.$set(this,'form',{})
         }
         this.loading = false
       } catch (error) {
         console.error('获取详情失败!!!!',error)
         this.formStatus = 2
         this.loading = false
-        this.open = false;
+        this.$set(this,'form',{})
       }
     },
     /**
@@ -512,7 +522,7 @@ export default {
      * @returns {any}
      */
      openAttraction(row) {
-      this.$modal.confirm(`是否确认${row.status == 1 ? '上架' : '下架'} ${row.goodsName}点位吗？`).then( () => {
+      this.$modal.confirm(`是否确认${row.status == 1 ? '上架' : '下架'} ${row.goodsName}吗？`).then( () => {
         return getTableDeatilsByIdApi(this.configUrl.updateStatusById,{
           id: row.goodsId,
           status: row.status == 1 ? 0 : 1
@@ -668,7 +678,21 @@ export default {
         this.rules.ageMin[0].required = true
         this.rules.ageMax[0].required = true
       }
-    }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+        const ids = row.goodsId || this.ids;
+        this.$modal.confirm('是否确认删除数据项？').then( () => {
+          return delTableParamsApi(this.configUrl.delect,{
+            goodsId: ids
+          });
+        }).then(() => {
+          this.getTableListFun({performId:this.performId})
+          this.$modal.msgSuccess("删除成功");
+        }).catch((e) => {
+          console.error("删除失败====",e)
+        });
+      },
   },
 };
 </script>

src/views/tourism/productManagement/scenicAreaTickets.vue

@@ -96,13 +96,14 @@
       return {
         title: "景区门票",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-          release: ['system:user:release']
+          add: ['productManagement:scenicAreaTickets:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: ['productManagement:scenicAreaTickets:delect'], // 删除权限
+          editBase: ['productManagement:scenicAreaTickets:editBase'], // 编辑基本信息权限
+          editGuige: ['productManagement:scenicAreaTickets:editGuige'], // 编辑规格信息权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          release: ['']
         },
         configUrl: {
           list: '/merchant/merchantPerformAuditorium/merchantPerformList', // 列表地址
@@ -208,7 +209,7 @@
       },
       /** 删除按钮操作 */
       handleDelete(row) {
-        const ids = row.id || this.ids;
+        const ids = row.performId || this.ids;
         this.$modal.confirm('是否确认删除数据项？').then( () => {
           return delTableParamsApi(this.configUrl.delect,{
             id: ids

src/views/tourism/routeManagementAll/formBox/routeManagementForm.vue

@@ -388,10 +388,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 1MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },
@@ -411,10 +411,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 1MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/routeManagementAll/routeManagement.vue

@@ -136,12 +136,12 @@
       return {
         title: "路线管理",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
+          add: ['routeManagementAll:routeManagement:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: ['routeManagementAll:routeManagement:delect'], // 删除权限
+          edit: ['routeManagementAll:routeManagement:edit'], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
         },
         configUrl: {
           list: '/merchant/merchantTourRoute/pageList', // 列表地址

src/views/tourism/scenicAreaManagement/contentManagement/attractionInfoManagement.vue

@@ -143,12 +143,12 @@
       return {
         title: "景点管理",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
+          add: ['contentManagement:attractionInfoManagement:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: ['contentManagement:attractionInfoManagement:delect'], // 删除权限
+          edit: ['contentManagement:attractionInfoManagement:edit'], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
         },
         configUrl: {
           list: '/merchant/merchantPoints/pageList', // 列表地址

src/views/tourism/scenicAreaManagement/contentManagement/carouselAdvertis.vue

@@ -163,13 +163,13 @@ export default {
     return {
       title: "轮播广告",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
-        release: ['system:user:release']
+        add: ['contentManagement:carouselAdvertis:add'], // 新增权限
+        details: [''], // 详情权限
+        delect: ['contentManagement:carouselAdvertis:delect'], // 删除权限
+        edit: ['contentManagement:carouselAdvertis:edit'], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
+        release: ['contentManagement:carouselAdvertis:release']
       },
       configUrl: {
         list: '/merchant/advList/pageList', // 列表地址

src/views/tourism/scenicAreaManagement/contentManagement/eventNotifications.vue

@@ -160,12 +160,12 @@ export default {
     return {
       title: "活动通知",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
+        add: ['contentManagement:eventNotifications:add'], // 新增权限
+        details: [''], // 详情权限
+        delect: ['contentManagement:eventNotifications:delect'], // 删除权限
+        edit: ['contentManagement:eventNotifications:edit'], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
       },
       configUrl: {
         list: '/merchant/notice/pageList', // 列表地址

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoCultureForm.vue

@@ -282,10 +282,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 1MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },
@@ -305,10 +305,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 1MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoIntroduceForm.vue

@@ -328,10 +328,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 1MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },
@@ -351,10 +351,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 1MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoManagementForm.vue

@@ -305,10 +305,10 @@ export default {
       let typeList = ['png','jepg','jpg']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 1MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/scenicAreaManagement/contentManagement/formBox/carouselAdvertisForm.vue

@@ -256,10 +256,10 @@ export default {
       let typeList = ['png','jepg','jpg']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!');
+        this.$message.error('上传图片图片大小不能超过 2MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/scenicAreaManagement/contentManagement/formBox/tourismStrategyForm.vue

@@ -50,7 +50,7 @@
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
-            <span>建议上传xxx*xxx,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
+            <span>建议上传120x100,支持jpg/png/gif,支持1MB大小以内的图片上传</span>
           </el-form-item>
           <div class="form-title"><span>内容详情</span></div>
           <el-form-item label-width="0" label="" prop="detail">
@@ -239,15 +239,15 @@ export default {
       
     },
     beforeAvatarUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      const isLt2M = file.size / 1024 / 1024 <= 1;
       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} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/scenicAreaManagement/contentManagement/noticeManagement.vue

@@ -114,12 +114,12 @@ export default {
     return {
       title: "须知管理",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
+        add: ['contentManagement:noticeManagement:add'], // 新增权限
+        details: ['contentManagement:noticeManagement:details'], // 详情权限
+        delect: ['contentManagement:noticeManagement:delect'], // 删除权限
+        edit: ['contentManagement:noticeManagement:edit'], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
       },
       configUrl: {
         list: '/merchant/agreementInfo/pageList', // 列表地址

src/views/tourism/scenicAreaManagement/contentManagement/questions.vue

@@ -111,12 +111,12 @@ export default {
     return {
       title: "常见问题",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
+        add: ['contentManagement:questions:add'], // 新增权限
+        details: [''], // 详情权限
+        delect: ['contentManagement:questions:delect'], // 删除权限
+        edit: ['contentManagement:questions:edit'], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
       },
       configUrl: {
         list: '/system/question/pageList', // 列表地址

src/views/tourism/scenicAreaManagement/contentManagement/suggestions.vue

@@ -4,10 +4,10 @@
       <!--用户数据-->
       <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="用户昵称" prop="memberNickName">
+          <el-form-item label="用户名称" prop="memberNickName">
             <el-input
               v-model="queryParams.memberNickName"
-              placeholder="请输入用户昵称"
+              placeholder="请输入用户名称"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -33,7 +33,7 @@
         </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="memberNickName" prop="memberNickName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户名称" align="center" key="memberNickName" prop="memberNickName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
           <el-table-column label="类型" align="center" key="type" prop="type" v-if="columns[1].visible" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tourism_suggestions_type" :value="scope.row.type"/>
@@ -68,12 +68,12 @@ export default {
     return {
       title: "投诉建议",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
+        add: [''], // 新增权限
+        details: [''], // 详情权限
+        delect: [''], // 删除权限
+        edit: [''], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
       },
       configUrl: {
         list: '/merchant/memberSuggestion/pageList', // 列表地址
@@ -104,7 +104,7 @@ export default {
       dateRange: [],
       // 控制列表是否显示
       columns: [
-        { key: 0, label: `用户昵称`, visible: true },
+        { key: 0, label: `用户名称`, visible: true },
         { key: 2, label: `类型`, visible: true },
         { key: 3, label: `留言内容`, visible: true },
         { key: 4, label: `留言时间`, visible: true },

src/views/tourism/scenicAreaManagement/contentManagement/tabelBox/attractionInfoBeas.vue

@@ -73,6 +73,7 @@
                 element-loading-text="提交中..."
                 element-loading-spinner="el-icon-loading"
                 element-loading-background="rgba(0, 0, 0, 0.8)"
+                v-hasPermi="configPermi.save"
             > 
                 {{ loading ? '提交中...' : '保存' }}
             </el-button>
@@ -96,13 +97,7 @@ export default {
         loading: false,
         loadingText: "拼命加载数据中...",
         configPermi: {
-            add: ['system:user:edit'], // 新增权限
-            details: ['system:user:details'], // 详情权限
-            delect: ['system:user:remove'], // 删除权限
-            edit: ['system:user:edit'], // 编辑权限http://localhost/scenicAreaManagement/contentManagement/scenicAreaManagement/contentManagement/questions
-            upload: ['system:user:upload'],// 导入权限
-            export: ['system:user:export'],// 导出权限http://localhost/scenicAreaManagement/contentManagement/scenicAreaManagement/contentManagement/suggestions
-            release: ['system:user:release']
+            save: ['contentManagement:attractionInfoBeas:save'], // 保存
         },
         configUrl: {
             details: '/merchant/merchantInfo/getMerchantInfo', // 详情地址

src/views/tourism/scenicAreaManagement/contentManagement/tabelBox/attractionInfoCulture.vue

@@ -149,13 +149,13 @@
       return {
         title: "景区文化",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-          release: ['system:user:release']
+          add: ['contentManagement:attractionInfoCulture:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: ['contentManagement:attractionInfoCulture:delect'], // 删除权限
+          edit: ['contentManagement:attractionInfoCulture:edit'], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          release: ['contentManagement:attractionInfoCulture:release']
         },
         configUrl: {
           list: '/merchant/merchantDetail/pageList', // 列表地址

src/views/tourism/scenicAreaManagement/contentManagement/tabelBox/attractionInfoIntroduce.vue

@@ -149,13 +149,13 @@
       return {
         title: "景区介绍",// 通用标题
         configPermi: {
-          add: ['system:user:edit'], // 新增权限
-          details: ['system:user:details'], // 详情权限
-          delect: ['system:user:remove'], // 删除权限
-          edit: ['system:user:edit'], // 编辑权限
-          upload: ['system:user:upload'],// 导入权限
-          export: ['system:user:export'],// 导出权限
-          release: ['system:user:release']
+          add: ['contentManagement:attractionInfoIntroduce:add'], // 新增权限
+          details: [''], // 详情权限
+          delect: [''], // 删除权限
+          edit: ['contentManagement:attractionInfoIntroduce:edit'], // 编辑权限
+          upload: [''],// 导入权限
+          export: [''],// 导出权限
+          release: ['contentManagement:attractionInfoIntroduce:release']
         },
         configUrl: {
           list: '/merchant/merchantDetail/pageList', // 列表地址

src/views/tourism/scenicAreaManagement/contentManagement/tourismStrategy.vue

@@ -135,13 +135,13 @@ export default {
     return {
       title: "旅游攻略",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
-        release: ['system:user:release']
+        add: ['contentManagement:tourismStrategy:add'], // 新增权限
+        details: [''], // 详情权限
+        delect: ['contentManagement:tourismStrategy:delect'], // 删除权限
+        edit: ['contentManagement:tourismStrategy:edit'], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
+        release: ['']
       },
       configUrl: {
         list: '/merchant/merchantIntroduction/pageList', // 列表地址

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

@@ -281,10 +281,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!');
+        this.$message.error('上传图片图片大小不能超过 2MB!');
       }
 
       let isSize = new Promise(function (resolve, reject) {
@@ -330,10 +330,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!');
+        this.$message.error('上传图片图片大小不能超过 2MB!');
       }
 
       let isSize = new Promise(function (resolve, reject) {

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

@@ -26,36 +26,54 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="点位图标">
-          <div
-          style="width: 120px;"
-          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"
-              accept=".jpg, .png, jpeg"
-              :on-success="handleAvatarSuccess"
-              :on-progress="handleAvatarProgress"
-              :before-upload="beforeAvatarUpload"
-              :disabled="actionUrlLoading"
-              :on-error="handleAvatarError"
-              >
-              <img v-if="form.imgUrl" style="width: 100px;height: 100px;background-color: rgba(211,211,211,0.6);" :src="form.imgUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </div>
-          <span>建议尺寸40*40,支持jpg,png,gif,支持1MB大小以内的图片上传</span>
+        <el-form-item label="营业时间：" prop="workTime">
+          <el-input style="width: 350px;" v-model="form.workTime" placeholder="请输入营业时间" />
         </el-form-item>
+        <el-form-item label="点位图片" prop="imgUrl">
+            <div style="display: flex;">
+              <div 
+              v-for="(item,index) in form.imgUrl" 
+              :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.imgUrl">
+                </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.imgUrl||form.imgUrl.length<5"
+              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>建议尺寸40*40,支持jpg,png,gif,支持1MB大小以内的图片上传</span>
+          </el-form-item>
         <el-form-item label="点位信息：">
-          <el-input style="width: 350px;" v-model="form.remark" type="textarea" placeholder="请输入点位信息" maxlength="200" show-word-limit />
+          <el-input :rows="4"  v-model="form.remark" type="textarea" placeholder="请输入点位信息" maxlength="500" show-word-limit />
         </el-form-item>
         <el-form-item label="地图定位：">
           <div style="display: flex;">
@@ -125,6 +143,7 @@ export default {
         longitude: [{ required: true, message: "请输入经度", trigger: ["change","blur"] }],
         latitude: [{ required: true, message: "请输入纬度", trigger: ["change","blur"] }],
         content: [{ required: true, message: "请输入开放状态", trigger: ["change","blur"] }],
+        workTime: [{ required: true, message: "请输入营业时间", trigger: ["change","blur"] }],
       },
       pointTypeList: [],// 景点产品关联
       //  上传文件
@@ -158,7 +177,7 @@ export default {
       }else if(model=='EDIT') { // 新增
         let obj = {
           ...row,
-          openDate: row.openDate?row.openDate.join('~') : null
+          imgUrl: row.imgUrl?row.imgUrl.split(','):[]
         }
         this.$set(this,'form',obj)
         this.formStatus = 1
@@ -189,7 +208,8 @@ export default {
         let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
           let obj = {
-            ...res.data
+            ...res.data,
+            imgUrl: res.data.imgUrl?res.data.imgUrl.split(','):[]
           }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
@@ -231,7 +251,8 @@ export default {
           if (this.model != 'ADD') {
             addTableApi(
               this.configUrl.edit,{
-                ...this.form
+                ...this.form,
+                imgUrl: this.form.imgUrl ? this.form.imgUrl.join(','):'',
               }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.loading = false
@@ -243,7 +264,8 @@ export default {
             })
           } else {
             addTableApi(this.configUrl.edit,{
-                ...this.form
+                ...this.form,
+                imgUrl: this.form.imgUrl ? this.form.imgUrl.join(','):'',
               }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.loading = false
@@ -295,16 +317,16 @@ export default {
       this.$set(this.form,'longitude',params.lng)
       this.$set(this.form,'latitude',params.lat)
     },
+    handleRemove(index) {
+      this.form.imgUrl.splice(index,1)
+    },
     /**  上传图片  */
-    handleAvatarSuccess(res, file) {
-      console.log("res, file",res, file)
+    handleAvatarSuccess(response, file, fileList) {
+      console.log("res, file",response, file, fileList)
       this.actionUrlLoading = false
-      if(res.code != 200) {
-        this.$set(this.form,'imgUrl',null) 
-      }else {
-        this.$set(this.form,'imgUrl',res.data.url) 
+      if(response.code == 200) {
+        this.form.imgUrl.push(response.data.url)
       }
-      
     },
     beforeAvatarUpload(file) {
       const isLt2M = file.size / 1024 / 1024 <= 1;
@@ -312,10 +334,10 @@ export default {
       let typeList = ['png','jepg','jpg','gif']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!');
+        this.$message.error('上传图片图片大小不能超过 2MB!');
       }
 
       let isSize = new Promise(function (resolve, reject) {

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

@@ -264,10 +264,10 @@ export default {
       let typeList = ['png','jepg','jpg']
       const isJPG = typeList.includes(testmsg);
       if (!isJPG) {
-        this.$message.error(`上传头像图片只能是 ${typeList} 格式!`);
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!');
+        this.$message.error('上传图片图片大小不能超过 2MB!');
       }
       return isJPG && isLt2M;
     },

src/views/tourism/scenicAreaManagement/navigationManagement/pointType.vue

@@ -130,13 +130,13 @@ export default {
     return {
       title: "点位类型",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
-        release: ['system:user:release']
+        add: ['navigationManagement:pointType:add'], // 新增权限
+        details: [''], // 详情权限
+        delect: ['navigationManagement:pointType:delect'], // 删除权限
+        edit: ['navigationManagement:pointType:edit'], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
+        release: ['']
       },
       configUrl: {
         list: '/merchant/merchantMapMarkType/list', // 列表地址

src/views/tourism/scenicAreaManagement/navigationManagement/scenicGuide.vue

@@ -131,13 +131,13 @@ export default {
     return {
       title: "景区导览",// 通用标题
       configPermi: {
-        add: ['system:user:edit'], // 新增权限
-        details: ['system:user:details'], // 详情权限
-        delect: ['system:user:remove'], // 删除权限
-        edit: ['system:user:edit'], // 编辑权限
-        upload: ['system:user:upload'],// 导入权限
-        export: ['system:user:export'],// 导出权限
-        distance: ['system:user:distance'] // 设置打卡距离
+        add: ['navigationManagement:scenicGuide:add'], // 新增权限
+        details: [''], // 详情权限
+        delect: ['navigationManagement:scenicGuide:delect'], // 删除权限
+        edit: ['navigationManagement:scenicGuide:edit'], // 编辑权限
+        upload: [''],// 导入权限
+        export: [''],// 导出权限
+        distance: ['navigationManagement:scenicGuide:distance'] // 设置打卡距离
       },
       configUrl: {
         list: '/merchant/merchantMapMark/pageList', // 列表地址