v1.1.5 formal

src/components/site/order_modal/order_modal.vue

@@ -89,8 +89,10 @@
 			<view class="om-total" v-if="isShowTotalAmoutn" >实付款 ￥{{ orderInfo.amount || '0' }}</view>
 			<!-- 管理员占用 -->
 			<view class="om-btns" v-if="orderInfo.type == 'take_up_venue'">
-				<view class="ob-view" @click="toShare">分享给朋友</view>
-				<view class="ob-view red" @click="cancelOccupy">取消占用</view>
+				<block v-if="orderInfo.pay_status == 0 || orderInfo.pay_status == 1">
+					<view class="ob-view" @click="toShare">分享给朋友</view>
+					<view class="ob-view red" @click="cancelOccupy">取消占用</view>
+				</block>
 			</view>
 			<!-- 小程序预定 -->
 			<view class="om-btns" v-if="orderInfo.type == 'mini_program'">
@@ -227,7 +229,8 @@ export default {
                     return '已失效'
                 case 8:
                     return '使用中'
-                default: return '-'
+                default: 
+					return '-'
             }
 		},
 		getTitle(type){

src/pages/site/manage/manage.vue

@@ -232,11 +232,12 @@ export default {
             let _todayTimestamp = new Date(new Date().toLocaleDateString().replace(/\-/g, '/')).getTime(); // 当天0点
             let _oneDateTimestamp = 24*60*60*1000;
             // if(_selectedDateTimestamp<_todayTimestamp)return util.showNone(`请选择${new Date().toLocaleDateString().replace(/\-/g, '/')}之后日期`); 
-            let _startTimestamp = _type == 'start' ? _selectedDateTimestamp : new Date(dateList[0].dateStr.replace(/\-/g, '/')).getTime();
-            let _endTimestamp =  _type == 'end' ? _selectedDateTimestamp: new Date(dateList[dateList.length-1].dateStr.replace(/\-/g, '/')).getTime();
-            if(_endTimestamp<_startTimestamp)return util.showNone('请选择正常范围！');
-            let _dateLength = +(((_endTimestamp - _startTimestamp) /_oneDateTimestamp + 1).toFixed());
-            if(_dateLength>7)return util.showNone('不能超过7天范围！');
+            let _startTimestamp = _type == 'start' ? _selectedDateTimestamp :_type == 'end' ? _selectedDateTimestamp - (7*_oneDateTimestamp) : _todayTimestamp;
+            // let _endTimestamp =  _type == 'end' ? _selectedDateTimestamp : new Date(dateList[dateList.length-1].dateStr.replace(/\-/g, '/')).getTime();
+            // if(_endTimestamp<_startTimestamp)return util.showNone('请选择正常范围！');
+            // let _dateLength = +(((_endTimestamp - _startTimestamp) /_oneDateTimestamp + 1).toFixed());
+            let _dateLength = 8;
+            // if(_dateLength>7)return util.showNone('不能超过7天范围！');
             let _dateArr = this.getDateList({
                 startTimestamp: _startTimestamp,
                 length: _dateLength

src/subpackage/device/pages/switch_manage/switch_manage.vue

@@ -63,7 +63,7 @@ const showArr = {
         id: 1, name: '照明管理', isOpen: true, isClose: true, isLongOpen:true, isTiming:true,
         openIcon: '/subpackage/device/static/images/open.png',closeIcon: '/subpackage/device/static/images/close.png',
         longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-        openName: '开', closeName: '关', longOpenName: '长按', timingName: '定时', hardware_type: 'Light',iconNum:4
+        openName: '开', closeName: '关', longOpenName: '长开', timingName: '定时', hardware_type: 'Light',iconNum:4
     },
     's2': {
         id: 2, name: '空调管理', isOpen: true, isClose: true,
@@ -76,7 +76,7 @@ const showArr = {
         openIcon: '/subpackage/device/static/images/open.png',
         closeIcon: '/subpackage/device/static/images/close.png',
 		 longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-        openName: '开', closeName: '关', hardware_type: 'Fan',longOpenName: '长按', timingName: '定时',iconNum:4,
+        openName: '开', closeName: '关', hardware_type: 'Fan',longOpenName: '长开', timingName: '定时',iconNum:4,
     },
     's4': {
         id: 4, name: '门禁管理', isOpen: true, isClose: false,
@@ -101,7 +101,7 @@ const showArr = {
         openIcon: '/subpackage/device/static/images/open.png',
         closeIcon: '/subpackage/device/static/images/close.png',
        longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png',
-       openName: '开', closeName: '关', hardware_type: 'WaterValve',longOpenName: '长按', timingName: '定时',iconNum:4,
+       openName: '开', closeName: '关', hardware_type: 'WaterValve',longOpenName: '长开', timingName: '定时',iconNum:4,
     },
     's12': {
         id: 12, name: '互动设备管理', isOpen: true, isClose: true,