diff --git a/env/.env.development b/env/.env.development
index 8d5446a..62ed729 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -14,4 +14,4 @@ VITE_UPLOAD_BASEURL = 'https://76458.com/upload'
# 上传图片请求地址
VITE_UPLOAD_BASEURL = 'https://76458.com/storeapi/upload/image'
-VITE_UPLOAD_IMAGE_URL = 'https://76458.com/'
\ No newline at end of file
+VITE_UPLOAD_IMAGE_URL = 'https://chaz.oss-cn-shanghai.aliyuncs.com/'
\ No newline at end of file
diff --git a/env/.env.production b/env/.env.production
index d2f21d4..5a70552 100644
--- a/env/.env.production
+++ b/env/.env.production
@@ -14,4 +14,4 @@ VITE_UPLOAD_BASEURL = 'https://76458.com/upload'
# 上传图片请求地址
VITE_UPLOAD_BASEURL = 'https://76458.com/storeapi/upload/image'
-VITE_UPLOAD_IMAGE_URL = 'https://76458.com/'
\ No newline at end of file
+VITE_UPLOAD_IMAGE_URL = 'https://chaz.oss-cn-shanghai.aliyuncs.com/'
diff --git a/src/api/user.ts b/src/api/user.ts
index 7c86bee..4259598 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -56,7 +56,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 }
+ })
}
/**
@@ -70,7 +72,9 @@ export interface IResetPasswordParams {
}
export function resetPassword(data: IResetPasswordParams) {
- return http.Post('/storeapi/storeLogin/resetPassword', data)
+ return http.Post('/storeapi/storeLogin/resetPassword', data, {
+ meta: { ignoreAuth: true }
+ })
}
/**
diff --git a/src/bundle/account/switch.vue b/src/bundle/account/switch.vue
index 5398b49..015b283 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 }}
@@ -39,7 +39,7 @@
import { router } from '@/utils/tools'
- // 读取仓库
+ const OSS = inject('OSS')
const useStore = useStoreStore()
// 店铺列表
diff --git a/src/bundle/finance/detail.vue b/src/bundle/finance/detail.vue
index 03158f2..8567ad6 100644
--- a/src/bundle/finance/detail.vue
+++ b/src/bundle/finance/detail.vue
@@ -17,7 +17,16 @@
团购
直营
- 【{{ bill?.room?.title }}】{{ bill?.order?.group?.title || '' }}
+
+
+ 门店余额充值
+
+
+
+
+ 【{{ bill?.room?.title }}】{{ bill?.order?.group?.title || '' }}
+
+
@@ -64,6 +73,23 @@
+
+
+ 充值金额
+ ￥{{ bill?.order?.recharge_price }}
+
+
+
+ 赠送金额
+ ￥{{ bill?.order?.gift_price }}
+
+
+
+
+
+
+
+
@@ -71,7 +97,8 @@
￥{{ bill?.order?.order_amount }}
-
+
+
优惠券
-￥{{ bill?.order?.coupon_price }}
@@ -82,6 +109,11 @@
+
+ 用户手机号
+ {{ bill?.order.mobile }}
+
+
订单编号
@@ -95,7 +127,13 @@
交易方式
{{ bill?.order?.pay_way_title }}
-
+
+
+
+
+ 支付方式
+ {{ bill?.order?.pay_way_title }}
+
创建时间
@@ -125,6 +163,12 @@
付款时间
{{ bill?.order?.dtime }}
+
+
+
+ 付款时间
+ {{ bill?.order?.pay_time }}
+
@@ -156,6 +200,11 @@
const isDirectSale = computed(() => {
return bill.value.change_type === 1 || bill.value.change_type === 2
})
+
+ // 充值
+ const isRecharge = computed(() => {
+ return bill.value.change_type === 9
+ })