From 980428ac1d0115e01873b7165ad25d1f3aa82258 Mon Sep 17 00:00:00 2001 From: xiaogang <825201136@qq.com> Date: Mon, 26 Aug 2024 17:19:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=BB=E4=BD=BF=E7=94=A8=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- custom.page.js | 4 ++-- env/.env | 2 +- src/pages.json | 5 +++-- src/pages/jlgh/coupon.vue | 4 ++-- src/pages/jlgh/orderDetail.vue | 33 +++++++++++++++++++-------------- src/pages/jlgh/redeem.vue | 13 +++++++++---- src/types/uni-pages.d.ts | 2 +- 8 files changed, 38 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 91c18bc..3197009 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ lerna-debug.log* node_modules .DS_Store -# dist +dist *.local # Editor directories and files diff --git a/custom.page.js b/custom.page.js index 41cb9c5..11de890 100644 --- a/custom.page.js +++ b/custom.page.js @@ -9,8 +9,8 @@ const config = { // pagesInclude: ['jlgh/coupon.vue', 'jlgh/redeem.vue'], // pagesInclude: ['jlgh/index.vue'], // pagesInclude: ['jlgh/login.vue'], - // pagesInclude: ['jlgh/orderDetail.vue'], - pagesInclude: ['index'], + pagesInclude: ['jlgh/orderDetail.vue'], + // pagesInclude: ['index'], } const { pages, pagesInclude } = config diff --git a/env/.env b/env/.env index 03af758..a0e6761 100644 --- a/env/.env +++ b/env/.env @@ -5,7 +5,7 @@ VITE_UNI_APPID = 'H57F2ACE4' VITE_WX_APPID = 'wxa2abb91f64032a2b' # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base -VITE_APP_PUBLIC_BASE = './' +VITE_APP_PUBLIC_BASE = ./ # 测试线上 VITE_SERVER_BASEURL = 'https://gateway.dev.cdlsxd.cn' # 曾徐平 diff --git a/src/pages.json b/src/pages.json index b010bf6..0a7aac6 100644 --- a/src/pages.json +++ b/src/pages.json @@ -16,11 +16,12 @@ }, "pages": [ { - "path": "pages/index/index", + "path": "pages/jlgh/orderDetail", "type": "home", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "首页" + "navigationBarTitleText": "订单详情", + "navigationBarBackgroundColor": "#FFF" } } ], diff --git a/src/pages/jlgh/coupon.vue b/src/pages/jlgh/coupon.vue index 1a98b79..addabc3 100644 --- a/src/pages/jlgh/coupon.vue +++ b/src/pages/jlgh/coupon.vue @@ -95,14 +95,14 @@ const gomypre = (item) => { }, '*', ) - } else if (item.order_no) { + } else if (item.order_id) { window.parent.postMessage( { data: { message: 'success', type: 'orderDetail', query: { - order_no: item.order_no, + order_id: item.order_id, }, }, }, diff --git a/src/pages/jlgh/orderDetail.vue b/src/pages/jlgh/orderDetail.vue index ef74ef2..0e31237 100644 --- a/src/pages/jlgh/orderDetail.vue +++ b/src/pages/jlgh/orderDetail.vue @@ -52,12 +52,13 @@ 去使用 + 我已完成支付,去刷新 ('') +const orderId = ref('') const activityCode = ref('') const orderInfo = reactive({}) const productInfo = reactive({}) @@ -144,9 +145,9 @@ onShow(async () => { function queryEvent() { // eslint-disable-next-line camelcase - const { order_no, activity_code } = getUrlParams() as any + const { order_id, activity_code } = getUrlParams() as any // eslint-disable-next-line camelcase - orderNo.value = order_no + orderId.value = order_id // eslint-disable-next-line camelcase activityCode.value = activity_code getDetail() @@ -156,6 +157,10 @@ function sleep(delay) { return new Promise((resolve) => setTimeout(resolve, delay)) } +function refresh() { + queryEvent() +} + function getUrlParams() { const url = window.location.href console.log('url-->', url) @@ -172,18 +177,12 @@ function getUrlParams() { return theRequest } -const backIndex = () => { - uni.navigateTo({ - url: `/pages/ycnc/index`, - }) -} - function clickEvent() { showPayConfig.value = false } function use() { - window.location.href = orderInfo.url + window.location.href = productInfo.url } async function toPay() { @@ -194,7 +193,7 @@ async function toPay() { const pay = throttle(async (item) => { // eslint-disable-next-line camelcase - const { order_no } = orderInfo + const order_no = orderInfo.order_no // eslint-disable-next-line camelcase const { pay_type, pay_center_channel_id } = item const params = { @@ -203,7 +202,7 @@ const pay = throttle(async (item) => { // eslint-disable-next-line camelcase pay_center_channel_id, // eslint-disable-next-line camelcase - ...(pay_type === 1 && { return_url: window.location.href }), + ...(pay_type === 1 && { return_url: window.location.href + '&isPayBack=true' }), } const res = await goPay(params) const { code, message, data } = res as any @@ -258,7 +257,7 @@ onMounted(() => {}) const getDetail = () => { const params = { - order_no: unref(orderNo), + id: unref(orderId), } queryOrderDetail(params).then((res: any) => { const { code, data, message } = res @@ -290,6 +289,12 @@ const getDetail = () => { // color: #9e9e9e; // } // } +.pay-tips { + position: fixed; + bottom: 30rpx; + color: #3232cd; + text-decoration: underline; +} .pay-top { display: flex; align-items: center; diff --git a/src/pages/jlgh/redeem.vue b/src/pages/jlgh/redeem.vue index 08169d4..a14e19a 100644 --- a/src/pages/jlgh/redeem.vue +++ b/src/pages/jlgh/redeem.vue @@ -151,6 +151,8 @@ const payConfig = { }, } // eslint-disable-next-line camelcase +const pay_order_id = ref('') +// eslint-disable-next-line camelcase const pay_order_no = ref('') // eslint-disable-next-line camelcase const wait_pay_amount = ref(0) @@ -224,18 +226,19 @@ function clickEvent() { } const payEvent = throttle(async (item) => { - console.log('item->>>>>', item) const contentData: any = await api.getContent({ activity_code: info.activity_code }) // eslint-disable-next-line camelcase const { pay_type, pay_center_channel_id } = item // eslint-disable-next-line camelcase const order_no = pay_order_no.value // eslint-disable-next-line camelcase + const order_id = pay_order_id.value + // eslint-disable-next-line camelcase const return_url = // eslint-disable-next-line camelcase contentData.data.order_detail_templates.source + // eslint-disable-next-line camelcase - `?order_no=${order_no}&activity_code=${info.activity_code}&isPayBack=true` + `?order_id=${order_id}&activity_code=${info.activity_code}&isPayBack=true` const params = { // eslint-disable-next-line camelcase order_no, @@ -264,7 +267,7 @@ const payEvent = throttle(async (item) => { // // eslint-disable-next-line camelcase // const { pay_type, pay_center_channel_id } = item // // eslint-disable-next-line camelcase -// const order_no = pay_order_no.value +// const order_no = pay_order_id.value // // eslint-disable-next-line camelcase // const return_url = // // eslint-disable-next-line camelcase @@ -311,12 +314,14 @@ async function dui() { uni.hideLoading() if (code === 200) { // eslint-disable-next-line camelcase - const { shortUrl, status, order_no, wait_amount } = data + const { shortUrl, status, order_id, order_no, wait_amount } = data // 待支付 if (status === 1) { const res2 = await api.getPayConfig({ activity_code: info.activity_code }) payList.value = (res2 as any).data // eslint-disable-next-line camelcase + pay_order_id.value = order_id + // eslint-disable-next-line camelcase pay_order_no.value = order_no // eslint-disable-next-line camelcase wait_pay_amount.value = wait_amount diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 2500f9c..ad99e08 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -4,7 +4,7 @@ // Generated by vite-plugin-uni-pages interface NavigateToOptions { - url: "/pages/index/index"; + url: "/pages/jlgh/orderDetail"; } interface RedirectToOptions extends NavigateToOptions {}