From 136af699524b93b27559d3ea3c415ea19609bc7e Mon Sep 17 00:00:00 2001
From: wayn <1669738430@qq.com>
Date: Wed, 9 Aug 2023 23:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                | 1 +
 .env.production                 | 1 +
 package.json                    | 2 +-
 src/components/Tabbar/index.vue | 8 ++++----
 src/styles/variables.scss       | 2 +-
 src/views/auth/login.vue        | 1 -
 6 files changed, 8 insertions(+), 7 deletions(-)

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 @@
   <div>
     <div class="tabbar">
       <van-tabbar v-model="active" :active-color="variables.theme" :fixed="false" route>
-        <van-tabbar-item to="/" icon="wap-home">首页</van-tabbar-item>
-        <van-tabbar-item to="/category" icon="bars">分类</van-tabbar-item>
-        <van-tabbar-item to="/cart" icon="shopping-cart">购物车</van-tabbar-item>
-        <van-tabbar-item to="/user" icon="manager">我的</van-tabbar-item>
+        <van-tabbar-item :to="{name: 'Home'}" icon="wap-home">首页</van-tabbar-item>
+        <van-tabbar-item :to="{name: 'Category'}" icon="bars">分类</van-tabbar-item>
+        <van-tabbar-item :to="{name: 'Cart'}" icon="shopping-cart">购物车</van-tabbar-item>
+        <van-tabbar-item :to="{name: 'User'}" icon="manager">我的</van-tabbar-item>
       </van-tabbar>
     </div>
     <div class="tabbar--placeholder" style="width:100%;height:50px" />
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(() => {