diff --git a/env/.env b/env/.env index 12c1e8a..cdd23f0 100644 --- a/env/.env +++ b/env/.env @@ -11,7 +11,7 @@ VITE_APP_PUBLIC_BASE=/ # 后台请求地址 # VITE_SERVER_BASEURL = 'http://localhost:8090/api/' -VITE_SERVER_BASEURL = 'http://wxshop.ab98.cn' +VITE_SERVER_BASEURL = 'https://wxshop.ab98.cn/shop-api/api/' # 后台上传地址 VITE_UPLOAD_BASEURL = 'http://localhost:8081/upload' # 汇邦云token请求地址 @@ -22,7 +22,7 @@ VITE_APP_PROXY_ENABLE = true VITE_APP_PROXY_PREFIX = '/api/' # 第二个请求地址 (目前alova中可以使用) -VITE_API_SECONDARY_URL = 'http://wxshop.ab98.cn' +VITE_API_SECONDARY_URL = 'https://wxshop.ab98.cn/shop-api/api/' # 认证模式,'single' | 'double' ==> 单token | 双token VITE_AUTH_MODE = 'single' diff --git a/env/.env.development b/env/.env.development index 008822d..70cdde6 100644 --- a/env/.env.development +++ b/env/.env.development @@ -11,4 +11,4 @@ VITE_SHOW_SOURCEMAP = false #VITE_HUIBANG_BASEURL = 'https://www.ab98.cn' # VITE_SERVER_BASEURL = 'http://localhost:8090/api/' -VITE_SERVER_BASEURL = 'http://wxshop.ab98.cn' +VITE_SERVER_BASEURL = 'https://wxshop.ab98.cn/shop-api/api/' diff --git a/env/.env.production b/env/.env.production index 9f11961..73d3a5b 100644 --- a/env/.env.production +++ b/env/.env.production @@ -6,5 +6,5 @@ VITE_DELETE_CONSOLE = true VITE_SHOW_SOURCEMAP = false # 后台请求地址 - VITE_SERVER_BASEURL = 'http://wxshop.ab98.cn' + VITE_SERVER_BASEURL = 'https://wxshop.ab98.cn/shop-api/api/' VITE_HUIBANG_BASEURL = 'https://www.ab98.cn' diff --git a/src/api/users/index.ts b/src/api/users/index.ts index d792cc2..e46c705 100644 --- a/src/api/users/index.ts +++ b/src/api/users/index.ts @@ -4,4 +4,8 @@ import type { CurrentUserResponseData } from './types'; /** 获取当前登录用户详情 */ export async function getCurrentUserApi() { return await http.get("users/me"); +} + +export async function mpCodeToOpenId(code: string) { + return await http.get("wx/mpCodeToOpenId", { code }); } \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index d1e689a..3f7efb7 100644 --- a/src/pages.json +++ b/src/pages.json @@ -31,12 +31,6 @@ "pagePath": "pages/index/index", "text": "首页" }, - { - "iconPath": "/static/tabbar/order.png", - "selectedIconPath": "/static/tabbar/orderHL.png", - "pagePath": "pages/order/index", - "text": "订单" - }, { "iconPath": "/static/tabbar/personal.png", "selectedIconPath": "/static/tabbar/personalHL.png", @@ -65,14 +59,6 @@ "path": "pages/index/checkout", "type": "page" }, - { - "path": "pages/login/faceLogin", - "type": "page", - "style": { - "navigationBarTitleText": "人脸识别", - "navigationStyle": "custom" - } - }, { "path": "pages/login/login", "type": "page", diff --git a/src/pages/login/faceLogin.vue b/src/pages/login/faceLogin.vue deleted file mode 100644 index 21d5078..0000000 --- a/src/pages/login/faceLogin.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index f7d1588..8972a1d 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -1,17 +1,15 @@