1. 修复bug

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

@@ -39,11 +39,11 @@
           <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 ? '获取中...' : '获取验证码'  }}</el-button>
+              <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="upIntegral">
-            <el-input v-model="form.upIntegral" controls-position="right" placeholder="请输入短信验证码"></el-input>
+          <el-form-item label="短信验证码：" prop="code">
+            <el-input v-model="form.code" controls-position="right" placeholder="请输入短信验证码"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -89,6 +89,8 @@ export default {
         details: '/merchant/merchantEntitycard/selectById', // 详情地址
         edit: '/merchant/merchantEntitycard/insertOrUpdate', // 编辑地址
         list: '/merchant/merchantEntitycardConfig/pageList', // 实体卡类型
+        codeList: '/merchant/merchantAuth/getVerifyCode', // 获取验证码
+        merchantRealAuth: '/merchant/merchantAuth/merchantRealAuth', // 验证
       },
       form: {
         id: undefined,
@@ -101,7 +103,7 @@ export default {
           { required: true, trigger: ["change","blur"], message: "请输入您的账号" },
           { pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: ["change","blur"] }
         ],
-        upIntegral: [{ required: true, message: "请输入短信验证码", trigger: ["change","blur"] }],
+        code: [{ required: true, message: "请输入短信验证码", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
 
@@ -136,6 +138,7 @@ export default {
       this.actionUrlLoading = false
       this.model = model
       this.formStatus = 0
+      this.phoneCodeLoading = 0
       if(model=='ADD') { // 新增
         this.$set(this,'form',{...row,logo:[]})
         this.formStatus = 1
@@ -188,37 +191,50 @@ export default {
      * @returns {any}
      */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate(async valid => {
         if (valid) {
           this.loadingText = "提交数据中..."
           this.loading = true
-          if (this.model != 'ADD') {
-            addTableApi(
-              this.configUrl.edit,{
-                ...this.form,
-              }).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
-            })
+          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
           }
+          
         }
       });
     },
@@ -245,18 +261,23 @@ export default {
      * 获取验证码
      */
      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
-      listTableApi(
-        this.configUrl.list,
+      addTableApi(
+        this.configUrl.codeList,
         this.addDateRange({
-          pageNum: 1,
-          pageSize: 9999,
+          phone: this.form.phone,
         })).then(response => {
           this.phoneCodeLoading = 2
         }).catch (error=>{
           this.phoneCodeLoading = 0
         }) 
-     }
+     },
   },
 };
 </script>

src/views/tourism/productManagement/scenicAreaTickets.vue

@@ -208,7 +208,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