diff --git a/.env.development b/.env.development index 00d0206..09a8f2a 100644 --- a/.env.development +++ b/.env.development @@ -2,5 +2,6 @@ ENV = 'development' # base api +VUE_APP_BASE_PATH = '/mall' VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_URL = 'http://localhost:82' diff --git a/.env.production b/.env.production index a58520c..4bd37ea 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,6 @@ ENV = 'production' # base api +VUE_APP_BASE_PATH = '/mall' VUE_APP_BASE_API = '/mobile-api' VUE_APP_BASE_URL = 'http://localhost:82' \ No newline at end of file diff --git a/package.json b/package.json index b1d108d..13e2e0e 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "lodash": "^4.17.21", "mockjs": "^1.1.0", "normalize.css": "^8.0.1", - "vant": "^2.12.13", + "vant": "^2.12.54", "vue": "^2.6.12", "vue-clipboard2": "^0.3.1", "vue-content-loader": "^0.2.3", diff --git a/src/components/Tabbar/index.vue b/src/components/Tabbar/index.vue index 9a085e3..33bce86 100644 --- a/src/components/Tabbar/index.vue +++ b/src/components/Tabbar/index.vue @@ -2,10 +2,10 @@
- 首页 - 分类 - 购物车 - 我的 + 首页 + 分类 + 购物车 + 我的
diff --git a/src/styles/variables.scss b/src/styles/variables.scss index e1acc7c..bbe5f46 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,5 +1,5 @@ // base color -$theme: #1c99e2c0; +$theme: #f1574f; $bg-gradient: linear-gradient(90deg, #0af, #0085ff); $black: #333; $gray: #0000008a; diff --git a/src/views/auth/login.vue b/src/views/auth/login.vue index b960b2a..b1c6512 100644 --- a/src/views/auth/login.vue +++ b/src/views/auth/login.vue @@ -91,7 +91,6 @@ export default { // 提交 onSubmit() { this.loading = true - console.log(process.env.VUE_APP_BASE_PATH) this.$store .dispatch('user/login', this.form) .then(() => {