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

pages/campsite/home-mirror/home-mirror.js

@@ -93,7 +93,7 @@ Page({
     // 获取活动信息
     queryActivity: function () {
         let that = this
-        let shopInfo = wx.getStorageInfoSync('shopInfoBuffer')
+        let shopInfo = wx.getStorageSync('shopInfoBuffer')
         App.wxRequest({
             url: '/api/v1/activity/getList',
             data: {

pages/campsite/home-mirror/home-mirror.wxml

@@ -77,18 +77,19 @@
         </view>
     </view>
 
-    <!-- 全部活动 -->
-    <view class="activity" bindtap="onAllActivity">
-        <image src="{{appResourcesBase + 'campsite/title.png'}}"></image>
+     <!-- 滚动图片 -->
+    <!-- 无活动 -->
+    <view class="activity-empty" wx:if="{{childActivity.length === 0}}">
+        <block>
+            <image src="{{appResourcesBase + 'campsite/empty.png'}}"></image>
+        </block>
     </view>
-
-    <!-- 滚动图片 -->
-    <!-- 单张图片 -->
-    <view class="swiper" wx:if="{{childActivity.length <= 1}}">
+    <!-- 单活动 -->
+    <view class="swiper" wx:if="{{childActivity.length === 1}}">
         <image mode="scaleToFill" src="{{childActivity[0].childImg}}"></image>
     </view>
-    <!-- 多张图片 -->
-    <swiper class="swiper" indicator-dots indicator-color="#F6DADA" indicator-active-color="#E57C99" autoplay circular wx:else>
+    <!-- 多活动 -->
+    <swiper class="swiper" indicator-dots indicator-color="#F6DADA" indicator-active-color="#E57C99" autoplay circular wx:if="{{childActivity.length > 1}}">
         <block wx:for="{{childActivity}}" wx:key="id">
             <swiper-item>
                 <image mode="scaleToFill" src="{{item.cover}}" bindtap="onActivityDetail" data-id="{{item.id}}"></image>

pages/campsite/home-mirror/home-mirror.wxss

@@ -167,6 +167,15 @@
     height: 34rpx;
 }
 
+.activity-empty {
+    width: 750rpx;
+    height: 544rpx;
+}
+.activity-empty image {
+    width: 750rpx;
+    height: 544rpx;
+}
+
 .swiper {
     width: 750rpx;
     height: 1160rpx;

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;

project.config.json

-{
-	"description": "项目配置文件",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": true,
-		"es6": true,
-		"enhance": true,
-		"postcss": true,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"nodeModules": true,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"uglifyFileName": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": false,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		}
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.10.0",
-	"appid": "wx37a9b7a3d92029f2",
-	"projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E6%9C%9F",
-	"cloudfunctionTemplateRoot": "",
-	"watchOptions": {
-		"ignore": []
-	},
-	"debugOptions": {
-		"hidedInDevtools": []
-	},
-	"scripts": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"list": []
-		},
-		"gamePlugin": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": -1,
-			"list": [
-				{
-					"id": -1,
-					"name": "pages/commodity/menu-food/menu-food",
-					"pathName": "pages/commodity/menu-food/menu-food",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/play/home/home",
-					"pathName": "pages/play/home/home",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/play/service-detail/service-detail",
-					"pathName": "pages/play/service-detail/service-detail",
-					"query": "id=1&type=4",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/mine/home/home",
-					"pathName": "pages/mine/home/home",
-					"query": "",
-					"scene": null
-				}
-			]
-		}
-	}
-}
\ No newline at end of file