LL - 代码合并

f1d70cbe · 严立 · e38c3d53 · 71875e6f · f1d70cbe · f1d70cbe
Commit f1d70cbe authored Sep 30, 2020 by 严立
Showing with 48 additions and 22 deletions
pages/campsite/home/image/icon-bg.png
pages/campsite/home/image/month.png
pages/campsite/home/image/ruyuangoupiao.png
pages/campsite/home/image/shanzi.png
pages/campsite/home/image/single.png
pages/campsite/home/image/wenchuangzhoubian.png
pages/campsite/home/image/year.png
pages/campsite/home/image/yinpin.png
pages/campsite/home/image/yinpinyuding.png
pages/mine/home/home.js
pages/mine/home/home.wxml
pages/mine/home/image/mine.png
pages/pay/order-detail/order-detail.js
pages/pay/order-detail/order-detail.wxml
pages/pay/order-detail/order-detail.wxss
pages/play/movie/movie.js
pages/play/movie/movie.wxml
pages/play/movie/movie.wxss
pages/play/service-detail/service-detail.wxml
--- a/pages/campsite/home/image/icon-bg.png
+++ b/pages/campsite/home/image/icon-bg.png
--- a/pages/campsite/home/image/month.png
+++ b/pages/campsite/home/image/month.png
--- a/pages/campsite/home/image/ruyuangoupiao.png
+++ b/pages/campsite/home/image/ruyuangoupiao.png
--- a/pages/campsite/home/image/shanzi.png
+++ b/pages/campsite/home/image/shanzi.png
--- a/pages/campsite/home/image/single.png
+++ b/pages/campsite/home/image/single.png
--- a/pages/campsite/home/image/wenchuangzhoubian.png
+++ b/pages/campsite/home/image/wenchuangzhoubian.png
--- a/pages/campsite/home/image/year.png
+++ b/pages/campsite/home/image/year.png
--- a/pages/campsite/home/image/yinpin.png
+++ b/pages/campsite/home/image/yinpin.png
--- a/pages/campsite/home/image/yinpinyuding.png
+++ b/pages/campsite/home/image/yinpinyuding.png
--- a/pages/mine/home/home.js
+++ b/pages/mine/home/home.js
@@ -205,7 +205,7 @@ Page({
                    if (item.smOrderDetails.length > 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
                })

--- a/pages/mine/home/home.wxml
+++ b/pages/mine/home/home.wxml
@@ -185,12 +185,11 @@
                                    <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k" wx:key="{{index}}" wx:key="index">
                                    </image>
                                </block>
                                <text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text>
                            </view>
                            <view class="goods-footer row align-c con-b">
                                <text>{{item.expireTimeEnd === '' ? '' : '有效期' + item.expireTimeEnd}}</text>
-                                <text>共{{item.smOrderDetails.length}}1件</text>
+                                <text>共{{item.smOrderDetails.length}}件</text>
                            </view>
                        </view>
                        <!-- more -->

--- a/pages/mine/home/image/mine.png
+++ b/pages/mine/home/image/mine.png
--- a/pages/pay/order-detail/order-detail.js
+++ b/pages/pay/order-detail/order-detail.js
@@ -262,6 +262,17 @@ Page({
                    'expireTime': funcResponse.expireTime, //订单有效期
                    'particulars': funcResponse.particulars
                }
+                // 电影
+                if (Number(funcOrderInfo.commodityType) === -2) {
+                    let funcDate = funcOrderInfo.expireTime.match(/[0-9]+-[0-9]+-[0-9]+/)[0]
+                    let funcTime = funcOrderInfo.expireTime.match(/[0-9]+:[0-9]+/, 'g')
+                    console.log(funcDate)
+                    console.log(funcTime)
+                }
                // 设置印章
                let shopName = funcResponse.officeName;
                let shopFilter = this.data.shopConfig.filter(
@@ -300,17 +311,12 @@ Page({
                                residuePayTime: residuePayTime
                            })
                        } else {
-                            console.log(residueStamp, 'residueStamp----------------');
                            clearInterval(timeInter)
-                            // that.queryOrderDetail()
                            let state = `orderInfo.state`
                            that.setData({
                                [state]: -1
                            })
                        }
                    }, 1000)
                }

--- a/pages/pay/order-detail/order-detail.wxml
+++ b/pages/pay/order-detail/order-detail.wxml
@@ -52,7 +52,7 @@
                </view>
                <view class="info-content-item row">
                    <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>
                <image class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image>
            </view>
@@ -66,7 +66,7 @@
                </view>
                <view class="info-content-item row">
                    <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 class="info-content-item row">
@@ -90,7 +90,7 @@
                <view class="info-code col con-c align-c">
                    <text>{{orderInfo.commodity.length}}件商品可用</text>
                    <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
-                    <text>{{orderInfo.expireTime}}</text>
+                    <!-- <text>{{orderInfo.expireTime}}</text> -->
                </view>
            </block>
        </block>
