瀏覽代碼

[订单详情 邮戳 停车页面修改 立即抢购][修改]:我的订单详情页面邮戳图片的修改,立即抢购次改成查看全部,停车页面的修改

tags/2.2.4
meo 6 年之前
父節點
當前提交
178fc787ac
共有 25 個文件被更改,包括 291 次插入149 次删除
  1. 二進制
      assets/img/add.png
  2. 二進制
      assets/img/quan.png
  3. 二進制
      assets/img/wenti.png
  4. 二進制
      assets/img/wm01.jpg
  5. 二進制
      assets/img/wm02.jpg
  6. 二進制
      assets/img/wm03.jpg
  7. +1
    -1
      pages/addPark/addPark.json
  8. +4
    -4
      pages/addPark/addPark.wxss
  9. +3
    -6
      pages/coupon/detail/index.js
  10. +4
    -5
      pages/couponorder/detail/index.wxml
  11. +7
    -9
      pages/couponorder/detail/index.wxss
  12. +1
    -3
      pages/couponorder/index/index.json
  13. +2
    -2
      pages/couponorder/index/index.wxml
  14. +4
    -1
      pages/couponorder/index/index.wxss
  15. +1
    -1
      pages/index/rushToBuy/index.wxml
  16. +2
    -2
      pages/order/detail/index.wxml
  17. +0
    -1
      pages/order/index/index.wxss
  18. +1
    -1
      pages/orderquanma/index.wxml
  19. +3
    -3
      pages/orderquanma/index.wxss
  20. +15
    -1
      pages/passCar/passCar.js
  21. +1
    -1
      pages/passCar/passCar.json
  22. +17
    -6
      pages/passCar/passCar.wxml
  23. +222
    -99
      pages/passCar/passCar.wxss
  24. +2
    -2
      pages/rushToBuy/index.js
  25. +1
    -1
      pages/user/index.wxml

二進制
assets/img/add.png 查看文件

Before After
Width: 44  |  Height: 44  |  Size: 1.2 KiB

二進制
assets/img/quan.png 查看文件

Before After
Width: 32  |  Height: 32  |  Size: 595 B Width: 22  |  Height: 22  |  Size: 520 B

二進制
assets/img/wenti.png 查看文件

Before After
Width: 32  |  Height: 32  |  Size: 802 B Width: 44  |  Height: 44  |  Size: 1.2 KiB

二進制
assets/img/wm01.jpg 查看文件

Before After
Width: 510  |  Height: 581  |  Size: 32 KiB Width: 600  |  Height: 572  |  Size: 18 KiB

二進制
assets/img/wm02.jpg 查看文件

Before After
Width: 510  |  Height: 581  |  Size: 32 KiB Width: 600  |  Height: 572  |  Size: 18 KiB

二進制
assets/img/wm03.jpg 查看文件

Before After
Width: 510  |  Height: 581  |  Size: 34 KiB Width: 600  |  Height: 572  |  Size: 18 KiB

+ 1
- 1
pages/addPark/addPark.json 查看文件

@@ -1,3 +1,3 @@
{
"navigationBarTitleText": "绑定车牌"
"navigationBarTitleText": "添加车辆"
}

+ 4
- 4
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;


+ 3
- 6
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',


+ 4
- 5
pages/couponorder/detail/index.wxml 查看文件

@@ -20,10 +20,9 @@
</view>
<image class='line' mode="widthFix" src="./../../../assets/img/line.png"></image>
<view class="zhuangtai">
<image wx:if="{{data.couponOrderStatus==1}}" src="./../../../assets/img/wm01.jpg"></image>
<image wx:if="{{data.couponOrderStatus==2}}" src="./../../../assets/img/wm02.jpg"></image>
<image wx:if="{{data.couponOrderStatus==3}}" src="./../../../assets/img/wm03.jpg"></image>

<image wx:if="{{data.couponOrderStatus==1}}" src="./../../../assets/img/wm01.jpg" mode='widthFix'></image>
<image wx:if="{{data.couponOrderStatus==2}}" src="./../../../assets/img/wm02.jpg" mode='widthFix'></image>
<image wx:if="{{data.couponOrderStatus==3}}" src="./../../../assets/img/wm03.jpg" mode='widthFix'></image>
<view class="panel" wx:if="{{data.couponOrderStatus==0}}">
<view class="barcode">
<canvas canvas-id="barcode" />
@@ -56,7 +55,7 @@
<view style='height:60rpx;line-height:60rpx;'>
<text class="shiji">实付金额:</text>
<text class='moneys'>{{data.couponPrice/100}}</text>
<text style='font-size:24rpx;text-align:right;'>元</text>
<text style='font-size:24rpx;text-align:right;color: #FF4949;'>元</text>
</view>
<view wx:if="{{data.couponOrderStatus==0}}">
<text>下单时间:</text>


+ 7
- 9
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;


+ 1
- 3
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": "我的优惠劵"
}

+ 2
- 2
pages/couponorder/index/index.wxml 查看文件

