Prechádzať zdrojové kódy

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

移除测试用的注释配置,启用 http://192.168.0.19:8080 开发服务器地址,
并注释掉生产环境API地址以避免冲突

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

修复manifest.json文件末尾多余的逗号导致的JSON格式错误

refactor(charge): 统一订单编号字段名称

将充电订单详情页面中的 chargeOrderNo 字段替换为 orderNumber,
确保字段命名的一致性

fix(charge): 修正订单计数显示格式

将充电订单计数的默认值从 '0.00' 改为 '0',避免显示不必要的小数位

refactor(smqjh): 调整充电订单状态处理逻辑

- 将 chargeOrderStatus 函数从 charge utils 移至本地 order-data 文件
- 修正订单状态字段引用,从 chargeOrder.status 改为 hbOrderStatus
- 增加订单状态文本颜色动态设置
- 更新 chargeOrderStatus 函数参数说明和状态码映射
- 添加默认状态处理以支持未知状态显示
```

zouzexu 1 týždeň pred
rodič
commit
75eeaaa8ec

+ 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',
   /**
    * 体验版
    */

+ 1 - 1
src/subPack-charge/chargeOrderDetail/chargeOrderDetail.vue

@@ -96,7 +96,7 @@ async function getOrderDetail() {
             订单编号
           </view>
           <view class="text-28rpx text-#AAA">
-            {{ chargeOrderDetail?.chargeOrderNo }}
+            {{ chargeOrderDetail?.orderNumber }}
           </view>
         </view>
         <view class="mt-28rpx flex items-center justify-between">

+ 1 - 1
src/subPack-charge/index/index.vue

@@ -137,7 +137,7 @@ function handleFilterClick(filterKey: number) {
                 充电订单
               </view>
               <view class="mt-24rpx text-28rpx text-#9ED605 font-500">
-                {{ userAccountInfo?.chargingOrderCount || '0.00' }}
+                {{ userAccountInfo?.chargingOrderCount || '0' }}
               </view>
             </view>
             <image class="h-80rpx w-80rpx" :src="`${StaticUrl}/charge-order.png`" />

+ 6 - 4
src/subPack-smqjh/components/charge-orderList/charge-orderList.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { chargeOrderStatus } from '@/subPack-charge/utils/index'
+import { chargeOrderStatus } from '../../order/order-data'
 import router from '@/router'
 import { StaticUrl } from '@/config'
 
@@ -44,12 +44,14 @@ function handleItemClick(item: Api.xsbOrderList) {
             终端编号:{{ item.chargeOrder?.connectorId || '未知' }}
           </view>
         </view>
-        <view class="text-center text-28rpx text-#4EDC86">
+        <view class="text-center text-28rpx">
           <image
             class="h-64rpx w-64rpx"
-            :src="`${StaticUrl}/${chargeOrderStatus(item.chargeOrder?.status).icon}.png`"
+            :src="`${StaticUrl}/${chargeOrderStatus(item.hbOrderStatus).icon}.png`"
           />
-          <view>{{ chargeOrderStatus(item.chargeOrder?.status).text }}</view>
+          <view :style="{ color: chargeOrderStatus(item.hbOrderStatus).color }">
+            {{ chargeOrderStatus(item.hbOrderStatus).text }}
+          </view>
         </view>
       </view>
       <view class="my-20rpx h-2rpx w-full bg-#F0F0F0" />

+ 14 - 5
src/subPack-smqjh/order/order-data.ts

@@ -35,31 +35,40 @@ export function handleCommonCancelOrder(order: any) {
 
 /**
  * 统一充电订单状态处理
- * @param order
+ * @param status 0:待充电,20:充电中,30:结算中,80:已完成
  */
 export function chargeOrderStatus(status: any) {
   const statusObj = { icon: '', text: '', color: '' }
   switch (status) {
+    // 0:待充电
     case 0:
-      statusObj.icon = 'charge-order-settlement'
+      statusObj.icon = 'charge-order-unknown'
       statusObj.text = '待充电'
       statusObj.color = '#FFA500'
       break
-    case 1:
+    // 20:充电中
+    case 20:
       statusObj.icon = 'charge-order-ing'
       statusObj.text = '充电中'
       statusObj.color = '#4EDC86'
       break
-    case 2:
+    // 30:结算中
+    case 30:
       statusObj.icon = 'charge-order-settlement'
       statusObj.text = '结算中'
       statusObj.color = '#3EB6F8'
       break
-    case 3:
+    // 80:已完成
+    case 80:
       statusObj.icon = 'charge-order-settled'
       statusObj.text = '已完成'
       statusObj.color = '#AAAAAA'
       break
+    default:
+      statusObj.icon = 'charge-order-unknown'
+      statusObj.text = '未知状态'
+      statusObj.color = '#CCCCCC'
+      break
   }
   return statusObj
 }