diff --git a/gasStation-uni/pages/my/icon/newmy.png b/gasStation-uni/pages/my/icon/newmy.png
new file mode 100644
index 000000000..9e57902b8
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy1.png b/gasStation-uni/pages/my/icon/newmy1.png
new file mode 100644
index 000000000..7909561b5
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy1.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy10.png b/gasStation-uni/pages/my/icon/newmy10.png
new file mode 100644
index 000000000..9b66d448e
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy10.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy11.png b/gasStation-uni/pages/my/icon/newmy11.png
new file mode 100644
index 000000000..dce201c3f
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy11.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy12.png b/gasStation-uni/pages/my/icon/newmy12.png
new file mode 100644
index 000000000..5ebf14039
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy12.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy2.png b/gasStation-uni/pages/my/icon/newmy2.png
new file mode 100644
index 000000000..a790a0414
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy2.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy3.png b/gasStation-uni/pages/my/icon/newmy3.png
new file mode 100644
index 000000000..3c9efcd2e
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy3.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy4.png b/gasStation-uni/pages/my/icon/newmy4.png
new file mode 100644
index 000000000..19e07436e
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy4.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy5.png b/gasStation-uni/pages/my/icon/newmy5.png
new file mode 100644
index 000000000..32a0ec5af
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy5.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy6.png b/gasStation-uni/pages/my/icon/newmy6.png
new file mode 100644
index 000000000..6510fcb4a
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy6.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy7.png b/gasStation-uni/pages/my/icon/newmy7.png
new file mode 100644
index 000000000..2deb477b9
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy7.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy8.png b/gasStation-uni/pages/my/icon/newmy8.png
new file mode 100644
index 000000000..92bbd176b
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy8.png differ
diff --git a/gasStation-uni/pages/my/icon/newmy9.png b/gasStation-uni/pages/my/icon/newmy9.png
new file mode 100644
index 000000000..36f27669e
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmy9.png differ
diff --git a/gasStation-uni/pages/my/icon/newmyc.png b/gasStation-uni/pages/my/icon/newmyc.png
new file mode 100644
index 000000000..fed5398ca
Binary files /dev/null and b/gasStation-uni/pages/my/icon/newmyc.png differ
diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index db68f4fce..67cddc895 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -9,83 +9,41 @@
-
-
+
+
- {{user.mobile?user.mobile:"点击登录"}}
-
- {{store.name}}{{store.description ? "("+store.description+")" : ""}}
-
+ 点击登录
+
- 会员等级
-
-
-
- 储值余额
- {{cardBalance || 0 }}元
-
- |
-
- 锁价次数
- {{countList.length || 0 }}次
-
- |
-
- 卡券
- {{cardsList.length || 0 }}
-
- |
-
- 我的积分
- {{myPoints || 0 }}
-
-
-
-
-
-
- 我的订单
-
+
+ 储值余额
+ {{cardBalance || 0 }}元
-
-
-
-
-
-
-
- 待支付
-
+ |
+
+ 锁价次数
+ {{countList.length || 0 }}次
-
-
-
-
-
-
- 已完成
-
+ |
+
+ 卡券
+ {{cardsList.length || 0 }}
-
-
-
-
-
- 待评价
-
+ |
+
+ 我的积分
+ {{myPoints || 0 }}
+
- 我的服务
+
@@ -403,7 +361,7 @@
.my-header {
width: 100%;
height: 88px;
- background: #304fff;
+ background: #FF9655;
display: flex;
align-items: center;
justify-content: center;
@@ -418,9 +376,9 @@
}
.my-top {
- height: 150px;
+ height: 80px;
width: 100%;
- background: #304fff;
+ background: #FF9655;
box-sizing: border-box;
padding-top: 1px;
}
@@ -436,11 +394,15 @@
display: flex;
justify-content: space-between;
align-items: center;
+ background: #fff;
+ border-radius: 4px;
+ box-sizing: border-box;
+ padding: 20px;
}
.touxiang {
- width: 65px;
- height: 65px;
+ width: 50px;
+ height: 50px;
border-radius: 50%;
background-color: #ebf5ff;
overflow: hidden;
@@ -455,8 +417,9 @@
.user-tel {
font-weight: bold;
font-size: 20px;
- color: white;
+
margin-bottom: 5px;
+
}
.user-name {
@@ -520,6 +483,7 @@
align-items: center;
justify-content: space-between;
color: #404041;
+
}
.wrap-box {
@@ -540,7 +504,6 @@
}
.centenr-img {
-
margin: 2px auto;
image {
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index 8eef977e1..76f2a60ec 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -5,6 +5,7 @@
一键加油
-->
+
@@ -22,14 +23,18 @@
选择油品油枪
- 汽油92#1号枪
- 小王
+ 汽油92#1号枪
+ 小王
-
- 加油金额
+
+
+ 加油金额
+
+ 7.26元/L
- ￥200
+ ￥
+
36.55L
@@ -49,23 +54,41 @@
会员卡类型
- 储值卡（余额：6532.89）
+
+ 储值卡（余额：6532.89）
+
+
+
+
+
-
+
+
+
+
+
微信
-
+
+
+
优惠信息
-
+
优惠券
-20.00
@@ -185,18 +208,17 @@
-
-
@@ -349,7 +407,7 @@
export default {
data() {
return {
- selectCoupon: true,
+ selectCoupon: false,
cardType: false,
selectShow: false,
Selectemployees: false,
@@ -358,6 +416,7 @@
anIndex: 0,
qhindex: 0,
msg: "2",
+ RandR: false,
tabList: [{
name: '可用优惠券',
num: 1
@@ -487,6 +546,12 @@
},
methods: {
+ Couponclose() {
+ this.selectCoupon = false
+ },
+ setabIndex(index) {
+ this.tabIndex = index
+ },
cardTypeclose() {
this.cardType = false
},
@@ -512,7 +577,7 @@
},
Selectclose() {
- this.ConfirmPayment = false
+ this.Selectemployees = false
},
closePayment() {
this.ConfirmPayment = false
@@ -1216,6 +1281,8 @@
.leftIput {
box-sizing: border-box;
padding-left: 10px;
+ display: flex;
+ align-items: center;
}
.rr_box {
@@ -1492,10 +1559,17 @@
border: 1px solid #FA6400;
}
+ .couponBox_h {
+ width: 100%;
+ box-sizing: border-box;
+ padding: 10px;
+ margin: 15px auto;
+ border: 1px solid #999;
+ }
+
.cou_top {
width: 100%;
display: flex;
- align-items: center;
justify-content: space-between;
}
@@ -1505,14 +1579,20 @@
color: #E02020;
}
+ .c-h-num {
+ font-weight: 600;
+ font-size: 16px;
+ color: #999;
+ }
+
.c_title {
font-size: 14px;
color: #333333;
}
.qaz {
- width: 14px;
- height: 14px;
+ width: 12px;
+ height: 12px;
border-radius: 50%;
border: 1px solid #999999;
margin-right: 5px;
@@ -1522,10 +1602,52 @@
font-weight: 400;
font-size: 10px;
color: #E02020;
+ display: flex;
+ align-items: center;
+
+ }
+
+ .sm_h-zie {
+ font-weight: 400;
+ font-size: 10px;
+ color: #999;
+ display: flex;
+ align-items: center;
+
}
.sm_size {
font-size: 10px;
color: #333333;
+ width: 80%;
+ white-space: nowrap;
+ //不换行
+ overflow: hidden; //超出部分隐藏
+ text-overflow: ellipsis; //文本溢出显示省略号
}
-
+
+ .sb_size {
+ font-size: 10px;
+ color: #333333;
+ width: 80%;
+ white-space: nowrap; //不换行
+ overflow: hidden; //超出部分隐藏
+ text-overflow: ellipsis; //文本溢出显示省略号
+ }
+
+ .sb_xl {
+ white-space: pre-wrap !important;
+ }
+
+ .dashed_box {
+ width: 100%;
+ border-bottom: 1px dashed #E02020;
+ margin: 10px auto;
+ }
+
+ .dashed_box_h {
+ width: 100%;
+ border-bottom: 1px dashed #999;
+ margin: 10px auto;
+ }
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesLogin/login/login.vue b/gasStation-uni/pagesLogin/login/login.vue
index f85bc457f..9cb2a18ad 100644
--- a/gasStation-uni/pagesLogin/login/login.vue
+++ b/gasStation-uni/pagesLogin/login/login.vue
@@ -1,14 +1,13 @@
-