Browse Source

[订单列表按钮和订单状态的修改][修改]: orderStatus页面显示按钮的修改

tags/2.2.4
meo 7 years ago
parent
commit
a23140774e
5 changed files with 26 additions and 14 deletions
  1. +1
    -1
      pages/couponorder/detail/index.wxml
  2. +1
    -2
      pages/couponorder/detail/index.wxss
  3. +5
    -5
      pages/order/detail/index.wxml
  4. +2
    -0
      pages/order/detail/index.wxss
  5. +17
    -6
      pages/order/index/index.wxml

+ 1
- 1
pages/couponorder/detail/index.wxml View File

@@ -32,7 +32,7 @@
<view class="qrcode">
<canvas canvas-id="qrcode" />
</view>
<view class="barnum"><text>兑换码:</text>{{code}}</view>
<view class="barnum"><text>兑换码</text>{{code}}</view>
</view>
<view class="posi">
<view class="tit">


+ 1
- 2
pages/couponorder/detail/index.wxss View File

@@ -36,9 +36,8 @@
width: 670rpx;
height: 46rpx;
line-height: 46rpx;
font-size: 32rpx;
font-size: 30rpx;
text-align: center;
letter-spacing: 2rpx;
white-space: nowrap;
color: #999;
}


+ 5
- 5
pages/order/detail/index.wxml View File

@@ -30,9 +30,9 @@
<text class="fr">{{order.merchantName}}</text>
</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>
<text>兑换码:</text>
<text>{{order.id}}</text>
<view style="width:88%;clear: both;">
<text>兑换码</text>
<text class="fr">{{order.id}}</text>
</view>
<view>
<image class="spcode" src="./../../../assets/img/spcode.png" mode="widthFix"></image>
@@ -59,7 +59,7 @@


<!--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 class="panel">
<view class="barcode">
@@ -70,4 +70,4 @@
</view>
<view class="barnum"><text>兑换码:</text>{{data.id}}</view>
</view>
</view>
</view> -->

+ 2
- 0
pages/order/detail/index.wxss View File

@@ -126,6 +126,7 @@
}
.classif > view text {
font-size: 30rpx;
margin-right:6rpx;
}
.classif > view text:nth-child(2) {
color: #b8b8b8;
@@ -287,6 +288,7 @@ radio {
}

.barnum {
width: 88%;
height: 46rpx;
line-height: 46rpx;
font-size: 32rpx;


+ 17
- 6
pages/order/index/index.wxml View File

@@ -11,9 +11,9 @@
<view class='info'>
<view>
<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==2}}">订单取消</text>
<text wx:if="{{item.orderStatus==2}}">已过期</text>
</view>
<view>{{item.subTitle}}</view>
<view>
@@ -26,11 +26,22 @@
<text>¥{{item.salePrice/100}}</text>
<text>¥{{item.price/100}}</text>
</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 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 class="dingdan" wx:if="{{list.length==0}}">


Loading…
Cancel
Save