订单详情页新增去使用按钮，状态刷新按钮

.gitignore

@@ -9,7 +9,7 @@ lerna-debug.log*
 
 node_modules
 .DS_Store
-# dist
+dist
 *.local
 
 # Editor directories and files

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

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'
 # 曾徐平

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"
       }
     }
   ],

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,
           },
         },
       },

src/pages/jlgh/orderDetail.vue

@@ -52,12 +52,13 @@
       <view
         class="btn pwd"
         @click="use"
-        v-if="[1].includes(productInfo.url) && [1].includes(productInfo.product_form)"
+        v-if="productInfo.url && [1].includes(productInfo.product_form)"
       >
         去使用
       </view>
       <!-- <view class="btn back" @click="backIndex">返回首页</view> -->
     </view>
+    <view class="pay-tips" @click="refresh" v-if="pageType == 3">我已完成支付,去刷新</view>
     <wd-popup
       v-model="showPayConfig"
       position="bottom"
@@ -92,7 +93,7 @@ import { queryOrderDetail, goPay, getPayConfig } from './api'
 import { debounce, throttle } from '@/utils/index'
 // import { useUserStore } from '@/store'
 
-const orderNo = ref<string>('')
+const orderId = ref<string>('')
 const activityCode = ref<string>('')
 const orderInfo = reactive<any>({})
 const productInfo = reactive<any>({})
@@ -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;

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

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 {}