Browse Source

Signed-off-by: 1004749546@qq.com <1004749546@qq.com>
bug修改

1004749546@qq.com 4 years ago
parent
commit
e3cb009227
2 changed files with 25 additions and 42 deletions
  1. 19 31
      pages/index/index.vue
  2. 6 11
      pages/store/storeList.vue

+ 19 - 31
pages/index/index.vue

@@ -301,21 +301,24 @@
 			// 扫码洗车
 			scanCode () {
 				let _this = this
+				uni.navigateTo({
+					url: '/pages/getOrder/getOrder?scene=100040,2001'
+				})
 				// 检验是否登录或登录是否过期
-				uni.scanCode({
-				    success: function (res) {
-				        console.log(res);
-						if(res.scanType != 'WX_CODE'){
-							setTimeout(()=>{
-								_this.toashMsg("无法识别此二维码")
-							},1000)
-						}else{
-							 uni.navigateTo({
-								url: '/'+res.path
-							 })
-						}
-				    }
-				});
+				// uni.scanCode({
+				//     success: function (res) {
+				//         console.log(res);
+				// 		if(res.scanType != 'WX_CODE'){
+				// 			setTimeout(()=>{
+				// 				_this.toashMsg("无法识别此二维码")
+				// 			},1000)
+				// 		}else{
+				// 			 uni.navigateTo({
+				// 				url: '/'+res.path
+				// 			 })
+				// 		}
+				//     }
+				// });
 			},
 			// 创建标记点 设备状态 USING :使用中  PAUSE:暂停  ON_LINE:在线
 			createMarker(point) {
@@ -325,23 +328,8 @@
 				if (point.deviceStatus === 'PAUSE') {
 					iconPath = '/static/img/store-dky.png'
 				} else if (point.deviceStatus === 'USING' || point.deviceStatus === 'ON_LINE') {
-					let today = new Date().toLocaleDateString() // 获取今天日期
-					let beginTime = today + ' ' + point.beginTime
-					let endTime = today + ' ' + point.endTime
-					let beginTimeStamp = new Date(beginTime).getTime()  // 获取开始时间戳
-					let endTimeStamp = new Date(endTime).getTime()  // 获取结束时间戳
-					let nowTimeStamp = new Date().getTime() // 获取当前时间戳
-					// 结束时间小于开始时间时 为跨天 结束时间应加1天
-					endTimeStamp = endTimeStamp <=beginTimeStamp ? (endTimeStamp+24*60*60*1000) : endTimeStamp
-					// 根据当前时间判断目前是否在营业时间范围内
-					if (nowTimeStamp>=beginTimeStamp && nowTimeStamp<=endTimeStamp) {
-						iconPath = '/static/img/store.png'
-					} else {
-						iconPath = '/static/img/store-dky.png'
-					}
-				} else {
-					iconPath = '/static/img/store-zt.png'
-				}
+					iconPath = '/static/img/store.png'
+				} 
 				let marker = {
 					iconPath: iconPath,
 					id: point.id || 0,

+ 6 - 11
pages/store/storeList.vue

@@ -119,7 +119,7 @@
 					}
 				})
 			},
-			// 获取网点营业状态 设备状态 USING :使用中  PAUSE:暂停  ON_LINE:在线
+			// 获取网点营业状态 营业状态 OPEN :营业  CLOSED:暂停营业  TO_BE_OPENED:即将开业
 			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.deviceStatus) {
-					case 'PAUSE':
+				switch (item.businessStatus) {
+					case 'CLOSED':
 						return '/static/img/ztyy.jpg'
 						break;
-					case 'USING':
+					case 'OPEN':
 						// 根据当前时间判断目前是否在营业时间范围内
 						if (nowTimeStamp>=beginTimeStamp && nowTimeStamp<=endTimeStamp) {
 							return '/static/img/yyz.jpg'
@@ -141,13 +141,8 @@
 							return '/static/img/ztyy.jpg'
 						}
 						break;
-					case 'ON_LINE':
-						// 根据当前时间判断目前是否在营业时间范围内
-						if (nowTimeStamp>=beginTimeStamp && nowTimeStamp<=endTimeStamp) {
-							return '/static/img/yyz.jpg'
-						} else {
-							return '/static/img/ztyy.jpg'
-						}
+					case 'TO_BE_OPENED':
+						return '/static/img/dky.jpg'
 						break;
 					default:
 						break;