更新

src/layout/login/webLogin.vue

@@ -2,29 +2,10 @@
   <div id="webLogin">
     <el-row class="loginMains">
       <el-col :span="24" class="top">
-        <el-col :span="4" class="info"></el-col>
-        <el-col :span="14" class="context">
+        <el-col :span="6" class="info"></el-col>
+        <el-col :span="12" class="context">
           <el-tabs v-model="activeName">
-            <el-tab-pane label="管理登录" name="first">
-              <el-col :span="24">
-                <el-form :model="adminForm" label-width="120px">
-                  <el-form-item label="房间号&手机号">
-                    <el-input v-model="adminForm.room_phone" placeholder="请输入用户/手机号" :minlength="11" :maxlength="11"></el-input>
-                  </el-form-item>
-                  <el-form-item label="登录密码">
-                    <el-input v-model="adminForm.passwd" placeholder="请输入登录密码" show-password></el-input>
-                  </el-form-item>
-                  <el-form-item label="用户类别">
-                    <el-radio-group v-model="adminForm.role">
-                      <el-radio label="3">管理用户 </el-radio>
-                      <el-radio label="8">VIP用户</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                  <el-col :span="24" class="loginSubmit"><el-button type="primary" @click="adminSubmit">登录</el-button></el-col>
-                </el-form>
-              </el-col>
-            </el-tab-pane>
-            <el-tab-pane label="个人登录" name="second">
+            <el-tab-pane label="个人登录" name="first">
               <el-col :span="24">
                 <el-form ref="form" :model="form" label-width="120px">
                   <el-form-item
