From 280a4e983d4ad9fe3f119a132a83d09605ebdfe3 Mon Sep 17 00:00:00 2001
From: rui <1593038819@qq.com>
Date: Mon, 29 Jul 2019 23:49:40 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9][?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/couponorder/index/index.wxss | 2 +-
pages/integralmall/index.js | 5 ++---
pages/integralmall/index.wxss | 2 +-
pages/managelicenseplate/managelicenseplate.wxml | 4 +++-
pages/managelicenseplate/managelicenseplate.wxss | 10 +++++-----
pages/order/detail/index.wxml | 8 +++++---
pages/order/detail/index.wxss | 11 +++++++++--
pages/passCar/couponList/couponList.js | 1 +
pages/passCar/couponList/couponList.wxml | 2 +-
pages/passCar/couponList/couponList.wxss | 4 ++--
pages/passCar/passCar.wxml | 4 ++--
pages/passCar/passCar.wxss | 10 +++++-----
12 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index 75a0466..7a43cbb 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -76,7 +76,6 @@ button::after{ border: none; }
display: flex;
padding-bottom: 26rpx;
}
-
.expiretime {
text-align: left;
text-indent: 1em;
@@ -126,6 +125,7 @@ button::after{ border: none; }
}
.info view:nth-child(1) text {
+ text-indent: 0.6em;
font-size: 32rpx;
line-height: 32rpx;
height: 32rpx;
diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js
index 2cd4baf..f46dd4e 100644
--- a/pages/integralmall/index.js
+++ b/pages/integralmall/index.js
@@ -25,6 +25,7 @@ Page({
reloadIf: false,
creditAmount: 0,
score: '0',
+
},
goback: function () {
wx.switchTab({
@@ -69,7 +70,7 @@ Page({
showEdit: true
})
}
- console.log(res.data,22222222222)
+
that.setData({
score: res.data.score,
levelName: res.data.levelName,
@@ -106,7 +107,6 @@ Page({
pageSize: 1,
}
}).then(res => {
- console.log(res.data.list[0]),
wx.stopPullDownRefresh();
that.setData({
creditAmount: res.data.list[0].creditAmount,
@@ -129,7 +129,6 @@ Page({
},
getList(pageNum) {
var that = this;
- console.log(pageNum)
if (that.data.allow_load) {
that.setData({
loading: true,
diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss
index bd4834f..568e69d 100644
--- a/pages/integralmall/index.wxss
+++ b/pages/integralmall/index.wxss
@@ -46,12 +46,12 @@
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:9px 9px 9px 0px;
font-family:PingFangSC-Regular;
- font-size: 22rpx;
font-weight:400;
color:rgba(255,255,255,1);
line-height:32rpx;
float: left;
margin-top: 8rpx;
+ overflow: hidden;
}
.chengzhang {
font-size: 24rpx;
diff --git a/pages/managelicenseplate/managelicenseplate.wxml b/pages/managelicenseplate/managelicenseplate.wxml
index 93be7f9..809652f 100644
--- a/pages/managelicenseplate/managelicenseplate.wxml
+++ b/pages/managelicenseplate/managelicenseplate.wxml
@@ -18,6 +18,8 @@
- 我的爱车
+
+ 添加车牌
+
车辆入场后,才能绑车牌
\ No newline at end of file
diff --git a/pages/managelicenseplate/managelicenseplate.wxss b/pages/managelicenseplate/managelicenseplate.wxss
index 7e8bef0..3c4007e 100644
--- a/pages/managelicenseplate/managelicenseplate.wxss
+++ b/pages/managelicenseplate/managelicenseplate.wxss
@@ -86,7 +86,7 @@ page {
width: 680rpx;
margin: 0 auto;
font-size: 36rpx;
- border: 2rpx dashed #979797;
+ border: 2rpx dashed #FD832D;
border-radius: 16rpx;
padding-bottom: 40rpx;
height: 202rpx;
@@ -183,7 +183,7 @@ page {
}
.swiper-item > view {
- background: #bbe6ff;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius: 12rpx;
padding: 6rpx;
}
@@ -195,7 +195,7 @@ page {
margin: 0 auto;
float: right;
border-radius: 12rpx;
- background: #00c0ff;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border: 3px solid #fff;
position: relative;
}
@@ -205,7 +205,7 @@ page {
height: 180rpx;
line-height: 180rpx;
float: left;
- background: #00c0ff;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius: 12rpx;
border: 3px solid #fff;
text-align: center;
@@ -533,7 +533,7 @@ button::after {
.myCars {
font-size: 34rpx;
- color: #02c0ff;
+ color: #FD832D;
letter-spacing: 0;
text-align: center;
padding-top: 58rpx;
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 58f8f83..ca0def3 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -86,9 +86,11 @@
{{order.price/100}}小时
-->
- 实付金额:
- ¥
- {{order.payment/100}}
+ 实付金额:
+
+ ¥
+ {{order.payment/100}}
+
diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss
index b5c202c..a070f10 100644
--- a/pages/order/detail/index.wxss
+++ b/pages/order/detail/index.wxss
@@ -203,6 +203,7 @@ page {
.classif > view text:nth-child(1) {
font-size: 28rpx;
color: #A6A6A6;
+ float: left;
}
.classif > view:nth-child(1) {
@@ -418,16 +419,22 @@ radio {
width: 350rpx;
height: 350rpx;
}
+.left{
+ float: left;
+}
+.right{
+ float:right;
+}
.RMB{
color: #FD782D !important;
font-size: 24rpx !important;
- position: absolute;
- right: 65rpx
+ float: right;
}
.jine {
color: #FD782D !important;
font-size: 36rpx !important;
font-weight: 400 !important;
+ float: right;
}
.jine1 {
diff --git a/pages/passCar/couponList/couponList.js b/pages/passCar/couponList/couponList.js
index 9576037..7ac376d 100644
--- a/pages/passCar/couponList/couponList.js
+++ b/pages/passCar/couponList/couponList.js
@@ -5,6 +5,7 @@ const Http = require("../../../utils/HttpBasics");
const imgurl = require("../../../utils/imgurl");
Page({
data: {
+ noCoupon:imgurl.noCoupon.url,
couponUrl: imgurl.coupon.url,
linessUrl: imgurl.liness.url,
loadingUrl: imgurl.loading.url,
diff --git a/pages/passCar/couponList/couponList.wxml b/pages/passCar/couponList/couponList.wxml
index 349c358..ed09a19 100644
--- a/pages/passCar/couponList/couponList.wxml
+++ b/pages/passCar/couponList/couponList.wxml
@@ -5,7 +5,7 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
diff --git a/pages/passCar/couponList/couponList.wxss b/pages/passCar/couponList/couponList.wxss
index 00bbe33..9fb56d8 100644
--- a/pages/passCar/couponList/couponList.wxss
+++ b/pages/passCar/couponList/couponList.wxss
@@ -168,7 +168,7 @@
}
.nocoupon button {
- background: #00c0ff;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
color: #fff;
font-size: 36rpx;
width: 100%;
@@ -204,7 +204,7 @@
margin: auto;
width: 670rpx;
border-radius: 60rpx;
- background: #02c0ff;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
font-size: 32px;
color: #fff;
text-align: center;
diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml
index f8a85c4..434558f 100644
--- a/pages/passCar/passCar.wxml
+++ b/pages/passCar/passCar.wxml
@@ -37,7 +37,6 @@
{{timecha}}
-
券优惠券:
@@ -67,7 +66,8 @@
- 我的爱车
+
+ 添加车牌
车辆入场后,才能绑车牌
diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss
index 2c945cf..3b59fdd 100644
--- a/pages/passCar/passCar.wxss
+++ b/pages/passCar/passCar.wxss
@@ -112,7 +112,7 @@ page {
width: 680rpx;
margin: 0 auto;
font-size: 36rpx;
- border: 2rpx dashed #979797;
+ border: 2rpx dashed #FD832D;
border-radius: 16rpx;
padding-bottom: 40rpx;
height: 202rpx;
@@ -212,7 +212,7 @@ page {
}
.swiper-item .clearfix1 {
- background: #bbe6ff;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius: 12rpx;
padding: 6rpx;
}
@@ -233,7 +233,7 @@ page {
height: 180rpx;
line-height: 180rpx;
float: left;
- background: #00c0ff;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius: 12rpx;
border: 3px solid #fff;
text-align: center;
@@ -398,7 +398,7 @@ page {
}
.buy {
- background: #00c0ff;
+ background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
height: 88rpx;
width: 73%;
margin: 0 auto;
@@ -601,7 +601,7 @@ button::after {
.orderBox .fr {
line-height: 70rpx;
font-size: 28rpx;
- color: #ff4949;
+ color: #FD832D;
}
.jians {