MM - 取消预约；活动列表已评价状态

pages/mine/appointment-ticket/appointment-ticket.js

@@ -112,14 +112,14 @@ Page({
      */
     onLoad: function (options) {
   
-        let detail = JSON.parse(options.detail);
-     
-        let yyDate = detail.subscribeDate ? Date.parse(detail.subscribeDate.replace(/-/, '/')) : 0
-        let nowStr = new Date().toLocaleString().substr(0, 10) + " 00:00:00"
+        let detail = JSON.parse(options.detail);     
+        let yyDate = detail.subscribeDate ? Date.parse(detail.subscribeDate.replace(/-/g, '/')) : 0
+        let nowStr = new Date().toLocaleString().substr(0, 10).replace(/-/g, '/') + " 00:00:00"
         let now = Date.parse(nowStr)
-  
-        let isShowCancel = now <= yyDate
+   
+        
 
+        let isShowCancel = now <= yyDate
         this.setData({
             tickerInfo: detail,
             type: detail.type,

pages/mine/appointment/appointment.wxml

@@ -145,11 +145,12 @@
                     </view>
                 </view>
                 <!-- 已过期 -->
-                <view class="appointment-wrapper" wx:if="{{activity.status === '4'}}">
+                <view class="appointment-wrapper" wx:if="{{activity.status === '4'||activity.status === '6'}}">
                     <view class="mask-cancel" bindtap="onOrderDetail" data-item="{{activity}}"></view>
                     <view class="appointment-time mask-cancel-time">{{activity.date}}</view>
                     <view class="appintment-activity-status-cancel">
-                        <text>已过期</text>
+                        <text wx:if="{{activity.status === '4'}}">已过期</text>
+                        <text wx:if="{{activity.status === '6'}}">已评价</text>
                     </view>
                     <view class="appointment-activity-content row align-c">
                         <view class="appointment-activity-img">

pages/mine/appointment/appointment.wxss

@@ -220,6 +220,8 @@
 }
 
 .appointment-activity-footer {
+    position: relative;
+    z-index: 2;
     margin-top: 48rpx;
 }
 .appointment-activity-price text:nth-child(1) {

pages/pay/order-detail/order-detail.js

@@ -217,7 +217,7 @@ Page({
                     'wxRequest': funcResponse.wxRequest,
                     'businessTime': funcResponse.businessTime, //营业时间
                     'expireTime': funcResponse.expireTime, //订单有效期
-
+                    'particulars': funcResponse.particulars
                 }
                 // 设置印章
                 let shopName = funcResponse.officeName;
@@ -227,7 +227,7 @@ Page({
                     }
                 )
                 funcOrderInfo.shopInfo = shopFilter[0]
- 
+
                 // 添加订单商品列表
                 let funcCommodity = funcResponse.smOrderDetails
                 for (let i = 0, l = funcCommodity.length; i < l; i++) {

pages/pay/order-detail/order-detail.wxml

@@ -360,9 +360,11 @@
 <!-- 使用须知 -->
 <l-popup show="{{showNotice}}" content-align="bottom">
 	<view class="notice-popup-wrapper">
-		<view class="notice-popup-title">购买须知</view>
+		<view class="notice-popup-title">使用须知</view>
 		<scroll-view scroll-y class="notice-popup-content">
-
+			<view>
+				<rich-text nodes="{{orderInfo.particulars}}"></rich-text>
+			</view>
 		</scroll-view>
 	</view>
 </l-popup>

pages/pay/order-detail/order-detail.wxss

@@ -508,8 +508,6 @@
   color: #959DAA;
 }
 
-/* 扫码弹窗 */
-.scan-code-wrapper {}
 
 .code-header {
   height: 70rpx;
@@ -541,6 +539,9 @@
 .item-center {
   margin-left: 112rpx;
 }
+.notice-popup-content {
+  max-height: 896rpx;
+}
 
 .code-item-title {
   color: #15191F;