浏览代码

```
feat(config): 注释开发环境配置地址

fix(nav): 恢复加油功能显示并启用景区页面

fix(order-list): 修复订单列表组件初始化和样式问题

fix(attractions-order): 优化订单列表项样式和商品数量显示

fix(video-rights-order): 调整视频权益订单间距

fix(video-rights-tabs): 添加顶部偏移以适配导航栏
```

zouzexu 2 天之前
父节点
当前提交
d3a35b4c13

+ 1 - 1
src/config/index.ts

@@ -11,7 +11,7 @@ const mapEnvVersion = {
   // develop: 'http://192.168.0.11:8080', // 王
   // develop: 'http://192.168.0.11:8080', // 王
   // develop: 'http://192.168.1.89:8080', // 田
   // develop: 'http://192.168.1.89:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
   // develop: 'http://74949mkfh190.vicp.fun', // 付
-  develop: 'http://47.109.84.152:8081',
+  // develop: 'http://47.109.84.152:8081',
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
   // develop: 'https://smqjh.api.zswlgz.com',
   // develop: 'https://smqjh.api.zswlgz.com',
   /**
   /**

+ 2 - 2
src/pages/index/index.vue

@@ -60,8 +60,8 @@ const navList = computed(() => {
     { icon: `${StaticUrl}/smqjh-sp.png`, title: '电影演出', name: 'film-index', show: true },
     { icon: `${StaticUrl}/smqjh-sp.png`, title: '电影演出', name: 'film-index', show: true },
     { icon: `${StaticUrl}/smqjh-vip.png`, title: '视频权益', name: 'video-rights-tabbar', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-vip.png`, title: '视频权益', name: 'video-rights-tabbar', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-djk.png`, title: '大健康', name: 'djk-homeTabbar', show: true },
     { icon: `${StaticUrl}/smqjh-djk.png`, title: '大健康', name: 'djk-homeTabbar', show: true },
-    { icon: `${StaticUrl}/smqjh-jiayou.png`, title: '加油', name: 'refueling-tabbar', show: true }, // refueling-tabbar
-    { icon: `${StaticUrl}/smqjh-attractions.png`, title: '景区', name: '', show: !isOnlineAudit.value },
+    { icon: `${StaticUrl}/smqjh-jiayou.png`, title: '加油', name: 'refueling-tabbar', show: true },
+    { icon: `${StaticUrl}/smqjh-attractions.png`, title: '景区', name: 'attractions-tabbar', show: true },
     { icon: `${StaticUrl}/smqjh-diancan.png`, title: '大牌点餐', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-diancan.png`, title: '大牌点餐', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-jiudian.png`, title: '酒店民宿', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-jiudian.png`, title: '酒店民宿', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-daijia.png`, title: '代驾', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-daijia.png`, title: '代驾', name: '', show: !isOnlineAudit.value },

+ 6 - 9
src/subPack-attractions/commonTab/components/orderList.vue

@@ -21,7 +21,7 @@ const { data: orderList, isLastPage, page, error, refresh, reload } = usePaginat
   pageSize,
   pageSize,
   orderStatus: statusMap[tab.value],
   orderStatus: statusMap[tab.value],
 } }), {
 } }), {
-  immediate: false,
+  immediate: true,
   pageNum: 1,
   pageNum: 1,
   pageSize: 10,
   pageSize: 10,
   initialData: [],
   initialData: [],
@@ -55,19 +55,16 @@ const state = computed(() => {
       safe-area-inset-top fixed
       safe-area-inset-top fixed
     />
     />
     <view :style="{ paddingTop: `${(Number(statusBarHeight) || 44) + MenuButtonHeight + 12}px` }" />
     <view :style="{ paddingTop: `${(Number(statusBarHeight) || 44) + MenuButtonHeight + 12}px` }" />
-    <wd-tabs v-model="tab" animated custom-style="background-color: transparent;" @click="handleClick">
+    <wd-tabs v-model="tab" :offset-top="statusBarHeight + MenuButtonHeight + 12" sticky custom-style="background-color: transparent;" @click="handleClick">
       <block v-for="(item, index) in tabsList" :key="index">
       <block v-for="(item, index) in tabsList" :key="index">
         <wd-tab :title="item">
         <wd-tab :title="item">
-          <view class="box-border px24rpx" style="background-color: #f6f6f6; min-height: 60vh;">
+          <view class="box-border w-full overflow-hidden px24rpx">
             <view class="h-20rpx" />
             <view class="h-20rpx" />
             <StatusTip v-if="!orderList.length" tip="暂无内容" />
             <StatusTip v-if="!orderList.length" tip="暂无内容" />
-            <attractionsList
-              v-for="order in orderList"
-              :key="order.orderNumber"
-              :order="order"
-            />
+            <view v-for="order in orderList" :key="order.orderNumber" class="w-full overflow-hidden">
+              <attractionsList :order="order" />
+            </view>
             <wd-loadmore :state="state" :loading-props="{ color: '#9ED605', size: 20 }" @reload="reload" />
             <wd-loadmore :state="state" :loading-props="{ color: '#9ED605', size: 20 }" @reload="reload" />
-            <!-- 底部安全区域占位 -->
             <view class="h-40rpx" />
             <view class="h-40rpx" />
           </view>
           </view>
         </wd-tab>
         </wd-tab>

+ 7 - 7
src/subPack-smqjh/components/attractions-orderList/attractions-orderList.vue

@@ -24,8 +24,8 @@ const statusInfo = computed(() => {
 </script>
 </script>
 
 
 <template>
 <template>
-  <view class="mb-20rpx rounded-16rpx bg-#FFF p-24rpx" @click="handleOrderClick(order)">
-    <view class="flex items-center justify-between">
+  <view class="mb-20rpx box-border w-full overflow-hidden rounded-16rpx bg-#FFF p-24rpx" @click="handleOrderClick(order)">
+    <view class="w-full flex items-center justify-between">
       <view class="text-32rpx font-bold">
       <view class="text-32rpx font-bold">
         {{ order?.orderScenic.viewName }}
         {{ order?.orderScenic.viewName }}
       </view>
       </view>
@@ -33,12 +33,12 @@ const statusInfo = computed(() => {
         {{ statusInfo.text }}
         {{ statusInfo.text }}
       </view>
       </view>
     </view>
     </view>
-    <view class="mt-20rpx flex items-center gap-20rpx">
-      <image v-if="order?.orderScenic.img" :src="order?.orderScenic.img" class="h-160rpx w-160rpx rounded-8rpx" mode="aspectFill" />
-      <view v-else class="h-160rpx w-160rpx flex items-center justify-center rounded-8rpx bg-#f5f5f5 text-#999">
+    <view class="mt-20rpx w-full flex items-center gap-20rpx">
+      <image v-if="order?.orderScenic.img" :src="order?.orderScenic.img" class="h-160rpx w-160rpx flex-shrink-0 rounded-8rpx" mode="aspectFill" />
+      <view v-else class="h-160rpx w-160rpx flex flex-shrink-0 items-center justify-center rounded-8rpx bg-#f5f5f5 text-#999">
         暂无图片
         暂无图片
       </view>
       </view>
-      <view class="flex-1">
+      <view class="min-w-0 flex-1">
         <view class="line-clamp-2 text-28rpx font-bold">
         <view class="line-clamp-2 text-28rpx font-bold">
           {{ order?.orderScenic.productName }}
           {{ order?.orderScenic.productName }}
         </view>
         </view>
@@ -49,7 +49,7 @@ const statusInfo = computed(() => {
     </view>
     </view>
     <view class="mt-24rpx flex items-center justify-between text-24rpx text-#999">
     <view class="mt-24rpx flex items-center justify-between text-24rpx text-#999">
       <view>订单编号:{{ order?.orderNumber }}</view>
       <view>订单编号:{{ order?.orderNumber }}</view>
-      <view>共1件商品</view>
+      <view>共{{ order?.orderScenic.num }}件商品</view>
     </view>
     </view>
     <view class="mt-20rpx flex items-center justify-between">
     <view class="mt-20rpx flex items-center justify-between">
       <view class="text-24rpx text-#999">
       <view class="text-24rpx text-#999">

+ 1 - 1
src/subPack-smqjh/components/videoRights-orderList/videoRights-orderList.vue

@@ -21,7 +21,7 @@ function handleItemClick(item: Api.xsbOrderList) {
 </script>
 </script>
 
 
 <template>
 <template>
-  <view class="mb-28rpx rounded-16rpx bg-#FFF p-24rpx" @click="handleItemClick(order)">
+  <view class="mb-20rpx rounded-16rpx bg-#FFF p-24rpx" @click="handleItemClick(order)">
     <view class="flex items-center justify-between">
     <view class="flex items-center justify-between">
       <view class="text-28rpx">
       <view class="text-28rpx">
         {{ order.createTime }}
         {{ order.createTime }}

+ 1 - 1
src/subPack-videoRights/commonTab/components/order.vue

@@ -50,7 +50,7 @@ function handleClick(e: any) {
       safe-area-inset-top fixed
       safe-area-inset-top fixed
     />
     />
     <view :style="{ paddingTop: `${(Number(statusBarHeight) || 44) + MenuButtonHeight + 12}px` }" />
     <view :style="{ paddingTop: `${(Number(statusBarHeight) || 44) + MenuButtonHeight + 12}px` }" />
-    <wd-tabs v-model="tab" animated @click="handleClick">
+    <wd-tabs v-model="tab" :offset-top="statusBarHeight + MenuButtonHeight + 12" animated @click="handleClick">
       <block v-for="item in tabsList" :key="item">
       <block v-for="item in tabsList" :key="item">
         <wd-tab :title="item">
         <wd-tab :title="item">
           <view class="box-border bg-#f6f6f6 px24rpx">
           <view class="box-border bg-#f6f6f6 px24rpx">