@@ -26,8 +26,8 @@
<view class='subtitle'>
<text>{{item.subTitle}}</text>
</view>
<view wx:if="{{item.couponOrderStatus==0}}" class="btns">去使用</view>
<view wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view>
<view hover-class='active' wx:if="{{item.couponOrderStatus==0}}" class="btns">去使用</view>
<view hover-class='active' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view>
</view>
</view>
<image class="liness" src='./../../../assets/img/liness.png' mode="widthFix"></image>


+ 4
- 1
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;


+ 1
- 1
pages/index/rushToBuy/index.wxml 查看文件

@@ -1,5 +1,5 @@
<view class="index-rushToBuy">
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">限时抢购<text bindtap="gotomore" wx:if="{{total>5}}">查看更多</text><image wx:if="{{total>5}}" src='./../../../assets/img/jian.png' mode="widthFix"></image></view>
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">限时抢购<text bindtap="gotomore">查看全部</text><image src='./../../../assets/img/jian.png' mode="widthFix"></image></view>
<scroll-view scroll-x class="index-scroll-view">
<view class="commodity" wx:for="{{list}}" wx:key="unique">
<view bindtap="gotodetail" data-couponChannelId="{{item.id}}" data-couponId="{{item.couponId}}" data-targetAd="{{item.targetAd}}">


+ 2
- 2
pages/order/detail/index.wxml 查看文件

@@ -6,7 +6,7 @@
<view class='section'>
<view class='detail_msg'>
<view class='logo'>
<image src='{{order.coverImg}}'></image>
<image mode='aspectFill' src='{{order.coverImg}}'></image>
</view>
<view class='info'>
<view>
@@ -48,7 +48,7 @@
<text class="fr">{{order.couponOrderId}}</text>
</view>
<view>
<image class="spcode" src="./../../../assets/img/spcode.png" mode="widthFix"></image>
<image class="spcode" src="./../../../assets/img/spcode.png" mode='widthFix'></image>
</view>
</view>
<view>


+ 0
- 1
pages/order/index/index.wxss 查看文件

@@ -11,7 +11,6 @@
left: 0;
right: 0;
text-align: center;
background: #fff;
z-index: 10000000;
}


+ 1
- 1
pages/orderquanma/index.wxml 查看文件

@@ -24,7 +24,7 @@
<view class="barnum buy"><text>兑换码:</text>{{code}}</view>
</view>
</view>
<image class='line' style='margin-top:0;margin-bottom:16rpx;' src='./../../assets/img/line.png' mode="widthFix"></image>
<view class="gou">
<view class="mai">购买须知:</view>
<view class="remark">{{remark}}</view>


+ 3
- 3
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;


+ 15
- 1
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"
});
}
}}
});

+ 1
- 1
pages/passCar/passCar.json 查看文件

@@ -1,5 +1,5 @@
{
"component": true,
"usingComponents": {},
"navigationBarTitleText": "车辆管理"
"navigationBarTitleText": "车"
}

+ 17
- 6
pages/passCar/passCar.wxml 查看文件

@@ -1,5 +1,15 @@
<view class='container'>
<view class='headBox'>
<view class='carmanage clearfix'>
<view class='fl'>
<image src='./../../assets/img/che.png' mode='widthFix'></image>
<text class='mycar'>我的爱车</text>
<text class='num'>最多可添加3辆</text>
</view>
<view class='fr'>
车辆管理<image src='./../../assets/img/jian.png' mode='widthFix'></image>
</view>
</view>
<!-- <view class='headBox'>
<image src='../../assets/img/timg.jpg'></image>
<view class='numberBox'>
<view class='titleName'>{{park.addr}}</view>
@@ -10,10 +20,11 @@
<label class='locationNumber'> {{park.number}}个</label>
</view>
</view>
</view>
</view> -->
<view class='borderBox'>
<view class='borderUp'>我的爱车
<label class='carNumber' bindtap="jumpToAdd" wx:if='{{carList.length<3}}'>+</label>
<view class='borderUp' bindtap='jumpToAdd' wx:if="{{carList.length<3}}">
<view class="myCars"><image src='./../../assets/img/add.png' mode="widthFix"></image>我的爱车</view>
<text class='carNumber'>车辆入场后,才能绑车牌</text>
</view>
<view class='passNumberBox' wx:for='{{carList}}' wx:key='{{index}}'>
<view class='passUp'>
@@ -39,7 +50,7 @@
<image src='../../assets/img/quan.png'></image>
我的停车券
<view class='detail'>
<image src='../../assets/img/right.png'></image>
<image src='../../assets/img/jian.png'></image>
</view>
</view>
</navigator>
@@ -57,7 +68,7 @@
<image src='../../assets/img/wenti.png'></image>
常见问题
<view class='detail'>
<image src='../../assets/img/right.png'></image>
<image src='../../assets/img/jian.png'></image>
</view>
</view>
</view>


+ 222
- 99
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;
}
}

.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;
}

+ 2
- 2
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) {


+ 1
- 1
pages/user/index.wxml 查看文件

@@ -67,7 +67,7 @@
<view class="margin"></view>
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> -->
<view bindlongtap='showVersion' class='version'>
<view wx:if="{{flag=='show'}}">版本号:2.0.0</view>
<view wx:if="{{flag=='show'}}">版本号:2.0.2</view>
<view wx:if="{{flag=='hidden'}}"></view>
</view>
</view>

Loading…
取消
儲存