shengxuefei 4 éve
szülő
commit
9206ccbb80

+ 1 - 1
vue-antd-admin/.env

@@ -7,4 +7,4 @@ VUE_APP_USER_KEY=admin.user
 VUE_APP_SETTING_KEY=admin.setting
 VUE_APP_TBAS_KEY=admin.tabs
 VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
-VUE_APP_API_BASE_URL=http://api.iczer.com
+VUE_APP_API_BASE_URL=http://localhost:5000

+ 1 - 1
vue-antd-admin/.env.development

@@ -1 +1 @@
-VUE_APP_API_BASE_URL=http://dev.iczer.com
+VUE_APP_API_BASE_URL=http://localhost:5000

+ 5 - 5
vue-antd-admin/src/config/default/setting.config.js

@@ -17,8 +17,8 @@ module.exports = {
   multiPage: false,                     //多页签模式,true:开启,false:不开启
   cachePage: true,                      //是否缓存页面数据,仅多页签模式下生效,true 缓存, false 不缓存
   hideSetting: false,                   //隐藏设置抽屉,true:隐藏,false:不隐藏
-  systemName: 'Vue Antd Admin',         //系统名称
-  copyright: '2018 ICZER 工作室出品',     //copyright
+  systemName: '物业ERP',         //系统名称
+  copyright: '2021 路涛科技',     //copyright
   asyncRoutes: false,                   //异步加载路由,true:开启,false:不开启
   showPageTitle: true,                  //是否显示页面标题(PageLayout 布局中的页面标题),true:显示,false:不显示
   filterMenu: true,                    //根据权限过滤菜单,true:过滤,false:不过滤
@@ -28,8 +28,8 @@ module.exports = {
     direction: 'left'                   //动画方向,切换页面时动画的方向,参考 ./animate.config.js
   },
   footerLinks: [                        //页面底部链接,{link: '链接地址', name: '名称/显示文字', icon: '图标,支持 ant design vue 图标库'}
-    {link: 'https://pro.ant.design', name: 'Pro首页'},
-    {link: 'https://github.com/iczer/vue-antd-admin', icon: 'github'},
-    {link: 'https://ant.design', name: 'Ant Design'}
+    // {link: 'https://pro.ant.design', name: 'Pro首页'},
+    // {link: 'https://github.com/iczer/vue-antd-admin', icon: 'github'},
+    // {link: 'https://ant.design', name: 'Ant Design'}
   ],
 }

+ 6 - 33
vue-antd-admin/src/pages/login/Login.vue

@@ -2,15 +2,15 @@
   <common-layout>
     <div class="top">
       <div class="header">
-        <img alt="logo" class="logo" src="@/assets/img/logo.png" />
+        
         <span class="title">{{systemName}}</span>
       </div>
-      <div class="desc">Ant Design 是西湖区最具影响力的 Web 设计规范</div>
+      
     </div>
     <div class="login">
       <a-form @submit="onSubmit" :form="form">
         <a-tabs size="large" :tabBarStyle="{textAlign: 'center'}" style="padding: 0 2px;">
-          <a-tab-pane tab="账户密码登录" key="1">
+          <a-tab-pane  tab="" key="1">
             <a-alert type="error" :closable="true" v-if="error" :message="error" @close='onClose' showIcon style="margin-bottom: 24px;" />
             <a-form-item>
               <a-input
@@ -34,40 +34,12 @@
               </a-input>
             </a-form-item>
           </a-tab-pane>
-          <a-tab-pane tab="手机号登录" key="2">
-            <a-form-item>
-              <a-input size="large" placeholder="mobile number" >
-                <a-icon slot="prefix" type="mobile" />
-              </a-input>
-            </a-form-item>
-            <a-form-item>
-              <a-row :gutter="8" style="margin: 0 -4px">
-                <a-col :span="16">
-                  <a-input size="large" placeholder="captcha">
-                    <a-icon slot="prefix" type="mail" />
-                  </a-input>
-                </a-col>
-                <a-col :span="8" style="padding-left: 4px">
-                  <a-button style="width: 100%" class="captcha-button" size="large">获取验证码</a-button>
-                </a-col>
-              </a-row>
-            </a-form-item>
-          </a-tab-pane>
         </a-tabs>
-        <div>
-          <a-checkbox :checked="true" >自动登录</a-checkbox>
-          <a style="float: right">忘记密码</a>
-        </div>
+       
         <a-form-item>
           <a-button :loading="logging" style="width: 100%;margin-top: 24px" size="large" htmlType="submit" type="primary">登录</a-button>
         </a-form-item>
-        <div>
-          其他登录方式
-          <a-icon class="icon" type="alipay-circle" />
-          <a-icon class="icon" type="taobao-circle" />
-          <a-icon class="icon" type="weibo-circle" />
-          <router-link style="float: right" to="/dashboard/workplace" >注册账户</router-link>
-        </div>
+        
       </a-form>
     </div>
   </common-layout>
@@ -109,6 +81,7 @@ export default {
       })
     },
     afterLogin(res) {
+      console.info('res',res);
       this.logging = false
       const loginRes = res.data
       if (loginRes.code >= 0) {

+ 1 - 0
vue-antd-admin/src/router/config.js

@@ -4,6 +4,7 @@ import PageView from '@/layouts/PageView'
 
 // 路由配置
 const options = {
+  mode:'history',   //去掉路由中的#
   routes: [
     {
       path: '/login',

+ 1 - 1
vue-antd-admin/src/services/api.js

@@ -3,6 +3,6 @@
 // const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
 const BASE_URL = process.env.VUE_APP_API_BASE_URL
 module.exports = {
-  LOGIN: `${BASE_URL}/login`,
+  LOGIN: `${BASE_URL}/api/user`,     //登录后台接口url
   ROUTES: `${BASE_URL}/routes`
 }

+ 1 - 0
vue-antd-admin/src/utils/request.js

@@ -35,6 +35,7 @@ async function request(url, method, params, config) {
     case METHOD.GET:
       return axios.get(url, {params, ...config})
     case METHOD.POST:
+      console.info('request url',url);
       return axios.post(url, params, config)
     default:
       return axios.get(url, {params, ...config})