1. 修改卡管理

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

@@ -136,10 +136,10 @@
     <!--  新增或修改  -->
     <addAndEdit ref="addAndEdit" @refresh="getList" />
     <!--  详情 -->
-    <detailsBox ref="detailsBox" />
+    <detailsBox ref="detailsBox" @refresh="getList" />
 
     <!--  详情 -->
-    <useList ref="useList" />
+    <useList ref="useList" @refresh="getList"/>
   </div>
 </template>
 

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

@@ -30,7 +30,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="持卡人：" prop="memberId">
+          <!-- <el-form-item label="持卡人：" prop="memberId">
             <el-select style="width: 100%;" v-model="form.memberId" @change="selectUser" clearable placeholder="请选择持卡人">
               <el-option
                 v-for="dict in tableUseList"
@@ -42,7 +42,7 @@
           </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> -->
           <el-form-item label="手机号：" prop="mobile">
             <div style="display: flex;">
               <el-input v-model="form.mobile" controls-position="right" placeholder="请输入手机号"></el-input>
@@ -52,7 +52,7 @@
           <el-form-item label="短信验证码：" prop="code">
             <el-input v-model="form.code" controls-position="right" placeholder="请输入短信验证码"></el-input>
           </el-form-item>
-          <div class="form-title"><span>验证信息</span></div>
+          <!-- <div class="form-title"><span>验证信息</span></div>
           <el-form-item label="人脸图片：" prop="ocrPic">
             <div style="display: flex;">
               <div 
@@ -95,7 +95,7 @@
               
             </div>
             <span>支持jpg、png,支持5MB大小以内的图片上传</span>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
       </div>
     </div>
@@ -171,7 +171,7 @@ export default {
   },
   created() {
     this.getList()
-    this.getUseList()
+    //this.getUseList()
   },
   methods: {
     /** 查询体卡类型列表 */
@@ -269,18 +269,18 @@ export default {
           this.loadingText = "提交数据中..."
           this.loading = true
           try {
-            let resCode = await addTableApi(
-              this.configUrl.merchantRealAuth,
-              this.addDateRange({
-                idCard: this.form.idcard,
-                userName: this.form.userName,
-            }))
-            if(resCode.code == 200) {
+            // let resCode = await addTableApi(
+            //   this.configUrl.merchantRealAuth,
+            //   this.addDateRange({
+            //     idCard: this.form.idcard,
+            //     userName: this.form.userName,
+            // }))
+            // if(resCode.code == 200) {
 
-            }else {
-              this.$message.error("身份证信息错误!!!");
-              return
-            }
+            // }else {
+            //   this.$message.error("身份证信息错误!!!");
+            //   return
+            // }
             if (this.model != 'ADD') {
               let res = await addTableApi(this.configUrl.edit,{
                 ...this.form,

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

@@ -53,9 +53,8 @@
               placeholder="选择到期时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="核销密码：" prop="checkPassword">
-            <span v-if="model !== 'ADD'"></span>
-            <el-input v-else v-model="form.checkPassword" controls-position="right" placeholder="请输入核销密码"></el-input>
+          <el-form-item v-if="model == 'ADD'" label="核销密码：" prop="checkPassword">
+            <el-input v-model="form.checkPassword" controls-position="right" placeholder="请输入核销密码"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -152,6 +151,7 @@ export default {
         if(res.code == 200) {
           let obj = {
             ...res.data,
+            cardType: res.data.cardType ? res.data.cardType.toString() : ''
         }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
@@ -184,12 +184,12 @@ export default {
                 ...this.form
             })
             if(res.code == 200) {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess(`${this.form.id?'修改':'新增'}成功`);
               this.loading = false
               this.open = false;
               this.$emit('refresh')
             }else {
-              this.$message.error("修改失败!!!");
+              this.$message.error(`${this.form.id?'修改':'新增'}失败!!!`);
               this.loading = false
             }
           } catch (error) {

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

@@ -44,7 +44,7 @@
             <el-form-item label="卡状态" prop="cardFlag">
               <el-select v-model="queryParams.cardFlag" clearable placeholder="请选择卡状态">
                 <el-option
-                  v-for="dict in dict.type.activate_status"
+                  v-for="dict in dict.type.gift_status"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
@@ -85,7 +85,7 @@
 
             <el-table-column label="状态" align="center" key="cardFlag" prop="cardFlag" v-if="columns[5].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <dict-tag :options="dict.type.activate_status" :value="scope.row.cardFlag"/>
+                <dict-tag :options="dict.type.gift_status" :value="scope.row.cardFlag"/>
               </template>
             </el-table-column>
             <el-table-column label="禁用/启用" align="center" key="status1" prop="status1" v-if="columns[6].visible" :show-overflow-tooltip="true">
@@ -171,7 +171,7 @@
   import checkPassword from "./formBox/checkPassword.vue";
   export default {
     name: "User",
-    dicts: ['activate_status','gift_type'],
+    dicts: ['gift_status','gift_type'],
     components: {addAndEdit,detailsBox,checkPassword},
     data() {
       return {