瀏覽代碼

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/qhsxKx-mini-html into deploy

lilei 4 年之前
父節點
當前提交
e8495f3fa4
共有 3 個文件被更改,包括 15 次插入10 次删除
  1. 3 3
      pages/index/index.vue
  2. 11 6
      pages/store/storeList.vue
  3. 1 1
      pages/userCenter/index.vue

+ 3 - 3
pages/index/index.vue

@@ -335,14 +335,14 @@
 					}
 				})
 			},
-			// 创建标记点 OPEN :正常营业  CLOSED:暂停营业  TO_BE_OPENED:待开业
+			// 创建标记点 设备状态 USING :使用中  PAUSE:暂停  ON_LINE:在线
 			createMarker(point) {
 				let latitude = point.lat;
 				let longitude = point.lng;
 				let iconPath = ''
-				if (point.businessStatus === 'CLOSED') {
+				if (point.deviceStatus === 'PAUSE') {
 					iconPath = '/static/img/store-dky.png'
-				} else if (point.businessStatus === 'OPEN') {
+				} else if (point.deviceStatus === 'USING' || point.deviceStatus === 'ON_LINE') {
 					let today = new Date().toLocaleDateString() // 获取今天日期
 					let beginTime = today + ' ' + point.beginTime
 					let endTime = today + ' ' + point.endTime

+ 11 - 6
pages/store/storeList.vue

@@ -119,7 +119,7 @@
 					}
 				})
 			},
-			// 获取网点营业状态
+			// 获取网点营业状态 设备状态 USING :使用中  PAUSE:暂停  ON_LINE:在线
 			getStoreStatus(item) {
 				let today = new Date().toLocaleDateString() // 获取今天日期
 				let beginTime = today + ' ' + item.beginTime
@@ -129,11 +129,11 @@
 				let nowTimeStamp = new Date().getTime() // 获取当前时间戳
 				// 结束时间小于开始时间时 为跨天 结束时间应加1天
 				endTimeStamp = endTimeStamp <=beginTimeStamp ? (endTimeStamp+24*60*60*1000) : endTimeStamp
-				switch (item.businessStatus) {
-					case 'CLOSED':
+				switch (item.deviceStatus) {
+					case 'PAUSE':
 						return '/static/img/ztyy.jpg'
 						break;
-					case 'OPEN':
+					case 'USING':
 						// 根据当前时间判断目前是否在营业时间范围内
 						if (nowTimeStamp>=beginTimeStamp && nowTimeStamp<=endTimeStamp) {
 							return '/static/img/yyz.jpg'
@@ -141,8 +141,13 @@
 							return '/static/img/ztyy.jpg'
 						}
 						break;
-					case 'TO_BE_OPENED':
-						return '/static/img/dky.jpg'
+					case 'ON_LINE':
+						// 根据当前时间判断目前是否在营业时间范围内
+						if (nowTimeStamp>=beginTimeStamp && nowTimeStamp<=endTimeStamp) {
+							return '/static/img/yyz.jpg'
+						} else {
+							return '/static/img/ztyy.jpg'
+						}
 						break;
 					default:
 						break;

+ 1 - 1
pages/userCenter/index.vue

@@ -12,7 +12,7 @@
 		<!-- 列表 -->
 		<view class="user-list">
 			<u-cell-group>
-				<!-- <u-cell-item icon="gift" index="0" @click="toPage" title="我的优惠卷"></u-cell-item> -->
+				<u-cell-item icon="gift" index="0" @click="toPage" title="我的优惠卷"></u-cell-item>
 				<u-cell-item icon="order" index="1" @click="toPage" title="我的订单"></u-cell-item>
 				<u-cell-item icon="file-text" index="2" @click="toPage" title="服务协议"></u-cell-item>
 				<!-- <u-cell-item icon="info-circle" index="3" @click="toPage" title="关于我们"></u-cell-item> -->