Commit 5ef04455 by 严立

Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

parents f1d70cbe a997f463
Showing with 4 additions and 4 deletions
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</view> </view>
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-describe">{{orderInfo.expireTime}}</text> <text class="info-content-item-describe">{{orderInfo.businessTime}}</text>
</view> </view>
<view class="info-content-item row"> <view class="info-content-item row">
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<view class="info-code col con-c align-c"> <view class="info-code col con-c align-c">
<text>{{orderInfo.commodity.length}}件商品可用</text> <text>{{orderInfo.commodity.length}}件商品可用</text>
<button bindtap="onFastScan" class="row con-c align-c">一键扫码</button> <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
<!-- <text>{{orderInfo.expireTime}}</text> --> <text>{{orderInfo.expireTime}}</text>
</view> </view>
</block> </block>
</block> </block>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</view> </view>
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-describe">{{orderInfo.expireTime}}</text> <text class="info-content-item-describe">{{orderInfo.businessTime}}</text>
</view> </view>
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label">订单信息</text> <text class="info-content-item-label">订单信息</text>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<text wx:if="{{orderInfo.commodityType === 4}}">{{'1件商品可用'}}</text> <text wx:if="{{orderInfo.commodityType === 4}}">{{'1件商品可用'}}</text>
<text wx:if="{{orderInfo.commodityType === 3}}">{{orderInfo.commodity.length}}张门票可用</text> <text wx:if="{{orderInfo.commodityType === 3}}">{{orderInfo.commodity.length}}张门票可用</text>
<button bindtap="onFastScan" class="row con-c align-c">一键扫码</button> <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
<!-- <text>{{orderInfo.expireTime}}</text> --> <text>{{orderInfo.expireTime}}</text>
</view> </view>
</block> </block>
</block> </block>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment