diff --git a/assets/img/add.png b/assets/img/add.png
new file mode 100644
index 0000000..a5b5646
Binary files /dev/null and b/assets/img/add.png differ
diff --git a/assets/img/quan.png b/assets/img/quan.png
index e32c557..8be3e1f 100644
Binary files a/assets/img/quan.png and b/assets/img/quan.png differ
diff --git a/assets/img/wenti.png b/assets/img/wenti.png
index 40a15d6..98cba54 100644
Binary files a/assets/img/wenti.png and b/assets/img/wenti.png differ
diff --git a/assets/img/wm01.jpg b/assets/img/wm01.jpg
index c36df7d..d3a2369 100644
Binary files a/assets/img/wm01.jpg and b/assets/img/wm01.jpg differ
diff --git a/assets/img/wm02.jpg b/assets/img/wm02.jpg
index b6ad053..7dddd5d 100644
Binary files a/assets/img/wm02.jpg and b/assets/img/wm02.jpg differ
diff --git a/assets/img/wm03.jpg b/assets/img/wm03.jpg
index 0840ef7..50ecc7a 100644
Binary files a/assets/img/wm03.jpg and b/assets/img/wm03.jpg differ
diff --git a/pages/addPark/addPark.json b/pages/addPark/addPark.json
index 71b6d17..9e30d0a 100644
--- a/pages/addPark/addPark.json
+++ b/pages/addPark/addPark.json
@@ -1,3 +1,3 @@
{
- "navigationBarTitleText": "绑定车牌"
+ "navigationBarTitleText": "添加车辆"
}
\ No newline at end of file
diff --git a/pages/addPark/addPark.wxss b/pages/addPark/addPark.wxss
index 4d5ec35..89a969f 100644
--- a/pages/addPark/addPark.wxss
+++ b/pages/addPark/addPark.wxss
@@ -133,13 +133,13 @@
line-height: 80rpx;
}
.addpark-button-gray{
- width: 710rpx;
- height: 80rpx;
+ width: 670rpx;
+ height: 94rpx;
margin: 0 auto;
background: #cbcccd;
color: #ffffff;
- border-radius: 10rpx;
- line-height: 80rpx;
+ border-radius: 60rpx;
+ line-height: 94rpx;
}
.addpark-back{
font-size: 30rpx;
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index a36c1eb..f70f319 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -311,9 +311,9 @@ Page({
that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功
console.log(res);
if (res.errMsg == "requestPayment:ok") {
- // wx.showTabBarRedDot({
- // index: 2
- // })
+ wx.showTabBarRedDot({
+ index: 2
+ })
wx.showToast({
title: "购买成功",
image: "./../../../assets/img/success.png",
@@ -390,9 +390,6 @@ Page({
} else {
// 免费券
that.payOrderUpdate(orderId, "0", 1);
- wx.showTabBarRedDot({
- index: 0
- });
console.log("小红点 小红点 小红点")
wx.setStorage({
key: 'couponNum',
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index b60e863..bbe892c 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -20,10 +20,9 @@
-
-
-
-
+
+
+
@@ -56,7 +55,7 @@
实付金额:
{{data.couponPrice/100}}
- 元
+ 元
下单时间:
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index c63c3c0..fb7b5be 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -3,7 +3,6 @@
width: 92%;
margin: 8% auto 6%;
border-radius: 16rpx;
- overflow: hidden;
}
page {
@@ -15,8 +14,8 @@ page {
width: 600rpx;
display: block;
border-radius: 10rpx;
- margin: 22rpx auto 0;
- padding: 30rpx 0 0;
+ margin: 38rpx auto 0;
+ padding: 0;
z-index: 10000000000;
}
@@ -51,7 +50,7 @@ page {
background: #fff;
height: 88rpx;
width: 100%;
- margin: 60rpx auto 0;
+ margin: 0 auto;
line-height: 88rpx;
border: 2rpx solid #ccc;
border-radius: 10px;
@@ -139,6 +138,7 @@ page {
height: 10rpx;
display: block;
width: 100%;
+ margin-top: 20rpx;
}
.time {
@@ -220,7 +220,7 @@ page {
overflow: hidden;
flex: 2;
border: 2rpx solid #e7e7e7;
- border-radius: 6rpx;
+ border-radius: 16rpx;
}
.posi_logo view:nth-child(1) image {
@@ -252,9 +252,8 @@ page {
}
.tit {
- padding: 24rpx 0 33rpx;
- border-bottom: 1rpx solid #eee;
- text-indent: 20rpx;
+ padding: 24rpx 0 0;
+ text-indent: 30rpx;
font-size: 24rpx;
color: #919191;
letter-spacing: 0;
@@ -327,7 +326,6 @@ page {
.note text:nth-of-type(2) {
width: 67%;
- padding-right: 1%;
font-size: 24rpx;
color: #333;
letter-spacing: 1.16rpx;
diff --git a/pages/couponorder/index/index.json b/pages/couponorder/index/index.json
index 3d9ed19..85a5c31 100644
--- a/pages/couponorder/index/index.json
+++ b/pages/couponorder/index/index.json
@@ -3,7 +3,5 @@
"i-tab": "../../../dist/tab/index",
"i-tabs": "../../../dist/tabs/index"
},
- "navigationBarTitleText": "我的优惠劵",
- "navigationBarBackgroundColor": "#fff",
- "navigationBarTextStyle": "black"
+ "navigationBarTitleText": "我的优惠劵"
}
\ No newline at end of file
diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml
index 5f184ca..873e410 100644
--- a/pages/couponorder/index/index.wxml
+++ b/pages/couponorder/index/index.wxml
@@ -26,8 +26,8 @@
{{item.subTitle}}
- 去使用
- 查看
+ 去使用
+ 查看
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index e3c1f33..c23a631 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -114,7 +114,10 @@
color: #02c0ff;
font-size: 28rpx;
}
-
+.active{
+ color:#fff;
+ background: #02c0ff;
+}
.txt1 {
font-size: 22rpx;
color: #333;
diff --git a/pages/index/rushToBuy/index.wxml b/pages/index/rushToBuy/index.wxml
index 986621b..b36c8da 100644
--- a/pages/index/rushToBuy/index.wxml
+++ b/pages/index/rushToBuy/index.wxml
@@ -1,5 +1,5 @@
- 限时抢购查看更多
+ 限时抢购查看全部
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 453f432..d8fc161 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -6,7 +6,7 @@
-
+
@@ -48,7 +48,7 @@
{{order.couponOrderId}}
-
+
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index 8753304..6334be3 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -11,7 +11,6 @@
left: 0;
right: 0;
text-align: center;
- background: #fff;
z-index: 10000000;
}
diff --git a/pages/orderquanma/index.wxml b/pages/orderquanma/index.wxml
index 305c2fb..43051ac 100644
--- a/pages/orderquanma/index.wxml
+++ b/pages/orderquanma/index.wxml
@@ -24,7 +24,7 @@
兑换码:{{code}}
-
+
购买须知:
diff --git a/pages/orderquanma/index.wxss b/pages/orderquanma/index.wxss
index 880b434..753069b 100644
--- a/pages/orderquanma/index.wxss
+++ b/pages/orderquanma/index.wxss
@@ -33,13 +33,14 @@ page {
height: 10rpx;
display: block;
width: 100%;
+ margin-top: 20rpx;
}
.panel, .zhuangtai image {
width: 600rpx;
background-color: #fff;
margin: 22rpx auto 0;
- padding: 30rpx 0;
+ padding: 0;
position: relative;
z-index: 10000000000;
}
@@ -92,7 +93,6 @@ page {
flex-direction: column;
justify-content: flex-end;
align-items: center;
- margin-top: 30rpx;
}
.qrcode > canvas {
@@ -119,7 +119,7 @@ page {
background: #fff;
height: 88rpx;
width: 100%;
- margin: 60rpx auto 0;
+ margin: 0 auto 60rpx;
line-height: 88rpx;
border: 2rpx solid #ccc;
border-radius: 10px;
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index 23b9749..2be1c6e 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -327,5 +327,19 @@ Page({
if (app.globalData.token && app.globalData.token != null) {
app.parkInitCallback(app.globalData.token);
}
- }
+ },
+ // 用户点击右上角分享
+ onShareAppMessage: function () {
+ return {
+ title: "富茂链客",
+ desc: "分享个小程序,希望你喜欢",
+ success: function (res) {
+ wx.showToast({
+ title: "分享成功",
+ duration: 1000,
+ icon: "success"
+ });
+ }
+ }}
+
});
diff --git a/pages/passCar/passCar.json b/pages/passCar/passCar.json
index 9e03f40..83aeba7 100644
--- a/pages/passCar/passCar.json
+++ b/pages/passCar/passCar.json
@@ -1,5 +1,5 @@
{
"component": true,
"usingComponents": {},
- "navigationBarTitleText": "车辆管理"
+ "navigationBarTitleText": "停车"
}
\ No newline at end of file
diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml
index 7223fa7..4f39f21 100644
--- a/pages/passCar/passCar.wxml
+++ b/pages/passCar/passCar.wxml
@@ -1,5 +1,15 @@
-
+
+
+
+ 我的爱车
+ 最多可添加3辆
+
+
+ 车辆管理
+
+
+
- 我的爱车
-
+
+ 我的爱车
+ 车辆入场后,才能绑车牌
@@ -39,7 +50,7 @@
我的停车券
-
+
@@ -57,7 +68,7 @@
常见问题
-
+
diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss
index 0ce8fb6..fce2e6b 100644
--- a/pages/passCar/passCar.wxss
+++ b/pages/passCar/passCar.wxss
@@ -1,127 +1,146 @@
/**passCar.wxss**/
-page{
- background-color: #f8f8f8;
+
+page {
+ background-color: #fff;
}
-.headBox{
+
+.headBox {
margin-top: 13rpx;
width: 750rpx;
height: 210rpx;
box-sizing: border-box;
padding: 30rpx 40rpx;
display: flex;
- background-color: white
+ background-color: white;
}
-.headBox image{
+
+.headBox image {
width: 150rpx;
height: 150rpx;
- margin:10rpx 30rpx 0 0;
- border-radius:16rpx;
+ margin: 10rpx 30rpx 0 0;
+ border-radius: 16rpx;
}
-.numberBox{
+
+.numberBox {
width: 400rpx;
- height: 150rpx
+ height: 150rpx;
}
-.titleName{
+
+.titleName {
line-height: 60rpx;
- height:60rpx;
+ height: 60rpx;
color: #666;
font-size: 32rpx;
width: 400rpx;
- word-break:break-all;
+ word-break: break-all;
text-align: justify;
margin-bottom: 10rpx;
}
-::-webkit-scrollbar{
-width: 0;
-height: 0;
-color: transparent;
+
+::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ color: transparent;
}
-.carLocation,.locationNumber{
+
+.carLocation, .locationNumber {
width: 400rpx;
height: 40rpx;
color: #666;
font-size: 24rpx;
line-height: 30rpx;
}
-.price{
+
+.price {
font-size: 28rpx;
}
-.borderBox{
+
+.borderBox {
width: 750rpx;
margin-top: 26rpx;
-
}
-.borderUp{
- padding: 50rpx;
- width: 650rpx;
- height: 50rpx;
- line-height: 50rpx;
+
+.borderUp {
+ width: 680rpx;
+ margin: 0 auto;
font-size: 36rpx;
- color: #333;
- border-bottom: 1rpx #f8f8f8 solid;
- background-color: white;
+}
+.myCar {
+ display: block;
+ text-align: center;
+ font-size: 34rpx;
+ color: #02c0ff;
+ letter-spacing: 0;
}
-.carNumber{
- height:50rpx;
- line-height:50rpx;
- font-size:50rpx;
- color:#cbcbcb;
- background-color:white;
- text-align:right;
- margin:0 0 0 440rpx;
- font-weight:800;
+
+.carNumber {
+ display: block;
+ height: 50rpx;
+ line-height: 50rpx;
+ text-align: center;
+ font-size: 26rpx;
+ color: #999;
+ letter-spacing: 0;
+ margin-top: 10rpx;
}
-.addBox{
+
+.addBox {
width: 750rpx;
height: 220rpx;
position: relative;
background-color: white;
}
-.add{
+
+.add {
position: absolute;
left: 50%;
top: 50%;
- transform: translate(-50%,-50%);
+ transform: translate(-50%, -50%);
font-size: 34rpx;
color: #666;
- border:2px dashed #eee;
+ border: 2px dashed #eee;
padding: 30rpx 50rpx;
- border-radius:16rpx;
+ border-radius: 16rpx;
}
-.add text{
+
+.add text {
font-size: 40rpx;
}
-.bottonBox{
+
+.bottonBox {
width: 750rpx;
margin-top: 50rpx;
}
-.textStyle{
+
+.textStyle {
background-color: white;
- height: 90rpx;
- line-height: 90rpx;
- padding-left: 130rpx;
- color: #333;
- font-size: 28rpx;
- letter-spacing: 1rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ padding-left: 92rpx;
border-bottom: 1rpx #f8f8f8 solid;
position: relative;
+ font-size: 30rpx;
+ color: #333;
+ letter-spacing: 1.16rpx;
}
-.textStyle image{
+
+.textStyle image {
width: 50rpx;
height: 50rpx;
top: 20rpx;
- left: 50rpx;
+ left: 27rpx;
position: absolute;
-
}
-.passNumberBox{
+
+.passNumberBox {
width: 750rpx;
position: relative;
background-color: white;
- border-bottom: 1rpx #f8f8f8 solid ;
+ border-bottom: 1rpx #f8f8f8 solid;
}
-.passNumber{
+
+.passNumber {
width: 400rpx;
height: 100rpx;
font-size: 32rpx;
@@ -130,48 +149,55 @@ color: transparent;
left: 55rpx;
position: absolute;
}
-.nopay{
+
+.nopay {
height: 80rpx;
line-height: 80rpx;
font-weight: 400;
}
-.number{
+
+.number {
font-size: 32rpx;
}
-.parkPrice{
+
+.parkPrice {
font-size: 30rpx;
font-weight: 500;
}
-.deleteButton{
+
+.deleteButton {
font-size: 28rpx;
line-height: 50rpx;
height: 50rpx;
top: 50%;
right: 30rpx;
position: absolute;
- transform: translate(0,-50%);
+ transform: translate(0, -50%);
color: white;
- background-color: #00c0ff!important;
-
+ background-color: #00c0ff !important;
}
-.deleteButton button{
- background-color: #00c0ff!important;
+
+.deleteButton button {
+ background-color: #00c0ff !important;
}
-.detail{
+
+.detail {
width: 32rpx;
height: 32rpx;
right: 34rpx;
top: 32rpx;
position: absolute;
}
-.detail image{
- width: 32rpx;
- height: 32rpx;
+
+.detail image {
+ width: 44rpx;
+ height: 44rpx;
position: absolute;
left: 0;
top: 0;
}
-.voucher{
+
+.voucher {
width: 90%;
padding: 0 5%;
background-color: #fff;
@@ -181,9 +207,10 @@ color: transparent;
margin: 0 0 12rpx 0;
border-bottom: 2rpx #fff solid;
display: flex;
- justify-content: space-between;
+ justify-content: space-between;;
}
-.textV1,.textV2{
+
+.textV1, .textV2 {
height: 58rpx;
width: 100rpx;
padding-top: 26rpx;
@@ -192,7 +219,8 @@ color: transparent;
font-size: 24rpx;
color: #333;
}
-.textV2{
+
+.textV2 {
margin-top: 0rpx;
padding: 0;
/* background-color: rgb(0, 192, 255); */
@@ -204,42 +232,49 @@ color: transparent;
border: 4rpx #fff solid;
margin-bottom: 20rpx;
}
-.textV3{
+
+.textV3 {
width: 225rpx;
}
+
/* .textV1{
position: absolute;
left: 10rpx;
top: 22rpx;
} */
+
/* .textV2{
position: absolute;
top: 22rpx;
right: 80rpx;
} */
-.choice{
+
+.choice {
width: 80rpx;
height: 80rpx;
position: relative;
}
-.choice image{
+
+.choice image {
position: absolute;
left: 50%;
top: 50%;
- transform: translate(-50%,-50%);
+ transform: translate(-50%, -50%);
width: 30rpx;
height: 30rpx;
}
+
.buy-view {
background: #fff;
position: relative;
padding-top: 10rpx;
- height:98rpx;
+ height: 98rpx;
bottom: 0rpx;
margin-top: 50rpx;
/* left: 0;
right: 0; */
}
+
.buy {
background: #00c0ff;
height: 88rpx;
@@ -252,11 +287,75 @@ color: transparent;
position: relative;
z-index: 100;
}
-.borderBox{
- width: 750rpx;
- margin-top: 26rpx;
+.borderBox {
+ width: 690rpx;
+ margin: 20rpx auto 0;
+ border: 2rpx dashed #979797;
+ border-radius: 16rpx;
+ height: 200rpx;
+}
+
+.carmanage {
+ position: relative;
+ width: 690rpx;
+ margin: 0 auto;
+ height: 88rpx;
+ line-height: 88rpx;
+ border-bottom: 1rpx solid #eee;
+}
+
+.carmanage .fr {
+ font-size: 28rpx;
+ color: #888;
+ letter-spacing: 1.16rpx;
+ text-align: right;
+ margin-right: 40rpx;
+}
+
+.fl {
+ float: left;
+}
+
+.fr {
+ float: right;
+}
+
+.carmanage .fl {
+ width: 400rpx;
+}
+
+.carmanage .fr image {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ margin: auto;
+ width: 44rpx;
+ height: 44rpx;
+}
+
+.carmanage image {
+ width: 40rpx;
+ vertical-align: middle;
+}
+
+.mycar {
+ display: inline-block;
+ margin-left: 20rpx;
+ font-size: 30rpx;
+ color: #333;
+ letter-spacing: 1.16rpx;
+}
+
+.num {
+ display: inline-block;
+ font-size: 26rpx;
+ color: #999;
+ letter-spacing: 0;
+ margin-left: 20rpx;
}
+
.orderBox {
width: 100%;
height: 100rpx;
@@ -270,51 +369,75 @@ color: transparent;
height: 100rpx;
position: relative;
}
-.priceBox{
+
+.priceBox {
width: 420rpx;
}
-.priceBox text{
+
+.priceBox text {
margin-top: 35rpx;
color: #333;
font-size: 24rpx;
margin-left: 50rpx;
display: block;
}
-.payBox{
+
+.payBox {
width: 250rpxpx;
}
-.payBox button{
+
+.payBox button {
width: 230rpx;
- border:0;
+ border: 0;
font-size: 32rpx;
margin-top: 13rpx;
margin-right: 20rpx;
background-color: lightgreen;
color: white;
}
-input{
- outline:none;
- border:none;
+
+input {
+ outline: none;
+ border: none;
list-style: none;
}
-button::after{
-border:none;
+
+button::after {
+ border: none;
}
-.right{
+
+.right {
width: 328rpx;
}
-.textRight{
+
+.textRight {
margin-left: 0;
margin-right: 25rpx;
text-align: right;
- font-size: 30rpx!important;
- color: red!important;
+ font-size: 30rpx !important;
+ color: red !important;
}
-.buyBox{
+
+.buyBox {
width: 750rpx;
height: 88rpx;
- position:absolute;
+ position: absolute;
left: 0;
top: 0;
z-index: 100000000;
-}
\ No newline at end of file
+}
+
+.myCars image {
+ width: 44rpx;
+ height: 44rpx;
+ vertical-align: middle;
+ margin-right: 14rpx;
+}
+
+.myCars {
+ font-size: 34rpx;
+ color: #02c0ff;
+ letter-spacing: 0;
+ text-align: center;
+ padding-top: 50rpx;
+}
diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js
index 8231d13..ab42924 100644
--- a/pages/rushToBuy/index.js
+++ b/pages/rushToBuy/index.js
@@ -8,7 +8,7 @@ Page({
*/
data: {
list: [],
- page: 2,
+ page: 1,
allow_load: true,
day: "",
hour: "",
@@ -108,7 +108,7 @@ Page({
that.setData({
list: []
});
- that.getList(2);
+ that.getList(1);
},
//限时抢购的详情页面
gotodetail: function (e) {
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 46c9eab..3efa3d1 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -67,7 +67,7 @@
- 版本号:2.0.0
+ 版本号:2.0.2
\ No newline at end of file