From 16cd47a9017e8ec6253f43228ff1a8bf3f6e2603 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 27 Nov 2023 15:45:49 +0800
Subject: [PATCH] 2023-11-27

---
 src/permission.js                         | 10 +++++-----
 src/views/component/table.vue             |  2 +-
 src/views/h5/exhibitor/form.vue           |  6 +++---
 src/views/h5/login/component/register.vue |  5 ++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index b6e58c5..457866b 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -20,11 +20,11 @@ router.beforeEach(async(to, from, next) => {
   // determine whether the user has logged in
   const hasToken = !!(getToken() && getToken() !== 'undefined' && getToken() !== 'null')
 
-  if (whiteList.indexOf(to.path) !== -1) {
-    // in the free login whitelist, go directly
-    next()
-    return
-  }
+  // if (whiteList.indexOf(to.path) !== -1) {
+  //   // in the free login whitelist, go directly
+  //   next()
+  //   return
+  // }
 
   if (hasToken) {
     if (to.path === '/login' || to.path === '/h5/login') {
diff --git a/src/views/component/table.vue b/src/views/component/table.vue
index 948505d..4fb6d53 100644
--- a/src/views/component/table.vue
+++ b/src/views/component/table.vue
@@ -619,7 +619,7 @@ export default {
       this.form
         ?.filter((i) => i.list_show)
         .forEach((i) => {
-          if (i._relations) return;
+          //if (i._relations) return;
           let linkOb = {};
 
           if (i.edit_input === "richtext") {
diff --git a/src/views/h5/exhibitor/form.vue b/src/views/h5/exhibitor/form.vue
index b8f611b..6a773c7 100644
--- a/src/views/h5/exhibitor/form.vue
+++ b/src/views/h5/exhibitor/form.vue
@@ -67,7 +67,7 @@
     <Modal
       :fullscreen="fullscreen"
       v-model="modalShow"
-      title="会议选择"
+      title="展会选择"
       @on-ok="modalOk"
     >
       <Table
@@ -110,7 +110,7 @@ export default {
         remark: "",
       },
       formLabel: {
-        meeting_id: "会议",
+        meeting_id: "展会",
         fujian: "附件",
         remark: "备注",
       },
@@ -118,7 +118,7 @@ export default {
         meeting_id: [
           {
             required: true,
-            message: "请选择会议",
+            message: "请选择展会",
             trigger: "change",
           },
         ],
diff --git a/src/views/h5/login/component/register.vue b/src/views/h5/login/component/register.vue
index bdc1092..cdacc9b 100644
--- a/src/views/h5/login/component/register.vue
+++ b/src/views/h5/login/component/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="form">
     <el-form ref="elForm" hide-required-asterisk	 :model="form" :rules="rules" label-position="top" size="small">
-      <el-form-item v-for="(value,key) in form" :prop="key" :label="formLabel[key]">
+      <el-form-item v-if="key !== 'lianxidianhua'" v-for="(value,key) in form" :prop="key" :label="formLabel[key]">
         <el-input v-model="form[key]"
                   clearable
                   :placeholder="'请输入'+formLabel[key]">
@@ -30,14 +30,12 @@ export default {
       form: {
         name: '',
         lianxiren: '',
-        lianxidianhua: '',
         mobile: '',
         code: '',
       },
       formLabel: {
         name: '公司名称',
         lianxiren: '联系人',
-        lianxidianhua: '联系电话',
         mobile: '手机号',
         code: '验证码'
       },
@@ -130,6 +128,7 @@ export default {
       this.$refs['elForm'].validate((res) => {
         if (res) {
           this.isLoading = true;
+          this.form['lianxidianhua'] = this.form.mobile;
 
           register(this.form).then(res => {
             this.isLoading = false;