diff --git a/.env.development b/.env.development index d8f7309..d5200f1 100644 --- a/.env.development +++ b/.env.development @@ -11,6 +11,7 @@ VITE_APP_MP_APPID = 'wx42bbe857570c5b40' # 统一接口域名 # VITE_APP_BASE_API = 'http://gateway.ruixininfo.com:8086/' +# VITE_APP_BASE_API = 'https://shop.ruixininfo.com' VITE_APP_BASE_API = 'http://127.0.0.1:8086' # 图片域名 VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/' diff --git a/.env.production b/.env.production index ca0eff4..643efec 100644 --- a/.env.production +++ b/.env.production @@ -11,6 +11,6 @@ VITE_APP_MP_APPID = 'wx42bbe857570c5b40' # 统一接口域名 # VITE_APP_BASE_API = 'http://gateway.ruixininfo.com:8086/' -VITE_APP_BASE_API = 'http://127.0.0.1:8086' +VITE_APP_BASE_API = 'https://shop.ruixininfo.com' # 图片域名 VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/' diff --git a/.env.testing b/.env.testing index a14636e..e89e0da 100644 --- a/.env.testing +++ b/.env.testing @@ -10,7 +10,7 @@ VITE_APP_ENV = 'testing' VITE_APP_MP_APPID = 'wx42bbe857570c5b40' # 统一接口域名 -# VITE_APP_BASE_API = 'http://gateway.ruixininfo.com:8086/' -VITE_APP_BASE_API = 'http://127.0.0.1:8086' +VITE_APP_BASE_API = 'https://shop.ruixininfo.com' +# VITE_APP_BASE_API = 'http://127.0.0.1:8086' # 图片域名 VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..097358e Binary files /dev/null and b/dist.zip differ diff --git a/src/pages.json b/src/pages.json index afe9b69..646c672 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,6 +1,5 @@ { - "pages": [ - { + "pages": [{ "path": "pages/index/index", "style": { "backgroundTextStyle": "dark", @@ -180,7 +179,7 @@ "path": "pages/member-info-detail/member-info-detail", "style": { "backgroundTextStyle": "light", - "navigationBarTitleText": "会员信息详情", + "navigationBarTitleText": "档案信息", "navigationBarTextStyle": "black", "navigationBarBackgroundColor": "#fafafa" } @@ -191,17 +190,26 @@ { "path": "pages/register/register" }, - + { + "path": "pages/agreement/agreement", + "style": { + "backgroundTextStyle": "light", + "navigationBarTitleText": "用户协议", + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#fafafa" + } + } + ], "tabBar": { "selectedColor": "#3a86b9", "color": "#b8b8b8", - "list": [ - { + "list": [{ "pagePath": "pages/index/index", "text": "首页", "iconPath": "/static/images/tabbar/homepage.png", "selectedIconPath": "/static/images/tabbar/homepage-sel.png" + }, { "pagePath": "pages/category/category", @@ -231,4 +239,4 @@ "navigationBarTextStyle": "black" }, "subPackages": [] -} +} \ No newline at end of file diff --git a/src/pages/accountLogin/accountLogin.vue b/src/pages/accountLogin/accountLogin.vue index 4027267..3244478 100644 --- a/src/pages/accountLogin/accountLogin.vue +++ b/src/pages/accountLogin/accountLogin.vue @@ -1,6 +1,6 @@