Skip to content

严立 / mini-shimao

Go to a project
Commit 71875e6f by zqm
Options

MM - 我的 - 订单有效期

parent 6a12717f
Inline Side-by-side
Showing with 14 additions and 13 deletions
pages/mine/home/home.js
...@@ -205,7 +205,7 @@ Page({ ...@@ -205,7 +205,7 @@ Page({
if (item.smOrderDetails.length > 3) { if (item.smOrderDetails.length > 3) {
item.smOrderDetailsSlice3 = item.smOrderDetails.slice(0, 3) item.smOrderDetailsSlice3 = item.smOrderDetails.slice(0, 3)
} }
item.expireTimeEnd = item.expireTime.substr(12) item.expireTimeEnd = item.expireTime.length>30?item.expireTime.substr(19):item.expireTime
return item return item
}) })
......
pages/mine/home/home.wxml
...@@ -185,12 +185,11 @@ ...@@ -185,12 +185,11 @@
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k" wx:key="{{index}}" wx:key="index"> <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k" wx:key="{{index}}" wx:key="index">
</image> </image>
</block> </block>
<text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text> <text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text>
</view> </view>
<view class="goods-footer row align-c con-b"> <view class="goods-footer row align-c con-b">
<text>{{item.expireTimeEnd === '' ? '' : '有效期' + item.expireTimeEnd}}</text> <text>{{item.expireTimeEnd === '' ? '' : '有效期' + item.expireTimeEnd}}</text>
<text>共{{item.smOrderDetails.length}}1件</text> <text>共{{item.smOrderDetails.length}}件</text>
</view> </view>
</view> </view>
<!-- more --> <!-- more -->
......
pages/pay/order-detail/order-detail.wxml
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,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.businessTime}}</text> <text class="info-content-item-describe">{{orderInfo.expireTime}}</text>
</view> </view>
<image class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image> <image class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image>
</view> </view>
...@@ -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.businessTime}}</text> <text class="info-content-item-describe">{{orderInfo.expireTime}}</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.businessTime}}</text> <text class="info-content-item-describe">{{orderInfo.expireTime}}</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>
...@@ -143,7 +143,8 @@ ...@@ -143,7 +143,8 @@
</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.businessTime}}</text> <text class="info-content-item-describe">{{orderInfo.expireTime}}</text>
<!-- <text class="info-content-item-describe">2020-09-30 00:00~ 2020-09-30 08:00</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>
...@@ -170,7 +171,7 @@ ...@@ -170,7 +171,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>
...@@ -185,7 +186,7 @@ ...@@ -185,7 +186,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.businessTime}}</text> <text class="info-content-item-describe">{{orderInfo.expireTime}}</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>
...@@ -208,7 +209,7 @@ ...@@ -208,7 +209,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>
......
pages/pay/order-detail/order-detail.wxss
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
} }
.info-content-item-describe { .info-content-item-describe {
height: 42rpx; flex:1;
line-height: 42rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
line-height: 42rpx; line-height: 42rpx;
......
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