Jelajahi Sumber

```
feat(components): 移除WdCurtain组件并更新导航栏样式

- 移除WdCurtain组件的类型声明
- 在视频权益订单详情页添加自定义导航栏
- 调整订单页面顶部内边距以适配状态栏高度
- 实现订单页面返回功能,支持充值流程返回到指定页面
- 更新子包视频权益订单创建时传递topUp参数
- 修改加油页面支付逻辑从跳转小程序改为内部路由跳转

BREAKING CHANGE: WdCurtain组件已移除
```

zouzexu 3 minggu lalu
induk
melakukan
1c037c073b

+ 0 - 1
src/components.d.ts

@@ -25,7 +25,6 @@ declare module 'vue' {
     WdCircle: typeof import('wot-design-uni/components/wd-circle/wd-circle.vue')['default']
     WdConfigProvider: typeof import('wot-design-uni/components/wd-config-provider/wd-config-provider.vue')['default']
     WdCountDown: typeof import('wot-design-uni/components/wd-count-down/wd-count-down.vue')['default']
-    WdCurtain: typeof import('wot-design-uni/components/wd-curtain/wd-curtain.vue')['default']
     WdDivider: typeof import('wot-design-uni/components/wd-divider/wd-divider.vue')['default']
     WdIcon: typeof import('wot-design-uni/components/wd-icon/wd-icon.vue')['default']
     WdInput: typeof import('wot-design-uni/components/wd-input/wd-input.vue')['default']

+ 4 - 4
src/config/index.ts

@@ -6,22 +6,22 @@ const mapEnvVersion = {
   // develop: 'http://192.168.1.101:8080',
   // develop: 'http://192.168.0.157:8080',
   // develop: 'http://192.168.1.253:8080',
-  // develop: 'http://192.168.0.19:8080',
+  develop: 'http://192.168.0.19:8080', // 邓
   // develop: 'http://192.168.0.217:8080', // 黄
   // develop: 'http://192.168.0.11:8080', // 王
   // develop: 'http://192.168.1.89:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
   // develop: 'http://47.109.84.152:8081',
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
-  develop: 'https://smqjh.api.zswlgz.com',
+  // develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */
   // trial: "http://192.168.1.166:8080/jeecg-boot",
   // trial: 'http://192.168.0.157:8080',
-  // trial: 'http://47.109.84.152:8081',
+  trial: 'http://47.109.84.152:8081',
   // trial: 'http://192.168.1.166:8080',
-  trial: 'https://smqjh.api.zswlgz.com',
+  // trial: 'https://smqjh.api.zswlgz.com',
   /**
    * 正式版
    */

+ 2 - 1
src/pages.json

@@ -498,7 +498,8 @@
           "name": "video-rights-order-info",
           "islogin": true,
           "style": {
-            "navigationBarTitleText": "订单确认"
+            "navigationBarTitleText": "订单确认",
+            "navigationStyle": "custom"
           }
         },
         {

+ 8 - 6
src/subPack-refueling/commonTab/index.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import router from '@/router'
+
 definePage({
   name: 'refueling-tabbar',
   islogin: false,
@@ -9,12 +11,12 @@ definePage({
 
 function refuelingPay() {
   console.log('触发跳转')
-  // router.push({ name: 'refueling-webview' })
-  uni.navigateToMiniProgram({
-    appId: 'wx0d252f6ed9755862', // 滴滴加油小程序appId
-    path: 'packageA/pages/open-energy-pay/index?orderId=&tradeId=&appId=wx43b5b906cc30ed0b&path=/pages/index/index&envVersion=小程序回跳环境', // 滴滴加油收银台页面地址,需要拼接orderId和tradeId
-    envVersion: 'release', // 固定release
-  })
+  router.push({ name: 'refueling-webview' })
+  // uni.navigateToMiniProgram({
+  //   appId: 'wx0d252f6ed9755862', // 滴滴加油小程序appId
+  //   path: 'packageA/pages/open-energy-pay/index?orderId=&tradeId=&appId=wx43b5b906cc30ed0b&path=/pages/index/index&envVersion=小程序回跳环境', // 滴滴加油收银台页面地址,需要拼接orderId和tradeId
+  //   envVersion: 'release', // 固定release
+  // })
 }
 </script>
 

+ 25 - 1
src/subPack-videoRights/videoRightsOrderInfo/videoRightsOrderInfo.vue

@@ -3,17 +3,21 @@ import StatusDisplay from '../components/StatusDisplay.vue'
 import { StaticUrl } from '@/config'
 import router from '@/router'
 
+const { statusBarHeight, MenuButtonHeight } = storeToRefs(useSysStore())
 definePage({
   name: 'video-rights-order-info',
   islogin: true,
   style: {
     navigationBarTitleText: '订单确认',
+    navigationStyle: 'custom',
   },
 })
 
 const orderNo = ref('')
+const topUp = ref('')
 onLoad((options: any) => {
   orderNo.value = options.orderNo
+  topUp.value = options.topUp
   console.log(options, '页面数据')
 })
 onMounted(() => {
@@ -25,9 +29,29 @@ async function getOrderDetail() {
   const res = await Apis.videoRight.orderDetail({ data: { orderNumber: orderNo.value } })
   videoRightOrderDetail.value = res.data
 }
+
+function orderBack() {
+  const vrIndex = 'subPack-videoRights/commonTab/index'
+  const pages = getCurrentPages()
+  const targetPageIndex = pages.findIndex(page => page.route === vrIndex)
+  if (topUp.value === 'true') {
+    if (targetPageIndex !== -1) {
+      const delta = pages.length - targetPageIndex - 1
+      router.back({ delta, animationType: 'fade-out' })
+    }
+  }
+  else {
+    router.back()
+  }
+}
 </script>
 
 <template>
+  <wd-navbar
+    title="订单详情" custom-style="background-color:#FFF" :bordered="false" :z-index="99"
+    safe-area-inset-top left-arrow fixed @click-left="orderBack"
+  />
+  <view :style="{ paddingTop: `${(Number(statusBarHeight) || 44) + MenuButtonHeight + 12}px` }" />
   <view class="video-rights-order-info-page">
     <view class="box-border px24rpx">
       <view class="h-22rpx" />
@@ -100,7 +124,7 @@ async function getOrderDetail() {
       </view>
     </view>
     <view class="fixed bottom-0 h-174rpx w-full border-[1rpx_solid_#EEEEEE] bg-#FFF px-24rpx">
-      <wd-button custom-class="w-702rpx mt-10rpx" block size="large" @click="router.back()">
+      <wd-button custom-class="w-702rpx mt-10rpx" block size="large" @click="orderBack">
         返回
       </wd-button>
     </view>

+ 1 - 1
src/subPack-videoRights/videoRightsSubmitOrder/videoRightsSubmitOrder.vue

@@ -79,7 +79,7 @@ function submitPay() {
       useGlobalLoading().loading({ msg: '提交中...' })
       const res = await Apis.videoRight.orderCreate({ data: submitFrom.value })
       useGlobalLoading().close()
-      router.push({ name: 'video-rights-order-info', params: { orderNo: res.data } })
+      router.push({ name: 'video-rights-order-info', params: { orderNo: res.data, topUp: 'true' } })
     },
   })
 }