소스 검색

upload

newCard
HolyKnightIX 2 년 전
부모
커밋
6fb507076b
5개의 변경된 파일76개의 추가작업 그리고 44개의 파일을 삭제
  1. +1
    -1
      index/passCar.wxml
  2. +7
    -2
      pages/ConsumeDetail/ConsumeDetail.js
  3. +6
    -2
      pages/ConsumeDetail/ConsumeDetail.wxml
  4. +61
    -38
      pages/ConsumeDetail/ConsumeDetail.wxss
  5. +1
    -1
      pages/exchangeCard/exchangeCard.js

+ 1
- 1
index/passCar.wxml 파일 보기

@@ -27,7 +27,7 @@
</view> </view>
<!-- <view class='coupon clearfix' bindtap='gotoquan' wx:if="{{couponList.length>0}}"> --> <!-- <view class='coupon clearfix' bindtap='gotoquan' wx:if="{{couponList.length>0}}"> -->


<view style="padding:0 25rpx;" class='coupon clearfix' bindtap='openTicketModal' wx:if="{{couponList.length>0&&stopFees.orderId&&stopFees.remainingFee>=0}}">
<view style="padding:0 25rpx;" class='coupon clearfix' bindtap='openTicketModal' wx:if="{{couponList.length>0&&stopFees.orderId&&stopFees.remainingFee>0}}">
<text class='fl'><text class='jians'>券</text>您有停车券可使用哦</text> <text class='fl'><text class='jians'>券</text>您有停车券可使用哦</text>
<view class="fr" style="margin-left:180rpx ;"> <view class="fr" style="margin-left:180rpx ;">
<text wx:if="{{quantitle}}">{{quantitle}}</text> <text wx:if="{{quantitle}}">{{quantitle}}</text>


+ 7
- 2
pages/ConsumeDetail/ConsumeDetail.js 파일 보기

@@ -58,7 +58,8 @@ Page({
more: "点击查看更多", more: "点击查看更多",
showMore: true, showMore: true,
supportTransfer: 1, supportTransfer: 1,
showIndexReuturn: false
showIndexReuturn: false,
pageNum: 1
}, },
phone: function (e) { phone: function (e) {
let that = this; let that = this;
@@ -157,7 +158,7 @@ Page({
data: { data: {
cardId: cardId, cardId: cardId,
pageNum: 1, pageNum: 1,
pageSize: 100
pageSize: 500
} }
}; };
Http.get(parmer) Http.get(parmer)
@@ -245,4 +246,8 @@ Page({
showbutton: false showbutton: false
}) })
}, },

onReachBottom() {

},
}); });

+ 6
- 2
pages/ConsumeDetail/ConsumeDetail.wxml 파일 보기

@@ -28,12 +28,16 @@
<view wx:if="{{data.length>0}}" wx:for="{{data}}" wx:key="index" class='list'> <view wx:if="{{data.length>0}}" wx:for="{{data}}" wx:key="index" class='list'>
<view class='record clearfix record1'> <view class='record clearfix record1'>
<text class='fl'>{{item.merchantName}}</text> <text class='fl'>{{item.merchantName}}</text>
<text class='fr'>-{{item.deductionAmount/100}}元</text>
<text class='fr'>
<text wx:if="{{item.payType == 1}}" style="color: #ff0000;">退款:+ {{item.deductionAmount/100}}元</text>
<text wx:else style="color: #ff0000;">- {{item.deductionAmount/100}}元</text>
</text>
</view> </view>
<view class='clearfix record2'> <view class='clearfix record2'>
<text class='fl'>{{item.updateDate}}</text>
<text class='fl'>更新时间:{{item.updateDate}}</text>
<text class='fr'>余 {{item.cardRemainAmount/100}}元</text> <text class='fr'>余 {{item.cardRemainAmount/100}}元</text>
</view> </view>
<view class="orderId">订单号:{{item.orderId}}</view>
</view> </view>
<view class="dingdan" wx:if="{{data.length==0&&supportTransfer!=1}}"> <view class="dingdan" wx:if="{{data.length==0&&supportTransfer!=1}}">
<image src="{{dingdanUrl}}" mode="widthFix"></image> <image src="{{dingdanUrl}}" mode="widthFix"></image>


+ 61
- 38
pages/ConsumeDetail/ConsumeDetail.wxss 파일 보기

@@ -1,7 +1,11 @@
button::after{ border: none; }
.notes{
button::after {
border: none;
}

.notes {
padding-bottom: 60rpx; padding-bottom: 60rpx;
} }

