diff --git a/src/config.js b/src/config.js index 01f1100..e3d4cf7 100644 --- a/src/config.js +++ b/src/config.js @@ -1,7 +1,7 @@ // 应用全局配置 const config = { // baseUrl: 'http://47.106.185.127:48080',127.0.0.1 - baseUrl: 'http://127.0.0.1:48080', + baseUrl: 'http://47.106.185.127:48080', // 应用信息 appInfo: { // 应用名称 diff --git a/src/pages.json b/src/pages.json index 6f1efcb..1115e2c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -311,16 +311,16 @@ }, { "pagePath": "pages/work", - "iconPath": "static/images/tabbar/work.png", - "selectedIconPath": "static/images/tabbar/work_.png", + "iconPath": "static/images/tabbar/material.png", + "selectedIconPath": "static/images/tabbar/material_.png", "text": "投料" }, - { + /*{ "pagePath": "pages/template", "iconPath": "static/images/tabbar/work.png", "selectedIconPath": "static/images/tabbar/work_.png", "text": "模板" - }, + },*/ { "pagePath": "pages/mine", "iconPath": "static/images/tabbar/mine.png", @@ -332,6 +332,6 @@ "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "BESURE", - "navigationBarBackgroundColor": "#FFFFFF" + "navigationBarBackgroundColor": "#ffffff" } } diff --git a/src/pages/login.vue b/src/pages/login.vue index 33675b3..4470ec3 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -112,6 +112,11 @@ page { .normal-login-container { width: 100%; + min-height: 100vh; + overflow: hidden; + background-image: url(@/static/images/login/background.svg); + background-repeat: no-repeat; + background-size: 100% 100%; .logo-content { width: 100%; diff --git a/src/static/images/login/background.svg b/src/static/images/login/background.svg new file mode 100644 index 0000000..d19ca49 --- /dev/null +++ b/src/static/images/login/background.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/static/images/tabbar/home.png b/src/static/images/tabbar/home.png index 50acdfd..4484f6e 100644 Binary files a/src/static/images/tabbar/home.png and b/src/static/images/tabbar/home.png differ diff --git a/src/static/images/tabbar/home_.png b/src/static/images/tabbar/home_.png index a408f71..59e923a 100644 Binary files a/src/static/images/tabbar/home_.png and b/src/static/images/tabbar/home_.png differ diff --git a/src/static/images/tabbar/material.png b/src/static/images/tabbar/material.png new file mode 100644 index 0000000..b1edbf5 Binary files /dev/null and b/src/static/images/tabbar/material.png differ diff --git a/src/static/images/tabbar/material_.png b/src/static/images/tabbar/material_.png new file mode 100644 index 0000000..cf7be2b Binary files /dev/null and b/src/static/images/tabbar/material_.png differ diff --git a/src/static/images/tabbar/mine.png b/src/static/images/tabbar/mine.png index f13fe44..a8d4fd1 100644 Binary files a/src/static/images/tabbar/mine.png and b/src/static/images/tabbar/mine.png differ diff --git a/src/static/images/tabbar/mine_.png b/src/static/images/tabbar/mine_.png index 8a0a742..9dbcd56 100644 Binary files a/src/static/images/tabbar/mine_.png and b/src/static/images/tabbar/mine_.png differ diff --git a/src/static/images/tabbar/work.png b/src/static/images/tabbar/work.png index 21e130d..7a48a9e 100644 Binary files a/src/static/images/tabbar/work.png and b/src/static/images/tabbar/work.png differ diff --git a/src/static/images/tabbar/work_.png b/src/static/images/tabbar/work_.png index 80b979c..1ffdc3b 100644 Binary files a/src/static/images/tabbar/work_.png and b/src/static/images/tabbar/work_.png differ