diff --git a/env/.env b/env/.env
index 642dbe2..d63f63c 100644
--- a/env/.env
+++ b/env/.env
@@ -1,5 +1,5 @@
VITE_APP_TITLE = '茶艺师管理端'
-VITE_APP_PORT = 9002
+VITE_APP_PORT = 9003
VITE_UNI_APPID = '__UNI__932EB7D'
VITE_WX_APPID = 'wx1a89a1b47d08b83e'
@@ -9,16 +9,10 @@ VITE_APP_PUBLIC_BASE=/
# 登录页面
VITE_LOGIN_URL = '/pages/login/login'
-# 第一个请求地址
-VITE_SERVER_BASEURL = 'https://76458.com'
# h5是否需要配置代理
VITE_APP_PROXY=true
VITE_APP_PROXY_PREFIX = '/storeapi'
# 第二个请求地址 (目前alova中可以使用)
-VITE_SERVER_BASEURL = 'https://76458.com'
-
-# 上传图片请求地址
-VITE_UPLOAD_BASEURL = 'https://76458.com/teamapi/Upload/image'
-VITE_UPLOAD_IMAGE_URL = 'https://76458.com/'
\ No newline at end of file
+# VITE_SERVER_BASEURL = 'https://76458.com'
diff --git a/env/.env.development b/env/.env.development
index 04fa273..9f36700 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -1,6 +1,17 @@
# 变量必须以 VITE_ 为前缀才能暴露给外部读取
NODE_ENV = 'development'
+VITE_NODE_ENV = 'development'
+
# 是否去除console 和 debugger
VITE_DELETE_CONSOLE = false
# 是否开启sourcemap
VITE_SHOW_SOURCEMAP = true
+
+# 请求地址
+VITE_SERVER_BASEURL = 'https://76458.com'
+# 图片上传路径
+VITE_UPLOAD_BASEURL = 'https://76458.com/upload'
+
+# 上传图片请求地址
+VITE_UPLOAD_BASEURL = 'https://76458.com/teamapi/upload/image'
+VITE_UPLOAD_IMAGE_URL = 'https://chaz.oss-cn-shanghai.aliyuncs.com/'
diff --git a/env/.env.production b/env/.env.production
index 8a1b50c..4a5392b 100644
--- a/env/.env.production
+++ b/env/.env.production
@@ -1,6 +1,17 @@
# 变量必须以 VITE_ 为前缀才能暴露给外部读取
-NODE_ENV = 'development'
+NODE_ENV = 'production'
+VITE_NODE_ENV = 'production'
+
# 是否去除console 和 debugger
VITE_DELETE_CONSOLE = true
# 是否开启sourcemap
VITE_SHOW_SOURCEMAP = false
+
+# 请求地址
+VITE_SERVER_BASEURL = 'https://76458.com'
+# 图片上传路径
+VITE_UPLOAD_BASEURL = 'https://76458.com/upload'
+
+# 上传图片请求地址
+VITE_UPLOAD_BASEURL = 'https://76458.com/teamapi/Upload/image'
+VITE_UPLOAD_IMAGE_URL = 'https://chaz.oss-cn-shanghai.aliyuncs.com/'
\ No newline at end of file
diff --git a/src/api/user.ts b/src/api/user.ts
index 60948de..77f0ecd 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -68,7 +68,9 @@ export interface IGetStoreVerificationCodeParams {
}
export function getVerificationCode(data: IGetStoreVerificationCodeParams) {
- return http.Post('/storeapi/sms/sendCode', data)
+ return http.Post('/storeapi/sms/sendCode', data, {
+ meta: { ignoreAuth: true }
+ })
}
/**
@@ -82,7 +84,9 @@ export interface IResetPasswordParams {
}
export function resetPassword(data: IResetPasswordParams) {
- return http.Post('/storeapi/storeLogin/resetPassword', data)
+ return http.Post('/teamapi/teamLogin/resetPassword', data, {
+ meta: { ignoreAuth: true }
+ })
}
/**
diff --git a/src/bundle/account/switch.vue b/src/bundle/account/switch.vue
index 5398b49..0f4922d 100644
--- a/src/bundle/account/switch.vue
+++ b/src/bundle/account/switch.vue
@@ -14,7 +14,7 @@
class="bg-white rounded-16rpx px-30rpx py-36rpx flex justify-between items-center mb-20rpx"
v-for="(item, index) in useStore.storeList" :key="item.id">
-
+
{{ item.name }}
@@ -36,10 +36,9 @@
diff --git a/src/pages/my/profile-edit.vue b/src/pages/my/profile-edit.vue
index 84d173d..37ec86b 100644
--- a/src/pages/my/profile-edit.vue
+++ b/src/pages/my/profile-edit.vue
@@ -50,8 +50,8 @@
出生年月
-
+
@@ -258,7 +258,7 @@
const d = new Date(value)
const year = d.getFullYear()
const month = d.getMonth() + 1
- const day = d.getDay()
+ const day = d.getDate()
both.value = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`
formData.value.both = value / 1000 // 转为秒
},
diff --git a/src/pages/webview/webview.vue b/src/pages/webview/webview.vue
new file mode 100644
index 0000000..75ac6bf
--- /dev/null
+++ b/src/pages/webview/webview.vue
@@ -0,0 +1,35 @@
+
+{
+ "style": {
+ // 'custom' 表示开启自定义导航栏，默认 'default'
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/store/user.ts b/src/store/user.ts
index 136f63b..ccd8815 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -11,7 +11,8 @@ import {
} from '@/api/login'
import { toast } from '@/utils/toast'
-const defaultAvatar = 'https://shchazhi.oss-cn-hangzhou.aliyuncs.com/fronted/icon/icon_avatar.png'
+const OSS = inject('OSS')
+const defaultAvatar = `${OSS}icon/icon_avatar.png`
// 初始化状态
const userInfoState: IUserInfoVo = {
diff --git a/src/uni.scss b/src/uni.scss
index 75cd131..2af2063 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -79,4 +79,4 @@ $uni-font-size-paragraph: 15px;
/* chazhi 自定义 */
$cz-page-background: #F6F7F9; // 页面背景色
$cz-theme-color: #4C9F44; // 页面背景色
-$OSS: 'https://shchazhi.oss-cn-hangzhou.aliyuncs.com/fronted/';
+$OSS: 'https://chaz.oss-cn-shanghai.aliyuncs.com/fronted/';