.record text:nth-of-type(2n+1) { .record text:nth-of-type(2n+1) {
float: left; float: left;
} }
@@ -20,14 +24,20 @@ button::after{ border: none; }
} }


.record1 text:nth-of-type(1) { .record1 text:nth-of-type(1) {
font-size:30rpx;
font-family:PingFang-SC-Bold;
color:rgba(51,51,51,1);
font-size: 30rpx;
font-family: PingFang-SC-Bold;
color: rgba(51, 51, 51, 1);
} }


.list { .list {
padding: 18rpx 0; padding: 18rpx 0;
} }

.orderId {
margin-top: 15rpx;
color: #999999;
}

.title { .title {
display: block; display: block;
padding: 0 32rpx; padding: 0 32rpx;
@@ -39,9 +49,10 @@ button::after{ border: none; }


.record2 { .record2 {
margin-top: 16rpx; margin-top: 16rpx;
color:rgba(153,153,153,1)!important;
color: rgba(153, 153, 153, 1) !important;
} }
.record2 text{

.record2 text {
font-size: 30rpx; font-size: 30rpx;
} }


@@ -126,7 +137,8 @@ button::after{ border: none; }
.titles .fr { .titles .fr {
color: red; color: red;
} }
.titles .fr text{

.titles .fr text {
font-size: 42rpx; font-size: 42rpx;
} }


@@ -150,6 +162,7 @@ button::after{ border: none; }
letter-spacing: 0; letter-spacing: 0;
line-height: 42rpx; line-height: 42rpx;
} }

.tel { .tel {
right: 0; right: 0;
top: 0; top: 0;
@@ -158,13 +171,16 @@ button::after{ border: none; }
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
} }
.list{

.list {
padding: 20rpx 32rpx; padding: 20rpx 32rpx;
border-bottom:1px solid #EAEAEA;
border-bottom: 1px solid #EAEAEA;
} }
.notess{

.notess {
padding: 0 32rpx; padding: 0 32rpx;
} }

.dingdan { .dingdan {
margin-top: 33rpx; margin-top: 33rpx;
} }
@@ -192,52 +208,59 @@ button::after{ border: none; }
height: 300rpx; height: 300rpx;
margin: 0 auto 16rpx; margin: 0 auto 16rpx;
} }
.head{
padding:32rpx 32rpx 0;

.head {
padding: 32rpx 32rpx 0;
} }
.bottom{

.bottom {
text-align: center; text-align: center;
height: 70rpx; height: 70rpx;
line-height: 70rpx; line-height: 70rpx;
color: #999; color: #999;
font-size: 32rpx; font-size: 32rpx;
} }
.support-tansfer{

.support-tansfer {
display: block; display: block;
width: 540rpx; width: 540rpx;
margin: 4rpx auto; margin: 4rpx auto;
border-radius: 50rpx; border-radius: 50rpx;
/* background: #02C0FF!important; */ /* background: #02C0FF!important; */
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
} }
.share{

.share {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-right: 20rpx; margin-right: 20rpx;
} }
.share-bottom{

.share-bottom {
width: 100%; width: 100%;
/* overflow:hidden; */ /* overflow:hidden; */
margin-top:66rpx;
margin-top: 66rpx;
} }

.goback { .goback {
float:left;
width:122rpx!important;
height:95rpx;
background:rgba(255,255,255,1);
line-height:95rpx;
border:1rpx solid rgba(227,227,227,1);
box-shadow:0px 8px 8px 1px rgba(189,189,189,0.32);
border-radius:48rpx;
margin-left:25rpx;
}
.goback image{
position:absolute;
width:60rpx;
left:0;
right:0;
top:0;
bottom:0;
margin:auto;
height: 80rpx;
float: left;
width: 122rpx !important;
height: 95rpx;
background: rgba(255, 255, 255, 1);
line-height: 95rpx;
border: 1rpx solid rgba(227, 227, 227, 1);
box-shadow: 0px 8px 8px 1px rgba(189, 189, 189, 0.32);
border-radius: 48rpx;
margin-left: 25rpx;
} }

.goback image {
position: absolute;
width: 60rpx;
left: 0;
right: 0;
top: 0;
bottom: 0;
margin: auto;
height: 80rpx;
}

+ 1
- 1
pages/exchangeCard/exchangeCard.js 파일 보기

@@ -261,6 +261,6 @@ Page({
onLoad() { onLoad() {
setTimeout(() => { setTimeout(() => {
this.checkPhoneStatus() this.checkPhoneStatus()
}, 2000);
}, 500);
} }
}) })

불러오는 중...
취소
저장