@@ -103,7 +103,7 @@
                </view>
                <view class="info-content-item row">
                    <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 class="info-content-item row">
                    <text class="info-content-item-label">订单信息</text>
@@ -128,7 +128,7 @@
                    <text wx:if="{{orderInfo.commodityType === 4}}">{{'1件商品可用'}}</text>
                    <text wx:if="{{orderInfo.commodityType === 3}}">{{orderInfo.commodity.length}}张门票可用</text>
                    <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
-                    <text>{{orderInfo.expireTime}}</text>
+                    <!-- <text>{{orderInfo.expireTime}}</text> -->
                </view>
            </block>
        </block>
@@ -142,7 +142,7 @@
                </view>
                <view class="info-content-item row">
                    <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 class="info-content-item row">
                    <text class="info-content-item-label">活动地点</text>
@@ -169,7 +169,7 @@
                <view class="info-code col con-c align-c">
                    <text>{{orderInfo.commodity.length}}张门票可用</text>
                    <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
-                    <text>{{orderInfo.expireTime}}</text>
+                    <!-- <text>{{orderInfo.expireTime}}</text> -->
                </view>
            </block>
        </block>
@@ -183,7 +183,7 @@
                </view>
                <view class="info-content-item row">
                    <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 class="info-content-item row">
                    <text class="info-content-item-label">订单信息</text>
@@ -206,7 +206,7 @@
                <view class="info-code col con-c align-c">
                    <text>{{orderInfo.commodity.length}}张电影票可用</text>
                    <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
-                    <text>{{orderInfo.expireTime}}</text>
+                    <!-- <text>{{orderInfo.expireTime}}</text> -->
                </view>
            </block>
        </block>

--- a/pages/pay/order-detail/order-detail.wxss
+++ b/pages/pay/order-detail/order-detail.wxss
@@ -84,7 +84,8 @@
 }
 .info-content-item-describe {
-    height: 42rpx;
+    flex:1;
+    line-height: 42rpx;
    font-size: 30rpx;
    font-weight: 500;
    line-height: 42rpx;

--- a/pages/play/movie/movie.js
+++ b/pages/play/movie/movie.js
@@ -13,6 +13,8 @@ Page({
            pageSize: '-1'
        },
        loading: true,
+        statusTop: '',
+        statusFixed: false,
        marginTop: '',
        // 屏幕显示高度
        windowHeight: 0,
@@ -30,7 +32,7 @@ Page({
                color: '#ffffff',
                background: 'rgba(28, 28, 37, 1)'
            },
-            scroll: '100rpx',
+            scroll: '20rpx',
        },
        navigationScroll: 0,
@@ -75,6 +77,17 @@ Page({
        if (logicData.pageScrollLock) return
        logicData.pageScrollLock = true
+        if (funcEvent.scrollTop > 20) {
+            this.setData({
+                statusFixed: true,
+                statusTop: wx.getStorageSync('navigationStatusHeight') + wx.getStorageSync('navigationCapsuleHeight') + 'px'
+            })
+        } else {
+            this.setData({
+                statusFixed: false,
+            })
+        }
        this.setData({
            navigationScroll: funcEvent.scrollTop
        })
@@ -101,6 +114,7 @@ Page({
            marginTop,
            footerFixed
        } = this.data
        let footerHeight = Math.floor(214 * wx.getStorageSync('unitProportion'))
        // 显示高度
        let showHeight = windowHeight - footerHeight - marginTop

--- a/pages/play/movie/movie.wxml
+++ b/pages/play/movie/movie.wxml
 <navigation class="navigation" titleText="所有影片" color="#ffffff" backIcon="/image/back-w.png" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
 <view id="page" class="contaniner con-s" style="margin-top: {{marginTop + 'px'}}">
-    <view class="status row align-c">
+    <view class="status row align-c {{statusFixed ? 'status-fixed' : ''}}" style="{{statusFixed ? 'top: ' + (statusTop) : ''}}">
        <block wx:for="{{statusList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
            <view class="status-item row con-c align-c" data-type="{{index}}" bindtap="onSelectionStatus">
                <view class="row con-c align-c {{index === statusActive ? 'status-item-active' : ''}}">

--- a/pages/play/movie/movie.wxss
+++ b/pages/play/movie/movie.wxss
@@ -22,9 +22,15 @@ page {
 } */
 /* 状态筛选菜单 */
+.status-fixed {
+    z-index: 999;
+    position: fixed;
+    left: 0;
+}
 .status {
    width: 750rpx;
    height: 72rpx;
+    background-color: #1C1C25;
    border-bottom: 1px #3A3A40 solid;
 }
 .status-item {

--- a/pages/play/service-detail/service-detail.wxml
+++ b/pages/play/service-detail/service-detail.wxml
@@ -371,9 +371,9 @@
        </view>
    </view>
-    <view class="movie-footer">
+    <!-- <view class="movie-footer">
        <image src="/image/movie-bottom.png"></image>
-    </view>
+    </view> -->
    <!-- 简介，评价 -->
    <view class="selection-content movie-border row">