diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index 2a7dc5ab7..5fc1be790 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -87,7 +87,7 @@
我的订单
-
+
@@ -253,6 +253,11 @@
url: '/pagesHome/myPointsOrder/myPointsOrder'
})
}
+ if (num == 4) {
+ uni.navigateTo({
+ url: '/pagesHome/PointsMall/PointsMall'
+ })
+ }
},
// 查询全部充值订单
getAllOrderList() {
@@ -611,4 +616,4 @@
height: 100%;
}
}
-
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index 296790edf..5841f00a7 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -15,9 +15,9 @@
-->
-
-
+
收货人姓名
@@ -62,7 +62,7 @@
{{goodsInfo.giftName}}
- 市场价:{{goodsInfo.market}}
+ 数量:{{value}}
¥{{goodsInfo.exchangeAmount}}
-
-
-
+
-
- 共{{value}}件商品,合计:
- {{allPoints}} 积分
-
- +
- ¥{{allAmout}}
-
-
-
- 统一运费:
- ¥{{goodsInfo.shippingFeeAmount}}
-
-
-
+
- 备注
+ 订单备注
-
-
-
- {{allPoints}} 积分
- +
- ¥{{allAmout}}
-
- 积分账户{{myPoints}}
-
-
- 兑换
-
-
-
-
+
+
+
+
+
+ {{allPoints}} 积分
+ +
+ ¥{{allAmout}}
+
+
+
+
+ 立即支付
+
+
+
+
+
+
@@ -757,7 +740,7 @@
width: 100%;
display: flex;
align-items: center;
- justify-content: flex-end;
+
}
.btwo {
@@ -806,7 +789,7 @@
align-items: center;
justify-content: center;
color: #ffffff;
- border-radius: 4px;
- background: #1678ff;
+ border-radius: 50px;
+ background: #FF9655;
}
-
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetInfo/fund.vue b/gasStation-uni/pagesMy/fleetInfo/fund.vue
index 9d6105784..a44fbb75a 100644
--- a/gasStation-uni/pagesMy/fleetInfo/fund.vue
+++ b/gasStation-uni/pagesMy/fleetInfo/fund.vue
@@ -8,7 +8,7 @@
-
+
可用余额(元)
1299.00
@@ -260,14 +260,19 @@
.card_box {
width: 100%;
height: 90px;
- background: url('../../static/imgs/zj.png') no-repeat;
- background-size: 100% 100%;
+
+
box-sizing: border-box;
padding: 10px;
color: #fff;
font-size: 14px;
}
+ .c-url {
+ background: url('../../static/imgs/jf.png') no-repeat;
+ background-size: 100% 100%;
+ }
+
.r-size {
width: 100%;
display: flex;