diff --git a/.env.development b/.env.development
index e05d914..f688cec 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,4 @@
+NODE_ENV = 'development'
# 兴业优酷
# VITE_BASE_URL = 'http://192.168.110.50:8083'
# 邮储奶茶活动
diff --git a/.env.production b/.env.production
index 39f60fb..3192d28 100644
--- a/.env.production
+++ b/.env.production
@@ -1,15 +1,10 @@
-# 兴业优酷
-# VITE_BASE_URL = 'http://192.168.110.50:8083'
-# 邮储奶茶活动(测试环境)
-# VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn'
-# VITE_YCNC_MERCH_CODE = '100310100018908'
+NODE_ENV = 'production'
# 邮储奶茶活动(正式环境)
# VITE_BASE_URL = 'https://milk.api.cdlsxd.cn'
# VITE_YCNC_MERCH_CODE = '100510102303326'
-# 邮储音视频活动(测试环境)
-VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn/ycav'
-# VITE_YCNC_MERCH_CODE = '100610100019042'
-VITE_YCNC_MERCH_CODE = '100310100018908'
+# 邮储音视频活动(生产环境)
+VITE_BASE_URL = 'https://mv.h5.cdlsxd.cn'
+VITE_YCNC_MERCH_CODE = '100510102303326'
diff --git a/.env.test b/.env.test
new file mode 100644
index 0000000..1fdb0e9
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,10 @@
+NODE_ENV = 'test'
+
+# 邮储奶茶活动(测试环境)
+# VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn'
+# VITE_YCNC_MERCH_CODE = '100310100018908'
+
+
+# 邮储音视频活动(测试环境)
+VITE_BASE_URL = 'https://gateway.dev.cdlsxd.cn'
+VITE_YCNC_MERCH_CODE = '100310100018908'
\ No newline at end of file
diff --git a/package.json b/package.json
index 2bf63ec..9d5c170 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"build:app-ios": "uni build -p app-ios",
"build:custom": "uni build -p",
"build:h5": "uni build",
+ "build:h5:test": "uni build --mode test",
"build:h5:ssr": "uni build --ssr",
"build:mp-alipay": "uni build -p mp-alipay",
"build:mp-baidu": "uni build -p mp-baidu",
diff --git a/src/interceptors/request.js b/src/interceptors/request.js
index ef34818..01fe9f5 100644
--- a/src/interceptors/request.js
+++ b/src/interceptors/request.js
@@ -1,6 +1,9 @@
import qs from 'qs'
+
+
// 请求基准地址
+console.log('env------>',import.meta.env);
const baseUrl = import.meta.env.VITE_BASE_URL
@@ -9,6 +12,7 @@ const baseUrl = import.meta.env.VITE_BASE_URL
const httpInterceptor = {
// 拦截前触发
invoke(options) {
+ console.log('拦截前参数--->',options);
// 接口请求支持通过 query 参数配置 queryString
if (options.query) {
const queryStr = qs.stringify(options.query)
@@ -30,6 +34,7 @@ const httpInterceptor = {
if (token && !options.noToken) {
options.header.Authorization = `Bearer ${token}`
}
+ console.log('拦截后参数--->',options);
}
}
diff --git a/src/pages/ycysp/components/recharge-item.vue b/src/pages/ycysp/components/recharge-item.vue
index d38f939..91c8acf 100644
--- a/src/pages/ycysp/components/recharge-item.vue
+++ b/src/pages/ycysp/components/recharge-item.vue
@@ -4,7 +4,7 @@
:class="{ 'is-checked': detail.isSelected }"
@click="selectEvent"
>
- {{ detail.product_name }}
+ {{ detail.product_type }}
¥
{{ detail.sell_price }}
diff --git a/src/pages/ycysp/orderDetail.vue b/src/pages/ycysp/orderDetail.vue
index 0b7526e..f7a0e23 100644
--- a/src/pages/ycysp/orderDetail.vue
+++ b/src/pages/ycysp/orderDetail.vue
@@ -10,7 +10,11 @@
-
+
+
+ 订单查询中...
+
+
订单详情
@@ -65,7 +69,7 @@
-
+
{
- const url = window.location.href;
- console.log("url-->", url);
+onShow(async () => {
+ const isPayBack = getQueryString("isPayBack");
+ if(isPayBack){
+ isWaiting.value = true
+ await sleep(3000)
+ isWaiting.value = false
+ }
const order_id = getQueryString("order_id");
const order_no = getQueryString("order_no");
- const isPayBack = getQueryString("isPayBack");
- console.log(order_id, order_no);
if (!order_id && !order_no) return;
id.value = order_id;
orderNo.value = order_no;
@@ -114,15 +121,11 @@ const backIndex = () => {
});
};
-const viewPwd = (detailData) => {
- const { voucher_link } = detailData;
- if (voucher_link) {
- console.log(`跳转外部链接-->${voucher_link}`);
- window.location.href = voucher_link;
- } else {
- console.error(`voucher_link无有效值`);
- }
-};
+function sleep(ms) {
+ return new Promise((resolve) => {
+ setTimeout(resolve, ms);
+ });
+}
const goRefund = () => {
const { id } = orderDetail;
@@ -179,6 +182,21 @@ const getDetail = () => {