fix: 修改选择商户

src/api/merchant-auth.js

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2020-07-24 12:19:48
  * @LastEditors: 无尘
- * @LastEditTime: 2020-09-09 14:18:39
+ * @LastEditTime: 2020-09-11 16:26:02
  */
 import getFetch from './get-fetch.js';
 
@@ -20,7 +20,14 @@ let api = {
     useFormData: true,
     useIntercept: false
   },
-  checkName: '/gic-name-validate', // 校验名字
+  getCheckName: '/gic-admin-frist', // 获取名字
+  checkName: {
+    // 校验名字
+    url: '/gic-name-validate',
+    method: 'post',
+    useFormData: true,
+    useIntercept: false
+  },
   getAuditLogDetail: '/enterprise-auth-audit-range-detail', // 获取审核日志变更详情
   getEnterprise: '/enterprise-search', // 获取商户(新增授权第一步)
   getGicAdmin: '/gic-manage-list', // 切换商户 获取审核员列表

src/components/app/app-detail-left.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2019-03-20 14:36:37
  * @LastEditors: 无尘
- * @LastEditTime: 2020-09-11 14:46:52
+ * @LastEditTime: 2020-09-11 16:19:07
  -->
 <!--
   应用公共左侧菜单：
@@ -79,18 +79,12 @@ export default {
   },
   methods: {
     /**
-     * 路由跳转
-     */
-    returnBack() {
-      const that = this;
-      that.$router.push('appcenter');
-    },
-    /**
      * 选择后触发方法，返回 menuUrl
      * @param {Object} item
      * @param {Boolean} flag
      * @param {Number} index
      * @returns {Boolean}
+     * @author: 无尘
      */
     selectTab(item, flag, index) {
       const that = this;

src/components/app/common-detail-top.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2019-03-20 14:36:37
  * @LastEditors: 无尘
- * @LastEditTime: 2020-08-18 18:25:32
+ * @LastEditTime: 2020-09-11 16:19:31
  -->
 <!--
   应用公共头部：
@@ -58,21 +58,14 @@ export default {
   },
   methods: {
     /**
-     * 路由跳转
+     * @description: 路由跳转
      * @param {String} route
+     * @author: 无尘
      */
     changeRoute(route) {
       if (!!route) {
         this.$router.push(route);
       }
-    },
-
-    /**
-     * 返回
-     */
-    returnBack() {
-      let that = this;
-      that.$router.push('appcenter');
     }
   },
   watch: {

src/components/common/gic-select-group-mult.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2020-02-08 10:27:21
  * @LastEditors: 无尘
- * @LastEditTime: 2020-09-09 15:30:37
+ * @LastEditTime: 2020-09-11 16:20:11
  -->
 <!--
   选择门店分组组件：
@@ -124,7 +124,6 @@ export default {
      * @author: 无尘
      */
     async loadNode(node, resolve) {
-      // console.log(node, resolve);
       const that = this;
       if (node.level === 0) {
         return resolve(that.getGroup());

src/components/common/gic-select-store.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2020-02-08 10:27:21
  * @LastEditors: 无尘
- * @LastEditTime: 2020-09-09 15:32:45
+ * @LastEditTime: 2020-09-11 16:21:36
  -->
 <!--
   选择门店分组组件：
@@ -126,7 +126,6 @@ export default {
       that.isIndeterminate = checkedCount > 0 && checkedCount < that.stores.length;
       that.$emit('returnStores', that.dailyRuleForm.stores);
     },
-
     /**
      * @description: 输入
      * @param {Object} e
@@ -141,7 +140,6 @@ export default {
         that.getStoreData();
       }
     }, 500),
-
     /**
      * @description: 选择门店
      * @param {Object} item
@@ -163,7 +161,6 @@ export default {
         }
       });
     },
-
     /**
      * @description: 清空
      * @author: 无尘
@@ -175,7 +172,6 @@ export default {
       that.getStoreData();
       // that.stores = JSON.parse(JSON.stringify(that.storesCopy));
     },
-
     /**
      * @description: 获取门店
      * @author: 无尘

src/components/company/check-name-dialog.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2020-08-31 16:11:50
  * @LastEditors: 无尘
- * @LastEditTime: 2020-09-10 13:49:14
+ * @LastEditTime: 2020-09-11 16:31:28
 -->
 <!--
   <check-name-dialog :sync-data="syncData" @closeSet="closeSet"></check-name-dialog>
@@ -16,7 +16,7 @@
       <div class="font-14 color-606266 m-b-10">首次授权商户需要校验GIC商户超级管理员姓名</div>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" >
         <el-form-item label="超级管理员" prop="name">
-          <span></span><el-input v-model="ruleForm.name" placeholder="输入姓名校验"></el-input>
+          <span>{{firstName}}</span><el-input v-model="ruleForm.name" placeholder="输入姓名校验"></el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -30,7 +30,7 @@
 import { _debounce } from '@/common/js/public';
 import fetch from '@/api/merchant-auth.js';
 import showMsg from '@/common/js/showmsg';
-const { checkName } = fetch;
+const { getCheckName, checkName } = fetch;
 export default {
   name: 'CheckNameDialog',
   props: {
@@ -47,6 +47,7 @@ export default {
     return {
       dialogVisible: true,
       loading: false,
+      firstName: '',
       ruleForm: {
         name: ''
       },
@@ -57,8 +58,28 @@ export default {
       }
     };
   },
+  mounted() {
+    const that = this;
+    that.getCheckNameData();
+  },
   methods: {
     /**
+     * @description: 获取名字
+     * @author: 无尘
+     */
+    getCheckNameData() {
+      const that = this;
+      const params = {
+        enterpriseId: that.syncData.enterpriseId
+      };
+      getCheckName(params)
+        .then(res => {
+          that.firstName = res.result || '';
+        })
+        .catch(function(error) {
+        });
+    },
+    /**
      * @description: 关闭弹窗
      * @author: 无尘
      */

src/views/business/new-auth-merchant.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2019-03-20 14:36:37
  * @LastEditors: 无尘
- * @LastEditTime: 2020-09-10 15:54:53
+ * @LastEditTime: 2020-09-11 16:36:02
  -->
 <template>
   <div class="my-customer-wrap common-set-wrap">
@@ -203,6 +203,15 @@ export default {
       if (res == 'close') {
         return false;
       }
+      that.authForm.enterpriseId = that.syncData.enterpriseId;
+      that.authForm.enterpriseName = that.syncData.enterpriseName;
+      that.$refs['authForm'].validate(valid => {
+        if (valid) {
+          return;
+        } else {
+          return false;
+        }
+      });
     },
     /**
      * @description: closeSet
@@ -347,21 +356,14 @@ export default {
     getAdmin(item) {
       const that = this;
       that.syncData = item; // 显示检验姓名弹窗
-      // that.checkShow = true;
-      that.authForm.enterpriseId = item.enterpriseId;
-      that.authForm.enterpriseName = item.enterpriseName;
+      that.checkShow = true;
+      that.authForm.enterpriseId = '';
+      that.authForm.enterpriseName = '';
       that.authForm.bindRange = [];
       that.authForm.shareRange = [];
       that.authForm.shareStoreMode = '';
       that.authForm.bindStoreMode = '';
       that.adminList = [];
-      that.$refs['authForm'].validate(valid => {
-        if (valid) {
-          return;
-        } else {
-          return false;
-        }
-      });
       that.getAdminList(item.enterpriseId);
     },
     getAdminList(val) {