Explorar el Código

```
feat(config): 更新开发环境API配置

- 注释掉旧的开发服务器地址 http://192.168.0.19:8080
- 启用 HTTPS 开发服务器地址 https://smqjh.api.zswlgz.com

refactor(integral): 重构积分页面UI样式和数据处理

- 替换内联样式的颜色值为 Tailwind CSS 的颜色类
- 添加业务类型标签映射列表用于显示正确的分类名称
- 实现 getLabel 函数用于获取业务类型对应的文字描述
- 修复积分记录中类型显示逻辑,结合业务类型进行展示

refactor(pages): 调整页面路由配置

- 移除视频权益相关子包页面配置
- 更新 uni-pages.d.ts 中的类型定义,同步移除对应的页面路径

fix(manifest): 修复 manifest.json 文件格式问题

- 修正 JSON 格式中的多余逗号问题
```

wenjie hace 6 días
padre
commit
26026276d1
Se han modificado 4 ficheros con 33 adiciones y 43 borrados
  1. 2 2
      src/config/index.ts
  2. 0 22
      src/pages.json
  3. 30 16
      src/subPack-common/integral/index.vue
  4. 1 3
      src/uni-pages.d.ts

+ 2 - 2
src/config/index.ts

@@ -6,12 +6,12 @@ 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.1.89:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
   // develop: 'http://47.109.84.152:8081',
-  // develop: 'https://smqjh.api.zswlgz.com',
+  develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */

+ 0 - 22
src/pages.json

@@ -472,28 +472,6 @@
           }
         }
       ]
-    },
-    {
-      "root": "subPack-videoRights",
-      "pages": [
-        {
-          "path": "commonTab/index",
-          "name": "video-rights-tabbar",
-          "islogin": false,
-          "style": {
-            "navigationBarTitleText": "",
-            "navigationStyle": "custom"
-          }
-        },
-        {
-          "path": "videoRightsDetail/videoRightsDetail",
-          "name": "video-rights-detail",
-          "islogin": false,
-          "style": {
-            "navigationBarTitleText": "详情"
-          }
-        }
-      ]
     }
   ]
 }

+ 30 - 16
src/subPack-common/integral/index.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+// import { navTabTypeList } from '@/subPack-smqjh/order/order-data'
+
 definePage({
   name: 'common-integral',
   islogin: true,
@@ -7,6 +9,14 @@ definePage({
     disableScroll: true,
   },
 })
+const navTabTypeList = [
+  { name: '全部', value: 'all' },
+  { name: '星闪豹', value: 'XSB' },
+  { name: '充电', value: 'CD' },
+  { name: '电影演出', value: 'DYY' },
+  { name: '视频权益', value: 'VIDEO' },
+  { name: '大牌点餐', value: 'SHOP' },
+]
 const { data: info } = useRequest(() =>
   Apis.xsb.findUserPoints({}),
 )
@@ -20,62 +30,66 @@ function handleScrollBottom() {
     page.value++
   }
 }
+
+function getLabel(val: string) {
+  return navTabTypeList.find(i => i.value === val)?.name || '未知类型'
+}
 </script>
 
 <template>
   <view class="pages pty24rpx">
-    <view class="grid grid-cols-4 w-full bg-white py24rpx">
+    <view class="grid grid-cols-4 w-full bg-white py-24rpx">
       <view class="flex flex-col items-center justify-center">
-        <view class="text-28rpx text-#AAAAAA">
+        <view class="text-28rpx text-[#AAAAAA]">
           总充值积分
         </view>
-        <view class="text-36rpx text-#222 font-semibold">
+        <view class="text-36rpx text-[#222] font-semibold">
           {{ info?.data?.pointsTotal || 0 }}
         </view>
       </view>
       <view class="flex flex-col items-center justify-center">
-        <view class="text-28rpx text-#AAAAAA">
+        <view class="text-28rpx text-[#AAAAAA]">
           当前可用积分
         </view>
-        <view class="text-36rpx text-#222 font-semibold">
+        <view class="text-36rpx text-[#222] font-semibold">
           {{ info?.data?.availablePointsTotal || 0 }}
         </view>
       </view>
       <view class="flex flex-col items-center justify-center">
-        <view class="text-28rpx text-#AAAAAA">
+        <view class="text-28rpx text-[#AAAAAA]">
           已过期积分
         </view>
-        <view class="text-36rpx text-#222 font-semibold">
+        <view class="text-36rpx text-[#222] font-semibold">
           {{ info?.data?.expiryPointsTotal || 0 }}
         </view>
       </view>
       <view class="flex flex-col items-center justify-center">
-        <view class="text-28rpx text-#AAAAAA">
+        <view class="text-28rpx text-[#AAAAAA]">
           已消耗积分
         </view>
-        <view class="text-36rpx text-#222 font-semibold">
+        <view class="text-36rpx text-[#222] font-semibold">
           {{ info?.data?.consumePointsTotal || 0 }}
         </view>
       </view>
     </view>
-    <view class="px24rpx py20rpx">
+    <view class="px-24rpx py-20rpx">
       可用积分记录
     </view>
     <scroll-view scroll-y class="view" @scrolltolower="handleScrollBottom">
-      <view v-for="item, index in pointList" :key="item.pointsId" class="bg-white p24rpx">
+      <view v-for="item, index in pointList" :key="item.pointsId" class="bg-white p-24rpx">
         <view class="flex items-center justify-between text-32rpx font-semibold">
-          <view class="text-#222">
-            {{ type[Number(item.pointsType) - 1] || '未知状态' }}
+          <view class="text-[#222]">
+            {{ (type[Number(item.pointsType) - 1] == '下单' ? getLabel(item.businessType) : type[Number(item.pointsType) - 1]) || '未知状态' }}
           </view>
-          <view class="text-#FF4A39">
+          <view class="text-[#FF4A39]">
             {{ item?.variablePoints || 0 }}
           </view>
         </view>
-        <view class="mt20rpx flex items-center justify-between text-28rpx text-#AAAAAA">
+        <view class="mt-20rpx flex items-center justify-between text-28rpx text-[#AAAAAA]">
           <view>{{ item?.creationDate }}</view>
           <view>当前可用积分 {{ item?.currentlyAvailablePoints || 0 }}</view>
         </view>
-        <view v-if="index < pointList.length - 1" class="mt24rpx h-2rpx w-full bg-#F0F0F0" />
+        <view v-if="index < pointList.length - 1" class="mt-24rpx h-2rpx w-full bg-[#F0F0F0]" />
       </view>
       <StatusTip v-if="!pointList.length" tip="暂无内容" />
     </scroll-view>

+ 1 - 3
src/uni-pages.d.ts

@@ -43,9 +43,7 @@ interface NavigateToOptions {
        "/subPack-charge/chargeSearchList/chargeSearchList" |
        "/subPack-charge/chargeSiteDetail/chargeSiteDetail" |
        "/subPack-charge/chargeStart/chargeStart" |
-       "/subPack-charge/index/index" |
-       "/subPack-videoRights/commonTab/index" |
-       "/subPack-videoRights/videoRightsDetail/videoRightsDetail";
+       "/subPack-charge/index/index";
 }
 interface RedirectToOptions extends NavigateToOptions {}