Merge branch 'master' of http://114.67.93.201/xulili/ybf

ybf_admin/src/pages/task/bar/index.vue

@@ -303,6 +303,7 @@
 </template>
 <script>
 import { ApiLoginSubmit } from "@api/login/main";
+import md5 from "js-md5";
 
 export default {
   components: {},

ybf_admin/src/pages/task/main/index.vue

@@ -19,7 +19,7 @@
 import TaskBar from "../bar/index";
 import TaskCom from "../com/index";
 import TaskCount from "../count/index";
-import { ApiTestGet, ApiTestPost } from "@/api/task/main";
+// import { ApiTestGet, ApiTestPost } from "@/api/task/main";
 
 export default {
   components: {

ybf_admin/src/views/system/login/page.vue

 <template>
   <div class="page-login">
     <div class="page-login--layer page-login--layer-area">
-      <ul class="circles">
+      <ul class="circles" style="2px solid greed;">
         <li v-for="n in 10" :key="n"></li>
       </ul>
     </div>
     <div
-      class="page-login--layer page-login--layer-time"
-      flex="main:center cross:center">
+      class="page-login--layer page-login--layer-time loginbktime"
+      flex="main:center cross:center"
+      style="border: 2px solid red;">
       {{time}}
     </div>
     <div class="page-login--layer">
@@ -15,9 +16,9 @@
         class="page-login--content"
         flex="dir:top main:justify cross:stretch box:justify">
         <div class="page-login--content-header">
-          <p class="page-login--content-header-motto">
+          <!-- <p class="page-login--content-header-motto">
             时间是一切财富中最宝贵的财富
-          </p>
+          </p> -->
         </div>
         <div
           class="page-login--content-main"
@@ -50,38 +51,45 @@
                   </el-input>
                 </el-form-item>
                 <el-form-item prop="code">
-                  <el-input
+                  <!-- <el-input
                     type="text"
                     v-model="formLogin.code"
                     placeholder="验证码">
                     <template slot="append">
                       <img class="login-code" src="./image/login-code.png">
                     </template>
-                  </el-input>
+                  </el-input> -->
                 </el-form-item>
-                <el-button
+                <!-- <el-button
                   size="default"
                   @click="submit"
                   type="primary"
                   class="button-login">
                   登录
+                </el-button> -->
+                 <el-button
+                  size="default"
+                  @click="loginSubmit"
+                  type="primary"
+                  class="button-login">
+                  登录
                 </el-button>
               </el-form>
             </el-card>
             <p
               class="page-login--options"
               flex="main:justify cross:center">
-              <span><d2-icon name="question-circle"/> 忘记密码</span>
-              <span>注册用户</span>
+              <!-- <span><d2-icon name="question-circle"/> 忘记密码</span> -->
+              <!-- <span>注册用户</span> -->
             </p>
             <!-- quick login -->
-            <el-button class="page-login--quick" size="default" type="info" @click="dialogVisible = true">
+            <!-- <el-button class="page-login--quick" size="default" type="info" @click="dialogVisible = true">
               快速选择用户（测试功能）
-            </el-button>
+            </el-button> -->
           </div>
         </div>
         <div class="page-login--content-footer">
-          <p class="page-login--content-footer-locales">
+          <!-- <p class="page-login--content-footer-locales">
             <a
               v-for="language in $languages"
               :key="language.value"
@@ -101,11 +109,11 @@
             <a href="#">帮助</a>
             <a href="#">隐私</a>
             <a href="#">条款</a>
-          </p>
+          </p> -->
         </div>
       </div>
     </div>
-    <el-dialog
+    <!-- <el-dialog
       title="快速选择用户"
       :visible.sync="dialogVisible"
       width="400px">
@@ -117,7 +125,7 @@
           </div>
         </el-col>
       </el-row>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -125,6 +133,9 @@
 import dayjs from 'dayjs'
 import { mapActions } from 'vuex'
 import localeMixin from '@/locales/mixin.js'
+import { ApiLoginSubmit } from "@api/login/main";
+import md5 from "js-md5";
+
 export default {
   mixins: [
     localeMixin
@@ -196,6 +207,27 @@ export default {
     ...mapActions('d2admin/account', [
       'login'
     ]),
+
+    loginSubmit(){
+      let postData = {
+        loginName: this.formLogin.username,
+        loginPwd: md5(this.formLogin.password),
+      }
+
+      ApiLoginSubmit(postData)
+      .then(res => {
+        if(res.result === 'success'){
+        console.log('--->login: res =', res)
+
+          this.$router.replace(this.$route.query.redirect || '/')
+          // this.$router.push('/')
+          
+        }
+      })
+
+    },
+
+
     refreshTime () {
       this.time = dayjs().format('HH:mm:ss')
     },
@@ -224,7 +256,7 @@ export default {
           })
             .then(() => {
               // 重定向对象不存在则返回顶层路径
-              this.$router.replace(this.$route.query.redirect || '/')
+              this.$router.replace(this.$route.query.redirect || '/homeMain')
             })
         } else {
           // 登录表单校验失败
@@ -483,3 +515,9 @@ export default {
   }
 }
 </style>
+
+<style scoped>
+.loginbktime{
+  border: 2px solid red;
+}
+</style>