Эх сурвалжийг харах

feat(page):修改更多订单页面为UI初稿

Zhenghanjv 2 сар өмнө
parent
commit
7ae1e9ad76

+ 1 - 1
app.json

@@ -1,12 +1,12 @@
 {
   "pages": [
     
+    "pages/moreOrder/moreOrder",
     "pages/orderConfirm/orderConfirm",
     "components/orderItemInfo/orderItemInfo",
     "pages/scan/scan",
     "pages/index/index",
     "pages/login/login",
-    "pages/moreOrder/moreOrder",
     "pages/historyOrder/historyOrder",
     "pages/login/load",
     "pages/logs/logs",

+ 8 - 66
pages/moreOrder/moreOrder.js

@@ -10,74 +10,16 @@ Page({
         buttonMessage2:'去支付',
         buttonColor2:'#91cdcc',
         order:{
+          nozzle:5,
           oilName:"92#",
-          nozzleNum:'5',
-          volume:'20.0',
-          amount:'46.8',
-          date:'2024-11-24',
-          time:'09:08'
+          volume:20.0,
+          amount:46.8,
+          payAmount:46.8,
+          discount:0.00,
+          orderId:'1',
+          time:'2024-11-24 09:08'
         }
-      },
-      {
-        buttonMessage2:'去支付',
-        buttonColor2:'#91cdcc',
-        order:{
-          oilName:"92#",
-          nozzleNum:'5',
-          volume:'20.0',
-          amount:'46.8',
-          date:'2024-11-24',
-          time:'09:08'
-        }
-      },
-      {
-        buttonMessage2:'去支付',
-        buttonColor2:'#91cdcc',
-        order:{
-          oilName:"92#",
-          nozzleNum:'5',
-          volume:'20.0',
-          amount:'46.8',
-          date:'2024-11-24',
-          time:'09:08'
-        }
-      },
-      {
-        buttonMessage2:'去支付',
-        buttonColor2:'#91cdcc',
-        order:{
-          oilName:"92#",
-          nozzleNum:'5',
-          volume:'20.0',
-          amount:'46.8',
-          date:'2024-11-24',
-          time:'09:08'
-        }
-      },
-      {
-        buttonMessage2:'去支付',
-        buttonColor2:'#91cdcc',
-        order:{
-          oilName:"92#",
-          nozzleNum:'5',
-          volume:'20.0',
-          amount:'46.8',
-          date:'2024-11-24',
-          time:'09:08'
-        }
-      },
-      {
-        buttonMessage2:'去支付',
-        buttonColor2:'#91cdcc',
-        order:{
-          oilName:"92#",
-          nozzleNum:'5',
-          volume:'20.0',
-          amount:'46.8',
-          date:'2024-11-24',
-          time:'09:08'
-        }
-      },
+      }
     ]
   },
 

+ 1 - 1
pages/moreOrder/moreOrder.json

@@ -1,5 +1,5 @@
 {
   "usingComponents": {
-    "orderItem":"../../components/orderItem/orderItem"
+    "orderItem":"../../components/orderItemInfo/orderItemInfo"
   }
 }

+ 6 - 5
pages/moreOrder/moreOrder.wxml

@@ -1,10 +1,11 @@
 <view class="moreOrderContainer">
+  <!-- 提示 -->
+  <view class="tip">
+    <icon color="#fbac15" type="warn" />
+    <text>请勿在油机旁使用手机</text>
+  </view>
   <view class="order" wx:for="{{orders}}">
-    <orderItem class="orderItem"
-    order="{{item.order}}" 
-    buttonMessage2="{{item.buttonMessage2}}"
-    buttonColor="{{item.buttonColor2}}"
-    bind:bottonEvent2="toPay" />
+    <orderItem class="orderItem" order="{{item.order}}" buttonMessage2="{{item.buttonMessage2}}" buttonColor="{{item.buttonColor2}}" bind:bottonEvent2="toPay" />
   </view>
 
   <text style="margin-top: 3%;margin-bottom: 10%;color: #b29a9a;">没有找到?请联系油站工作人员</text>

+ 13 - 0
pages/moreOrder/moreOrder.wxss

@@ -2,7 +2,20 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  background-color: #f2f2f2;
+  height: 100vh;
 }
+.tip{
+  display: flex;
+  align-self: flex-start;
+  margin: 3%;
+  width: 100%;
+}
+.tip text{
+  color: #fbac15;
+  margin-left: 3%;
+}
+
 .order{
   display: flex;
   flex-direction: column;