From 56f9356a48369079fb0c2b4f1e3b5016f18fe11b Mon Sep 17 00:00:00 2001
From: xiaogang <825201136@qq.com>
Date: Tue, 27 Aug 2024 18:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=94=AF=E4=BB=98=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=9C=B0=E5=9D=80=E4=BC=A0=E5=8F=82=EF=BC=8C=E7=94=B1?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom.page.js                 |  4 ++--
 env/.env                       |  2 +-
 env/.env.production            |  8 ++++----
 src/pages.json                 |  5 +++--
 src/pages/jlgh/coupon.vue      |  1 +
 src/pages/jlgh/orderDetail.vue |  6 ------
 src/pages/jlgh/redeem.vue      | 12 ------------
 src/types/uni-pages.d.ts       |  2 +-
 8 files changed, 12 insertions(+), 28 deletions(-)

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 a0e6761..03af758 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/env/.env.production b/env/.env.production
index 1196dbc..18f4087 100644
--- a/env/.env.production
+++ b/env/.env.production
@@ -7,12 +7,12 @@ VITE_SHOW_SOURCEMAP = false
 
 # VITE_APP_PUBLIC_BASE = ./
 # 测试线上
-# VITE_SERVER_BASEURL = 'https://gateway.dev.cdlsxd.cn'
+VITE_SERVER_BASEURL = 'https://gateway.dev.cdlsxd.cn'
 # 正式环境
-VITE_SERVER_BASEURL = 'https://scens.h5.86698.cn'
+# VITE_SERVER_BASEURL = 'https://scens.h5.86698.cn'
 
 # VITE_APP_PROXY = true
 # 测试线上
-# VITE_APP_PROXY_PREFIX = 'https://gateway.dev.cdlsxd.cn'
+VITE_APP_PROXY_PREFIX = 'https://gateway.dev.cdlsxd.cn'
 # 正式环境
-VITE_APP_PROXY_PREFIX = 'https://scens.h5.86698.cn'
+# VITE_APP_PROXY_PREFIX = 'https://scens.h5.86698.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 addabc3..aef1f27 100644
--- a/src/pages/jlgh/coupon.vue
+++ b/src/pages/jlgh/coupon.vue
@@ -78,6 +78,7 @@ const query = reactive<any>({
 
 const dui = (item) => {
   item.activity_code = query.activity_code
+  item.lottery_code = query.lottery_code
   uni.navigateTo({
     url: '/pages/jlgh/redeem?item=' + encodeURIComponent(JSON.stringify(item)),
   })
diff --git a/src/pages/jlgh/orderDetail.vue b/src/pages/jlgh/orderDetail.vue
index 0e31237..2e6b080 100644
--- a/src/pages/jlgh/orderDetail.vue
+++ b/src/pages/jlgh/orderDetail.vue
@@ -91,7 +91,6 @@
 import { onMounted, reactive, ref, unref } from 'vue'
 import { queryOrderDetail, goPay, getPayConfig } from './api'
 import { debounce, throttle } from '@/utils/index'
-// import { useUserStore } from '@/store'
 
 const orderId = ref<string>('')
 const activityCode = ref<string>('')
@@ -109,7 +108,6 @@ const payConfig = {
     label: '微信',
   },
 }
-// const useStore = useUserStore()
 const second = ref(5)
 const current = ref(0)
 
@@ -131,9 +129,6 @@ function countDown() {
 onShow(async () => {
   // eslint-disable-next-line camelcase
   const { isPayBack } = getUrlParams() as any
-  // uni.setNavigationBarTitle({
-  //   title: (useStore.getUserInfo.contentData as any).order_detail_templates.moduledesc,
-  // })
   if (isPayBack) {
     pageType.value = 1
     countDown()
@@ -202,7 +197,6 @@ 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 + '&isPayBack=true' }),
   }
   const res = await goPay(params)
   const { code, message, data } = res as any
diff --git a/src/pages/jlgh/redeem.vue b/src/pages/jlgh/redeem.vue
index a14e19a..d627ab8 100644
--- a/src/pages/jlgh/redeem.vue
+++ b/src/pages/jlgh/redeem.vue
@@ -134,7 +134,6 @@
 
 <script lang="ts" setup>
 import api from './api'
-// import { useUserStore } from '@/store'
 import { debounce, throttle } from '@/utils/index'
 const ismask = ref<boolean>(false)
 const info = reactive<any>({})
@@ -156,7 +155,6 @@ const pay_order_id = ref('')
 const pay_order_no = ref('')
 // eslint-disable-next-line camelcase
 const wait_pay_amount = ref(0)
-// const useStore = useUserStore()
 onLoad((options) => {
   const item = decodeURIComponent(options.item)
   Object.assign(info, JSON.parse(item))
@@ -226,26 +224,16 @@ function clickEvent() {
 }
 
 const payEvent = throttle(async (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_id=${order_id}&activity_code=${info.activity_code}&isPayBack=true`
   const params = {
     // eslint-disable-next-line camelcase
     order_no,
     // eslint-disable-next-line camelcase
     pay_center_channel_id,
-    // eslint-disable-next-line camelcase
-    ...(pay_type === 1 && { return_url }),
   }
   const res = await api.goPay(params)
   const { code, message, data } = res as any
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 {}