LL - 代码合并

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
                 })
 

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 -->

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)
                 }
 

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>

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;

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

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' : ''}}">

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 {

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">