合并分支，ui修改

pages/historyOrder/historyOrder.js

@@ -10,24 +10,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    orders: [
-      {
-        order:{
-          status: '未支付',
-          statusColor: '#ff8d1a',
-          oilName: "hk",
-          nozzle: "1",
-          volume: "1",
-          amount: "1",
-          payAmount: "1",
-          discount: "1",
-          orderId: "1",
-          time: "2025-4-3",
-          price:'666'
-        },
-        bottonText2: ""
-      }
-    ],
+    orders: [],
     date: '',
     startDate: '',
     endDate: '',

pages/quantify/quantify.wxml

@@ -11,7 +11,7 @@
       <image style="position: relative; left: 25rpx; top: 0rpx; width: 218rpx; display: block; box-sizing: border-box" src="../../images/oiloil.png" mode="aspectFill" class="flip-image" />
       <view class="oilInfo">
         <text class="oil" style="position: relative; left: -8rpx; top: 0rpx">{{nozzleInfo.productName}}</text>
-        <text class="price" style="position: relative; left: -8rpx; top: 6rpx">￥{{nozzleInfo.productPrice}}/升</text>
+        <text class="price" style="position: relative; left: -8rpx; top: 6rpx">￥{{nozzleInfo.productPrice}}元/升</text>
       </view>
     </view>