diff --git a/.env.production b/.env.production index 3192d28..9045317 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,9 @@ NODE_ENV = 'production' # 邮储奶茶活动(正式环境) -# VITE_BASE_URL = 'https://milk.api.cdlsxd.cn' -# VITE_YCNC_MERCH_CODE = '100510102303326' - -# 邮储音视频活动(生产环境) -VITE_BASE_URL = 'https://mv.h5.cdlsxd.cn' +VITE_BASE_URL = 'https://milk.api.cdlsxd.cn' VITE_YCNC_MERCH_CODE = '100510102303326' +# 邮储音视频活动(生产环境) +# VITE_BASE_URL = 'https://mv.h5.cdlsxd.cn' +# VITE_YCNC_MERCH_CODE = '100510102303326' diff --git a/custom.page.js b/custom.page.js index 02dd48f..d068551 100644 --- a/custom.page.js +++ b/custom.page.js @@ -4,8 +4,8 @@ import path from 'path' const config = { pages:'./src/pages', - pagesInclude:['ycysp/home.vue','ycysp/pay.vue','ycysp/order.vue','ycysp/orderDetail.vue',] - // pagesInclude:['ycnc'] + // pagesInclude:['ycysp/home.vue','ycysp/pay.vue','ycysp/order.vue','ycysp/orderDetail.vue',] + pagesInclude:['ycnc'] } const { pages, pagesInclude } = config diff --git a/src/pages.json b/src/pages.json index d8abf8f..e0e218b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,16 +1,25 @@ { "pages": [ { - "path": "pages/ycysp/home", + "path": "pages/ycnc/index", "type": "home", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "音视频专区", + "navigationBarTitleText": "奶茶活动", "navigationBarBackgroundColor": "#FFF" } }, { - "path": "pages/ycysp/order", + "path": "pages/ycnc/detail", + "type": "page", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "商品详情", + "navigationBarBackgroundColor": "#FFF" + } + }, + { + "path": "pages/ycnc/order", "type": "page", "style": { "navigationStyle": "custom", @@ -19,22 +28,13 @@ } }, { - "path": "pages/ycysp/orderDetail", + "path": "pages/ycnc/orderDetail", "type": "page", "style": { "navigationStyle": "custom", "navigationBarTitleText": "订单详情", "navigationBarBackgroundColor": "#FFF" } - }, - { - "path": "pages/ycysp/pay", - "type": "page", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "支付确认", - "navigationBarBackgroundColor": "#FFF" - } } ], "globalStyle": { diff --git a/src/pages/ycnc/order.vue b/src/pages/ycnc/order.vue index 87f91de..b9a934f 100644 --- a/src/pages/ycnc/order.vue +++ b/src/pages/ycnc/order.vue @@ -120,20 +120,20 @@ async function pay(orderData){ console.log(orderData); const {order_no,notify_url,price,brand,sign,plain_text,id} = orderData; - const params = { - order_id:id, - order_no: order_no - } - const res = await queryOrderDetail({params}) - if(res.third_status === '03'){ - uni.showToast({ - title: '当前订单已支付成功,无需再支付~', - icon: 'none' - }); - replace.value = true; - queryOrderList() - return - } + // const params = { + // order_id:id, + // order_no: order_no + // } + // const res = await queryOrderDetail({params}) + // if(res.third_status === '03'){ + // uni.showToast({ + // title: '当前订单已支付成功,无需再支付~', + // icon: 'none' + // }); + // replace.value = true; + // queryOrderList() + // return + // } const {payFunc} = usePay(); payFunc({order_no,notify_url,TranAmt:price,MerName:brand,sign,plain_text}) } diff --git a/src/pages/ycnc/orderDetail.vue b/src/pages/ycnc/orderDetail.vue index 1d5e11b..9d3c4e4 100644 --- a/src/pages/ycnc/orderDetail.vue +++ b/src/pages/ycnc/orderDetail.vue @@ -48,9 +48,11 @@