浏览代码

feat(page):新增后支付查看更多订单页面

Zhenghanjv 4 月之前
父节点
当前提交
d352ef42d9

+ 2 - 0
app.json

@@ -1,5 +1,7 @@
 {
   "pages": [
+    
+    "pages/moreOrder/moreOrder",
     "pages/orderConfirm/orderConfirm",
     "pages/historyOrder/historyOrder",
     "pages/scan/scan",

+ 1 - 1
components/orderItem/orderItem.wxml

@@ -5,7 +5,7 @@
     <text style="margin-left: 3%;color: #a7a7a7;font-size: smaller;">{{order.date}}</text>
     <view style="margin-right: 3%;" class="timeAndStatus">
       <text style="font-weight: 600;">{{order.time}}</text>
-      <text style="color: {{statusColor}};font-size: small;">{{order.status}}</text>
+      <text wx:if="{{order.status != ''}}" style="color: {{statusColor}};font-size: small;">{{order.status}}</text>
     </view>
   </view>
 

+ 145 - 0
pages/moreOrder/moreOrder.js

@@ -0,0 +1,145 @@
+// pages/moreOrder/moreOrder.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    orders:[
+      {
+        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'
+        }
+      },
+      {
+        buttonMessage2:'去支付',
+        buttonColor2:'#91cdcc',
+        order:{
+          oilName:"92#",
+          nozzleNum:'5',
+          volume:'20.0',
+          amount:'46.8',
+          date:'2024-11-24',
+          time:'09:08'
+        }
+      },
+    ]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+  
+  /** 点击去支付 */
+  toPay(event) {
+    console.log(event)
+    //跳转回支付页
+  }
+})

+ 5 - 0
pages/moreOrder/moreOrder.json

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

+ 11 - 0
pages/moreOrder/moreOrder.wxml

@@ -0,0 +1,11 @@
+<view class="moreOrderContainer">
+  <view class="order" wx:for="{{orders}}">
+    <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>
+</view>

+ 18 - 0
pages/moreOrder/moreOrder.wxss

@@ -0,0 +1,18 @@
+.moreOrderContainer{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.order{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 93%;
+}
+
+.orderItem{
+  width: 100%;
+  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  margin: 3%;
+  border-radius: 1%;
+}

+ 6 - 1
pages/orderConfirm/orderConfirm.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    type:'支付',
+    type:'支付',
     order:{
       oilName:"92#",
       nozzleNum:'5',
@@ -73,6 +73,11 @@ Page({
 
   },
 
+  /** 后支付查看更多交易 */
+  toMordOrderPage(){
+    console.log("跳转到更多交易页面");
+  },
+
   /** 支付按钮点击事件 */
   toPay(){
     console.log("点击了支付")

+ 1 - 1
pages/orderConfirm/orderConfirm.wxml

@@ -6,7 +6,7 @@
       <image src="../../images/question.svg"/>
       <text>不是我的交易?</text>
     </view>
-    <button>更多交易</button>
+    <button bind:tap="toMordOrderPage">更多交易</button>
   </view>
 
   <!-- 预支付提示 -->