Merge branch 'master' of http://git.cc-lotus.info/live-platform/live-cms

src/App.vue

@@ -1,6 +1,9 @@
 <template>
   <div id="app">
-    <el-row>
+    <el-row v-if="toLogin()">
+      <router-view />
+    </el-row>
+    <el-row v-else>
       <main-layout></main-layout>
     </el-row>
   </div>
@@ -13,6 +16,13 @@ export default {
     mainLayout,
   },
   data: () => ({}),
+  created() {},
+  methods: {
+    toLogin() {
+      let route = window.location.pathname;
+      return route.includes('login');
+    },
+  },
 };
 </script>
 

src/layout/layout-part/heads.vue

@@ -9,7 +9,15 @@
         <el-col :span="12" class="right">
           <span @click="bindBtn()"><i class="iconfont iconbangding"></i>绑定微信</span>
           <span @click="passwdBtn()"><i class="iconfont iconmima_huaban1"></i>修改密码</span>
-          <span @click="nameBtn()"><i class="iconfont iconicon-person"></i>账号名称</span>
+          <span
+            ><i class="iconfont iconicon-person"></i>
+            <span v-if="user">
+              {{ user.name }}
+            </span>
+            <span v-else>
+              <el-link href="/login" :underline="false" target="_blank">登录</el-link>
+            </span>
+          </span>
           <span @click="logoutBtn()"><i class="iconfont iconiconfront-"></i>退出登录</span>
         </el-col>
       </el-col>
@@ -58,10 +66,6 @@ export default {
     passwdBtn() {
       this.passwdDia = true;
     },
-    // 点击名字
-    nameBtn() {
-      alert('点击名字事件');
-    },
     // 退出登录
     logoutBtn() {
       alert('退出登录');
@@ -126,4 +130,9 @@ export default {
     border-right: 0;
   }
 }
+/deep/.el-link.el-link--default {
+  color: #000;
+  font-size: 16px;
+  top: -2px;
+}
 </style>

src/router/index.js

@@ -62,6 +62,11 @@ const routes = [
     meta: { title: '添加' },
     component: () => import('../views/test/detail.vue'),
   },
+  {
+    path: '/login',
+    meta: { title: '登录' },
+    component: () => import('../views/login.vue'),
+  },
 ];
 
 const router = new VueRouter({

src/views/anchor/detail.vue

@@ -52,10 +52,10 @@ export default {
       ],
       rules: {
         name: [{ required: true, message: '请输入姓名' }],
-
-        passwd: [{ required: true, message: '请输入密码' }],
+        passwd: [{ required: false, message: '请输入密码' }],
         phone: [{ required: true, message: '请输入电话' }],
         deptname: [{ required: true, message: '请输入机构名称' }],
+        role: [{ required: true, message: '请选择用户类型' }],
       },
     };
   },
@@ -67,7 +67,6 @@ export default {
     async search() {
       if (this.id) {
         let res = await this.fetch(this.id);
-        console.log(res.data);
         this.$set(this, `form`, res.data);
       }
     },
@@ -76,14 +75,8 @@ export default {
     async drawerSave({ data, isNew }) {
       let res;
       let msg;
-      console.log(this.isNew);
-
       if (this.isNew) {
-        console.log(data);
-
         res = await this.update(data);
-        console.log();
-
         msg = `${this.keyWord}修改成功`;
       } else {
         res = await this.create(data);

src/views/login.vue

@@ -0,0 +1,76 @@
+<template>
+  <div id="login">
+    <el-row>
+      <el-col :span="24" class="style">
+        <el-col :span="24" class="login">
+          <el-col :span="24" class="top">登录</el-col>
+          <el-form label-position="left" label-width="80px" :model="form" class="form">
+            <el-form-item label="手机号">
+              <el-input v-model="form.phone"></el-input>
+            </el-form-item>
+            <el-form-item label="密码">
+              <el-input v-model="form.passwd"></el-input>
+            </el-form-item>
+            <el-col :span="24" style="text-align:center;">
+              <el-button plain @click="onSubmit()">登录</el-button>
+            </el-col>
+          </el-form>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'login',
+  props: {},
+  components: {},
+  data: () => ({
+    form: {},
+  }),
+  created() {},
+  computed: {},
+  methods: {
+    async onSubmit() {
+      console.log(this.form);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.style {
+  background-image: url('../assets/login.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  height: 100vh;
+}
+.login {
+  width: 35%;
+  height: 40%;
+  background-color: rgba(255, 255, 255, 0.5);
+  float: none;
+  margin: 30vh auto;
+}
+.top {
+  font-size: 1.5vw;
+  text-align: center;
+  font-family: 微软雅黑;
+  height: 10vh;
+  line-height: 10vh;
+  color: #666666;
+}
+/deep/.el-form-item__label {
+  width: 5vh;
+  font-size: 1.2vw;
+  font-family: 微软雅黑;
+}
+.form {
+  margin: 2vh 5vh;
+}
+/deep/.el-button {
+  width: 10vw;
+}
+</style>