@@ -274,10 +255,6 @@ export default {
   },
   created() {},
   methods: {
-    // 管理登录
-    adminSubmit() {
-      this.$emit('adminSubmit', this.adminform);
-    },
     // 用户登录
     loginSubmit() {
       this.$emit('submitDate', this.form);
@@ -343,7 +320,7 @@ export default {
   background-color: transparent;
 }
 /deep/.el-tabs__nav {
-  margin: 0 130px;
+  margin: 0 265px;
 }
 /deep/.el-tabs__item {
   padding: 0 60px;

src/router/index.js

@@ -20,6 +20,13 @@ const live = [
         meta: { title: '管理登陆' },
         component: () => import('../views/adminLogin.vue'),
       },
+      // 展会登录
+      {
+        path: '/dockLogin',
+        meta: { title: '展会管理登录' },
+        component: () => import('../views/dockLogin.vue'),
+      },
+
       // 信息详情
       {
         path: '/live/detail',

src/views/adminLogin.vue

@@ -16,8 +16,8 @@
                 <el-input v-model="form.passwd" placeholder="请输入登录密码" show-password></el-input>
               </el-form-item>
               <el-form-item label="用户类别" prop="role">
-                <el-radio v-model="form.role" label="0">管理员</el-radio>
                 <el-radio v-model="form.role" label="1">合作机构&业务管理员</el-radio>
+                <!-- <el-radio v-model="form.role" label="1">业务管理员</el-radio> -->
               </el-form-item>
               <el-col :span="24" class="btn">
                 <el-button type="primary" @click="onSubmit">登录</el-button>
@@ -52,9 +52,18 @@ export default {
   methods: {
     ...login({ toLogin: 'login' }),
     async onSubmit() {
-      const res = await this.toLogin({ user: this.form });
-      if (res.uid) {
-        history.back();
+      if (this.form.role == null) {
+        let data = this.form;
+        data.role = '0';
+        const res = await this.toLogin({ user: data });
+        if (res.uid) {
+          history.back();
+        }
+      } else {
+        const res = await this.toLogin({ user: this.form });
+        if (res.uid) {
+          history.back();
+        }
       }
     },
   },

src/views/dockLogin.vue

@@ -0,0 +1,101 @@
+<template>
+  <div id="dockLogin">
+    <el-row>
+      <el-col :span="24">
+        <el-col :span="5" class="info"> </el-col>
+        <el-col :span="13" class="login">
+          <el-col :span="24" class="title">
+            管理登录
+          </el-col>
+          <el-col :span="24" class="form">
+            <el-form :model="form" label-width="120px">
+              <el-form-item label="房间号&手机号">
+                <el-input v-model="form.room_phone" placeholder="请输入用户/手机号" :minlength="11" :maxlength="11"></el-input>
+              </el-form-item>
+              <el-form-item label="登录密码">
+                <el-input v-model="form.passwd" placeholder="请输入登录密码" show-password></el-input>
+              </el-form-item>
+              <el-form-item label="用户类别">
+                <el-radio-group v-model="form.role">
+                  <el-radio label="3">管理用户 </el-radio>
+                  <el-radio label="8">VIP用户</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-col :span="24" class="loginSubmit"><el-button type="primary" @click="adminSubmit">登录</el-button></el-col>
+            </el-form>
+          </el-col>
+        </el-col>
+        <el-col :span="6" class="info"> </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: login } = createNamespacedHelpers('login');
+const { mapActions: dockLogin } = createNamespacedHelpers('dockLogin');
+export default {
+  name: 'dockLogin',
+  props: {},
+  components: {},
+  data: function() {
+    return {
+      form: {},
+    };
+  },
+  created() {},
+  methods: {
+    ...login({ toLogin: 'login' }),
+    ...dockLogin({ todockLogin: 'login' }),
+    async adminSubmit() {
+      if (this.form.role == '3') {
+        let res = await this.todockLogin({ user: this.form });
+        if (res.uid) {
+          history.back();
+        }
+      } else if (this.form.role == '8') {
+        let data = {};
+        data.phone = this.form.room_phone;
+        data.passwd = this.form.passwd;
+        data.role = this.form.role;
+        let res = await this.toLogin({ user: data });
+        if (res.uid) {
+          history.back();
+        }
+      }
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.info {
+  height: 800px;
+}
+.login {
+  padding: 15px 0;
+  .title {
+    text-align: center;
+    font-size: 40px;
+    padding: 40px 0;
+  }
+  .form {
+    .btn {
+      text-align: center;
+    }
+  }
+}
+.loginSubmit {
+  text-align: center;
+}
+</style>

src/views/hallList/parts/list.vue

@@ -4,13 +4,10 @@
       <p>
         <span class="textOver" @click="turnTo(item)">{{ item.title }}</span>
         <span class="textOver">
-          <el-link :underline="false" @click="linkBtn(item.id)" target="_blank" class="duijie" v-if="status == '1'">
-            <!--  v-if="canIn(item)" -->
-            进入对接会
-          </el-link>
+          <el-link :underline="false" class="duijie" @click="$router.push({ path: '/dockLogin' })"> 管理进入 </el-link>
+          <el-link :underline="false" @click="linkBtn(item.id)" target="_blank" class="duijie" v-if="status == '1'">进入对接会</el-link>
           <el-link :underline="false" @click="apply(item.id)" class="duijie" v-if="status == '0' && user.uid != undefined"> 申请对接会 </el-link>
-          <el-link :underline="false" @click="check(item.id)" class="duijie" v-if="status == '2'"> 查看成果 </el-link>
-          <!-- v-if="canJoin(item)" -->
+          <el-link :underline="false" @click="check(item.id)" class="duijie" v-if="status == '2' && user.role == '3'"> 查看成果 </el-link>
         </span>
       </p>
     </el-col>

src/views/webLogin.vue

@@ -1,13 +1,6 @@
 <template>
   <div id="webLogin">
-    <login-detail
-      :form="form"
-      @submitDate="submitnewLogin"
-      :adminForm="adminForm"
-      @adminSubmit="adminSubmit"
-      :forms="forms"
-      @submitDates="submitRegisters"
-    ></login-detail>
+    <login-detail :form="form" @submitDate="submitnewLogin" :forms="forms" @submitDates="submitRegisters"></login-detail>
   </div>
 </template>
 
@@ -17,7 +10,6 @@ import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapMarket } = createNamespacedHelpers('market');
 const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 const { mapActions: login } = createNamespacedHelpers('login');
-const { mapActions: dockLogin } = createNamespacedHelpers('dockLogin');
 
 expertsuser;
 export default {
@@ -26,8 +18,6 @@ export default {
   components: { loginDetail },
   data: () => {
     return {
-      // 管理登录
-      adminForm: {},
       // 个人
       form: {
         role: '7',
@@ -42,26 +32,7 @@ export default {
   methods: {
     ...mapMarket({ userFetch: 'fetch', userCreate: 'create', userUpdate: 'update' }),
     ...login({ toLogin: 'login' }),
-    ...dockLogin({ todockLogin: 'login' }),
     ...expertsuser({ expertsuserCreate: 'create' }),
-    // 管理登录
-    async adminSubmit() {
-      if (this.adminForm.role == '3') {
-        let res = await this.todockLogin({ user: this.adminForm });
-        if (res.uid) {
-          history.back();
-        }
-      } else if (this.adminForm.role == '8') {
-        let data = {};
-        data.phone = this.adminForm.room_phone;
-        data.passwd = this.adminForm.passwd;
-        data.role = this.adminForm.role;
-        let res = await this.toLogin({ user: data });
-        if (res.uid) {
-          history.back();
-        }
-      }
-    },
     // 用户登录
     async submitnewLogin(form) {
       let res = await this.toLogin({ user: form });