lvkun996 пре 3 месеци
родитељ
комит
f0bbaf1fe0

+ 1 - 1
public/index.html

@@ -18,7 +18,7 @@
     </noscript>
     <div id="app">
       <div class="first-loading-wrp">
-        <h1>探索小镇</h1>
+        <h1>智慧芯</h1>
         <div class="loading-wrp">
           <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
         </div>

BIN
src/assets/login/bg.jpg


+ 2 - 2
src/components/GlobalHeader/AvatarDropdown.vue

@@ -56,8 +56,8 @@ export default {
     },
     handleLogout (e) {
       Modal.confirm({
-        title: this.$t('layouts.usermenu.dialog.title'),
-        content: this.$t('layouts.usermenu.dialog.content'),
+        title: '退出登录',
+        content: '是否退出登录?',
         onOk: () => {
           // return new Promise((resolve, reject) => {
           //   setTimeout(Math.random() > 0.5 ? resolve : reject, 1500)

+ 11 - 6
src/components/GlobalHeader/RightContent.vue

@@ -1,7 +1,7 @@
 <template>
   <div :class="wrpCls">
     <avatar-dropdown :menu="showMenu" :current-user="currentUser" :class="prefixCls" />
-    <select-lang :class="prefixCls" />
+    <!-- <select-lang :class="prefixCls" /> -->
   </div>
 </template>
 
@@ -33,6 +33,11 @@ export default {
       required: true
     }
   },
+  mounted () {
+    this.currentUser = {
+        name: 'Serati Ma'
+      }
+  },
   data () {
     return {
       showMenu: true,
@@ -48,11 +53,11 @@ export default {
     }
   },
   mounted () {
-    setTimeout(() => {
-      this.currentUser = {
-        name: 'Serati Ma'
-      }
-    }, 1500)
+    // setTimeout(() => {
+    //   this.currentUser = {
+    //     name: 'Serati Ma'
+    //   }
+    // }, 1500)
   }
 }
 </script>

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -20,7 +20,7 @@
       </div>
     </template>
 
-    <setting-drawer :settings="settings" @change="handleSettingChange" />
+    <!-- <setting-drawer :settings="settings" @change="handleSettingChange" /> -->
     <template v-slot:rightContentRender>
       <right-content :top-menu="settings.layout === 'topmenu'" :is-mobile="isMobile" :theme="settings.theme" />
     </template>

+ 1 - 1
src/utils/request.js

@@ -11,7 +11,7 @@ console.log()
 const request = axios.create({
   // API 请求的默认前缀
   // baseURL: process.env.VUE_APP_API_BASE_URL,
-  baseURL: process.env.NODE_ENV === 'development' ? '/api' : 'https://open.luojigou.vip/town-crm',
+  baseURL: process.env.NODE_ENV === 'development' ? '/api' : 'https://open.api.luojigou.vip/town-crm',
 
   // baseURL: '/api',
   timeout: 6000 // 请求超时时间

+ 11 - 13
src/views/eduAdmin/class/index.vue

@@ -22,7 +22,7 @@
       </a-card>
     </page-header-wrapper>
     <a-modal
-      title="新增课程"
+      title="新增课程:  普通课程"
       :visible="visible"
       :confirm-loading="confirmLoading"
       @ok="submitForm"
@@ -33,10 +33,11 @@
         :model="dynamicValidateForm"
         v-bind="formItemLayoutWithOutLabel"
       >
-        <a-form-model-item label="课程类型" v-bind="formItemLayout ">
+        <!-- <a-form-model-item label="课程类型" v-bind="formItemLayout ">
           <a-radio checked>普通课程</a-radio>
-        </a-form-model-item>
+        </a-form-model-item> -->
         <a-form-model-item
+          style="margin-bottom: 6px;"
           v-for="(domain, index) in dynamicValidateForm.domains"
           :key="domain.key"
           v-bind=" formItemLayout "
@@ -51,7 +52,7 @@
           <a-input
             v-model="domain.value"
             placeholder="请输入课程名"
-            style="width: 60%; margin-right: 8px"
+            style="width: 60%; margin-right: 8px;margin-bottom: 6px;"
           />
           <a-icon
             v-if="index > 0 "
@@ -176,15 +177,12 @@ export default {
       }
     },
     submitForm () {
-      this.$refs.dynamicValidateForm.validate(valid => {
-        console.log(valid)
-        if (valid) {
-          this.postCourse()
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
+      const hasValue = this.dynamicValidateForm.domains.findIndex(item => item.value === '')
+      if (hasValue !== -1) {
+        this.$message.error('请输入课程名')
+        return false
+      }
+      this.postCourse()
     },
     // 添加课程
     async postCourse () {

+ 7 - 3
src/views/user/Login.vue

@@ -7,8 +7,9 @@
 
     <div class="login-panle">
       <div class="login-box">
-        <img class="company-name" :src="require('@/assets/login/company.png')" alt="">
-        <div class="login-label">登录</div>
+        <div class="company-name" >智慧芯</div>
+        <!-- <img class="company-name" :src="require('@/assets/login/company.png')" alt=""> -->
+        <!-- <div class="login-label">登录</div> -->
         <div class="login-input">
 
           <a-input class="input" placeholder="请输入用户名" v-model.trim="number">
@@ -237,7 +238,7 @@ export default {
       width: 100%;
       height: 100%;
       display: block;
-      // object-fit: contain;
+      object-fit: cover;
       position: absolute;
       z-index: 2;
     }
@@ -265,6 +266,9 @@ export default {
     .company-name {
       width: 402px;
       height: 31px;
+      font-size: 48px;
+      font-weight: normal;
+      margin-bottom: 65px;
     }
     .login-label {
       font-size: 30px;