| @@ -32,7 +32,7 @@ | |||||
| <view class="qrcode"> | <view class="qrcode"> | ||||
| <canvas canvas-id="qrcode" /> | <canvas canvas-id="qrcode" /> | ||||
| </view> | </view> | ||||
| <view class="barnum"><text>兑换码:</text>{{code}}</view> | |||||
| <view class="barnum"><text>兑换码:</text>{{code}}</view> | |||||
| </view> | </view> | ||||
| <view class="posi"> | <view class="posi"> | ||||
| <view class="tit"> | <view class="tit"> | ||||
| @@ -36,9 +36,8 @@ | |||||
| width: 670rpx; | width: 670rpx; | ||||
| height: 46rpx; | height: 46rpx; | ||||
| line-height: 46rpx; | line-height: 46rpx; | ||||
| font-size: 32rpx; | |||||
| font-size: 30rpx; | |||||
| text-align: center; | text-align: center; | ||||
| letter-spacing: 2rpx; | |||||
| white-space: nowrap; | white-space: nowrap; | ||||
| color: #999; | color: #999; | ||||
| } | } | ||||
| @@ -30,9 +30,9 @@ | |||||
| <text class="fr">{{order.merchantName}}</text> | <text class="fr">{{order.merchantName}}</text> | ||||
| </view> | </view> | ||||
| <view wx:if="{{order.orderStatus==1}}" data-title="{{order.title}}" data-subtitle="{{order.subTitle}}" data-remark="{{order.remark}}" data-quancode="{{order.id}}" bindtap="powerDrawer" data-statu="open"> | <view wx:if="{{order.orderStatus==1}}" data-title="{{order.title}}" data-subtitle="{{order.subTitle}}" data-remark="{{order.remark}}" data-quancode="{{order.id}}" bindtap="powerDrawer" data-statu="open"> | ||||
| <view> | |||||
| <text>兑换码:</text> | |||||
| <text>{{order.id}}</text> | |||||
| <view style="width:88%;clear: both;"> | |||||
| <text>兑换码</text> | |||||
| <text class="fr">{{order.id}}</text> | |||||
| </view> | </view> | ||||
| <view> | <view> | ||||
| <image class="spcode" src="./../../../assets/img/spcode.png" mode="widthFix"></image> | <image class="spcode" src="./../../../assets/img/spcode.png" mode="widthFix"></image> | ||||
| @@ -59,7 +59,7 @@ | |||||
| <!--mask--> | <!--mask--> | ||||
| <view class="drawer_screen" data-title="{{order.title}}" data-subtitle="{{order.subTile}}}" data-remark="{{order.remark}}" data-quancode="{{order.id}}" wx:if="{{showModalStatus}}" bindtap="powerDrawer" data-statu="close"></view> | |||||
| <!-- <view class="drawer_screen" data-title="{{order.title}}" data-subtitle="{{order.subTile}}}" data-remark="{{order.remark}}" data-quancode="{{order.id}}" wx:if="{{showModalStatus}}" bindtap="powerDrawer" data-statu="close"></view> | |||||
| <view animation="{{animationData}}" class="drawer_box" wx:if="{{showModalStatus}}"> | <view animation="{{animationData}}" class="drawer_box" wx:if="{{showModalStatus}}"> | ||||
| <view class="panel"> | <view class="panel"> | ||||
| <view class="barcode"> | <view class="barcode"> | ||||
| @@ -70,4 +70,4 @@ | |||||
| </view> | </view> | ||||
| <view class="barnum"><text>兑换码:</text>{{data.id}}</view> | <view class="barnum"><text>兑换码:</text>{{data.id}}</view> | ||||
| </view> | </view> | ||||
| </view> | |||||
| </view> --> | |||||
| @@ -126,6 +126,7 @@ | |||||
| } | } | ||||
| .classif > view text { | .classif > view text { | ||||
| font-size: 30rpx; | font-size: 30rpx; | ||||
| margin-right:6rpx; | |||||
| } | } | ||||
| .classif > view text:nth-child(2) { | .classif > view text:nth-child(2) { | ||||
| color: #b8b8b8; | color: #b8b8b8; | ||||
| @@ -287,6 +288,7 @@ radio { | |||||
| } | } | ||||
| .barnum { | .barnum { | ||||
| width: 88%; | |||||
| height: 46rpx; | height: 46rpx; | ||||
| line-height: 46rpx; | line-height: 46rpx; | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| @@ -11,9 +11,9 @@ | |||||
| <view class='info'> | <view class='info'> | ||||
| <view> | <view> | ||||
| <text>{{item.title}}</text> | <text>{{item.title}}</text> | ||||
| <text wx:if="{{item.orderStatus==0}}">等待付款</text> | |||||
| <text wx:if="{{item.orderStatus==0}}">待付款</text> | |||||
| <text wx:if="{{item.orderStatus==1}}">已付款</text> | <text wx:if="{{item.orderStatus==1}}">已付款</text> | ||||
| <text wx:if="{{item.orderStatus==2}}">订单取消</text> | |||||
| <text wx:if="{{item.orderStatus==2}}">已过期</text> | |||||
| </view> | </view> | ||||
| <view>{{item.subTitle}}</view> | <view>{{item.subTitle}}</view> | ||||
| <view> | <view> | ||||
| @@ -26,11 +26,22 @@ | |||||
| <text>¥{{item.salePrice/100}}</text> | <text>¥{{item.salePrice/100}}</text> | ||||
| <text>¥{{item.price/100}}</text> | <text>¥{{item.price/100}}</text> | ||||
| </view> | </view> | ||||
| <view class="btn" data-id="{{item.id}}" bindtap="gotopay"> | |||||
| <text wx:if="{{item.orderStatus==1}}">查看详情</text> | |||||
| <text wx:if="{{item.orderStatus==0}}">支付</text> | |||||
| <text wx:if="{{item.orderStatus==2}}">支付</text> | |||||
| <!-- | |||||
| orderStatus | |||||
| 0待付款 | |||||
| 1完成 | |||||
| 2取消 | |||||
| --> | |||||
| <view wx:if="{{item.orderStatus==1}}" class="btn" data-id="{{item.id}}" bindtap="gotopay"> | |||||
| <text>查看详情</text> | |||||
| </view> | </view> | ||||
| <view wx:if="{{item.orderStatus==0}}" class="btn" data-id="{{item.id}}" bindtap="gotopay"> | |||||
| <text>支付</text> | |||||
| </view> | |||||
| <view wx:if="{{item.orderStatus==2}}" style="background:#999;" class="btn"> | |||||
| <text>已过期</text> | |||||
| </view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="dingdan" wx:if="{{list.length==0}}"> | <view class="dingdan" wx:if="{{list.length==0}}"> | ||||