修改部分细节问题

common/http.interceptor.js

@@ -47,21 +47,30 @@ const install = (Vue, vm) => {
 		if(res.code == 200) {
 			// 如果把originalData设置为了true，这里return回什么，this.$u.post的then回调中就会得到什么
 			return res;  
-		} else if(res.msg == "令牌不能为空" || res.code == 401 || res.code == 400){
+		} else if(res.code == 401 || res.code == 400){
 			const backUrl = location.href
 			const loginUrl = 'phoneLogin'
 			if (backUrl.indexOf(loginUrl) > 0) {
 				localStorage.clear()
 			} else {
 				localStorage.setItem('backUrl', location.href)
-				uni.showToast({
-					title: res.msg || '!',
-					duration: 2000,
-					icon: 'none'
-				})
-				uni.navigateTo({
-					url: "/pages/center/phoneLogin/phoneLogin"
-				})
+				uni.showModal({
+					title: '提示',
+					content: 'Token已失效, 即将跳转登录页',
+					success: function (res) {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: "/pages/center/phoneLogin/phoneLogin"
+							})
+						} else if (res.cancel) {
+							uni.showToast({
+								title: '您已取消跳转到登录页',
+								icon: 'none',
+								duration: 3000
+							})
+						}
+					}
+				});
 			}
 		} else {
 			uni.showToast({

manifest.json

@@ -1,110 +1,110 @@
 {
-    "name" : "智慧停车",
-    "appid" : "__UNI__6259CD7",
-    "description" : "",
-    "versionName" : "1.5.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "safearea" : {
-            "bottom" : {
-                "offset" : "none"
-            }
-        },
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+	"name": "智慧停车",
+	"appid": "__UNI__6259CD7",
+	"description": "",
+	"versionName": "1.5.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"safearea": {
+			"bottom": {
+				"offset": "none"
+			}
+		},
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
 					/* 百度地图 */
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",  
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",  
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\" />",  
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\" />",  
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",  
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",  
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\" />",  
-					"<uses-permission android:name=\"android.permission.READ_LOGS\" />",  
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\" />",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\" />",
+					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\" />",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\" />",
 					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
 					/* 高德地图 */
-					"<uses-permission android:name=\"android.permission.INTERNET\" />",  
-					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\" />",  
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\" />",  
+					"<uses-permission android:name=\"android.permission.INTERNET\" />",
+					"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\" />",
+					"<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
 					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "",
-                        "appkey_android" : ""
-                    }
-                },
-                "geolocation" : {},
-                "push" : {},
-                "ad" : {}
-            },
-            "splashscreen" : {
-                "androidStyle" : "common"
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wxc256e348c4032ebd",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
-            "mode" : "hash",
-            "base" : ""
-        },
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : "BOGBZ-2BZ33-O4L32-Y3QJR-PGN66-RFFEL"
-                }
-            }
-        }
-    }
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"maps": {
+					"amap": {
+						"appkey_ios": "",
+						"appkey_android": ""
+					}
+				},
+				"geolocation": {},
+				"push": {},
+				"ad": {}
+			},
+			"splashscreen": {
+				"androidStyle": "common"
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wxc256e348c4032ebd",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"h5": {
+		"template": "template.h5.html",
+		"router": {
+			"mode": "hash",
+			"base": ""
+		},
+		"sdkConfigs": {
+			"maps": {
+				"qqmap": {
+					"key": "BOGBZ-2BZ33-O4L32-Y3QJR-PGN66-RFFEL"
+				}
+			}
+		}
+	}
 }

pages/center/order/order.vue

@@ -37,31 +37,42 @@
                     orderItem.auditStatus == 0">{{ orderItem | verifyRefundStatus }}</view>
 									<view class="order-top-right" v-else
 										:class="{ 'order-top-right-finished': orderItem.orderStatus == '4' }">
-										{{ orderItem.orderStatus | verifyStatusFilter }}</view>
+										{{ orderItem.orderStatus | verifyStatusFilter }}
+									</view>
 								</view>
 								<view class="order-center">
 									<view class="order-center-item">订单编号：{{ orderItem.orderId }}</view>
-									<view class="order-center-item">入场时间：{{ orderItem.inTime }}</view>
-									<!-- <view class="order-center-item"
-										v-if="orderItem.orderStatus == 1 && orderItem.outTime">
-										预计出场时间：{{ orderItem.outTime }}</view> -->
-									<view class="order-center-item"
-										v-if="orderItem.orderStatus == 1 && orderItem.outTime">
-										出场时间：{{ `未出场` }}</view>
-									<view class="order-center-item" v-if="orderItem.orderStatus !== 1">
-										出场时间：{{ orderItem.outTime }}</view>
-									<!-- <view class="order-center-item" v-if="orderItem.orderStatus !== 1">
+									<!-- <view class="order-center-item">入场时间：{{ orderItem.inTime }}</view> -->
+									<view class="order-center-item" v-if="orderItem.deviceType == 1">入场时间：{{ orderItem.inTime }}</view>
+									<view class="order-center-item" v-else>开始计费：{{ orderItem.inTime }}</view>
+									<template v-if="orderItem.deviceType == 1">
+										<view class="order-center-item"
+											v-if="orderItem.orderStatus == 1 && orderItem.outTime">
+											出场时间：{{ `未出场` }}</view>
+										<view class="order-center-item" v-if="orderItem.orderStatus !== 1">
+											出场时间：{{ orderItem.outTime }}</view>
+									</template>
+									<template v-else>
+										<view class="order-center-item"
+											v-if="orderItem.orderStatus == 1 && orderItem.outTime">
+											结束计费：{{ `未出场` }}</view>
+										<view class="order-center-item" v-if="orderItem.orderStatus !== 1">
+											结束计费：{{ orderItem.outTime }}</view>
+									</template>
+									<!-- <view class="order-center-item">
 										停车时长：{{ orderItem.duration || 0 }}</view> -->
-									<view class="order-center-item">
-										停车时长：{{ orderItem.duration || 0 }}</view>
 									<!-- <view class="order-center-item" v-if="orderItem.orderStatus !== 1">
 										免费时长：{{ orderItem.freeDuration || 0 }}</view> -->
-									<view class="order-center-item">
+									<view class="order-center-item" v-if="orderItem.deviceType == 1">
 										免费时长：{{ orderItem.freeDuration || 0 }}</view>
+									<view class="order-center-item" v-if="orderItem.deviceType == 2">
+										免费时长：0天0时15分0秒</view>
 									<!-- <view class="order-center-item" v-if="orderItem.orderStatus !== 1">
 										计费时长：{{ orderItem.calcDuration || 0 }}</view> -->
 									<view class="order-center-item">
 										计费时长：{{ orderItem.calcDuration || 0 }}</view>
+									<view class="order-center-item">
+										累计停车时长：{{ orderItem.duration || 0 }}</view>
 									<view class="order-center-item" v-if="orderItem.orderStatus == 1">
 										预计金额：
 										<span class="pay-amount">{{ orderItem.payAmount || 0 }}</span>

pages/center/order/orderDetails/orderDetails.vue

@@ -34,36 +34,79 @@
           :border-top="false"
           :value="orderInfo.orderId"
         ></u-cell-item>
-        <u-cell-item
-          title="入场时间 "
+        <template v-if="orderInfo.deviceType == 1">
+        	<u-cell-item
+        	  title="入场时间 "
+        	  :arrow="false"
+        	  :border-bottom="false"
+        	  :border-top="false"
+        	  :value="orderInfo.inTime"
+        	></u-cell-item>
+        	<u-cell-item
+        	  title="出场时间 "
+        	  :arrow="false"
+        	  :border-bottom="false"
+        	  :border-top="false"
+        	  :value="orderInfo.outTime"
+        	></u-cell-item>
+        </template>
+				<template v-else>
+					<u-cell-item
+					  title="开始计费 "
+					  :arrow="false"
+					  :border-bottom="false"
+					  :border-top="false"
+					  :value="orderInfo.inTime"
+					></u-cell-item>
+					<u-cell-item
+					  title="结束计费 "
+					  :arrow="false"
+					  :border-bottom="false"
+					  :border-top="false"
+					  :value="orderInfo.outTime"
+					></u-cell-item>
+				</template>
+        <!-- <u-cell-item
+          title="停车时长 "
           :arrow="false"
           :border-bottom="false"
           :border-top="false"
-          :value="orderInfo.inTime"
-        ></u-cell-item>
-				<u-cell-item
-				  title="出场时间 "
+          :value="orderInfo.duration"
+        ></u-cell-item> -->
+				<!-- <u-cell-item
+				  title="免费时长 "
 				  :arrow="false"
 				  :border-bottom="false"
 				  :border-top="false"
-				  :value="orderInfo.outTime"
-				></u-cell-item>
-        <u-cell-item
-          title="停车时长 "
-          :arrow="false"
-          :border-bottom="false"
-          :border-top="false"
-          :value="orderInfo.duration"
-        ></u-cell-item>
+				  :value="orderInfo.freeDuration"
+				></u-cell-item> -->
+				<template v-if="orderInfo.deviceType == 1">
+					<u-cell-item
+					  title="免费时长 "
+					  :arrow="false"
+					  :border-bottom="false"
+					  :border-top="false"
+					  :value="orderInfo.freeDuration"
+					></u-cell-item>
+				</template>
+				<template v-else>
+					<u-cell-item
+					  title="免费时长 "
+					  :arrow="false"
+					  :border-bottom="false"
+					  :border-top="false"
+					  value="0天0时15分0秒"
+					></u-cell-item>
+				</template>
 				<u-cell-item
-				  title="免费时长 "
+				  title="计费时长 "
 				  :arrow="false"
 				  :border-bottom="false"
 				  :border-top="false"
-				  :value="orderInfo.duration"
+				  :value="orderInfo.calcDuration"
 				></u-cell-item>
 				<u-cell-item
-				  title="计费时长 "
+				  title="累计停车时长 "
 				  :arrow="false"
 				  :border-bottom="false"
 				  :border-top="false"

pages/center/phoneLogin/phoneLogin.vue

@@ -130,7 +130,6 @@ export default {
 			this.$u.api.phoneLoginAuth(params)
 			.then(res =>{
 				if(res.code=='200'){
-					// console.log('finish res',res);
 					this.$u.vuex('vuex_user', res.data);
 					this.$u.vuex('vuex_hasLogin', true);
 					this.wechatLogin()
@@ -162,11 +161,20 @@ export default {
 				const pagesIndex = ret.indexOf('pages')
 				if (pagesIndex > (-1)) {
 					const pageUrl = ret.slice(pagesIndex)
-					setTimeout(() => {
-						uni.navigateTo({
-							url: '/' + pageUrl
-						})
-					}, 100)
+					const tabbarUrl = ['pages/center/index', 'pages/parkingLists/parkingLists']
+					if (tabbarUrl.indexOf(pageUrl) > (-1)) {
+						setTimeout(() => {
+							uni.switchTab({
+								url: '../../index/index'
+							})
+						}, 100)
+					} else {
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/' + pageUrl
+							})
+						}, 100)
+					}
 				} else {
 					uni.switchTab({
 						url: '../../index/index'

pages/index/index.vue

@@ -408,12 +408,6 @@
 							})
 						}
 					})
-					.catch(err=>{
-						this.$refs.uToast.show({
-							title: '操作失败!',
-							type: 'error'
-						})
-					});
 			},
 			//更换车牌信息
 			changevehicleNo(id){
@@ -452,12 +446,6 @@
 							});
 						}
 					})
-					.catch(err=>{
-						this.$refs.uToast.show({
-							title: '操作失败!',
-							type: 'error',
-						});
-					});
 			},
 			//新增车牌
 			addvehicleNo(){
@@ -687,13 +675,6 @@
 							})
 							uni.hideLoading()
 						}
-					}).catch(err => {
-						console.log('err', err)
-						this.$refs.uToast.show({
-							title: '系统异常',
-							type: 'error'
-						})
-						uni.hideLoading()
 					})
 			},
 			// 去支付,选择支付方式

pages/parkingLock/parkingLock.vue

@@ -15,7 +15,7 @@
 						<view>停车泊位</view>
 						<view>{{orderInfo.spaceName}}</view>
 					</view>
-					<view class="parking-lock-info-item">
+					<!-- <view class="parking-lock-info-item">
 						<view>入场时间</view>
 						<view>{{orderInfo.inTime}}</view>
 					</view>
@@ -30,19 +30,27 @@
 					<view class="parking-lock-info-item">
 						<view>免费时长</view>
 						<view>{{ orderInfo.freeDuration || 0 }}</view>
-					</view>
-					<!-- <view class="parking-lock-info-item">
+					</view> -->
+					<view class="parking-lock-info-item">
 						<view>开始计费</view>
 						<view>{{orderInfo.inTime}}</view>
 					</view>
 					<view class="parking-lock-info-item">
 						<view>结束计费</view>
 						<view>{{orderInfo.outTime}}</view>
-					</view> -->
+					</view>
+					<view class="parking-lock-info-item">
+						<view>免费时长</view>
+						<view>{{ orderInfo.freeDuration || 0 }}</view>
+					</view>
 					<view class="parking-lock-info-item">
 						<view>计费时长</view>
 						<view>{{orderInfo.calcDuration || 0}}</view>
 					</view>
+					<view class="parking-lock-info-item">
+						<view>累计停车时长</view>
+						<view>{{ orderInfo.duration || 0 }}</view>
+					</view>
 					<!-- <view class="parking-lock-info-item">
 						<view>合计金额</view>
 						<view>{{orderInfo.totalAmount}} 元</view>
@@ -55,7 +63,15 @@
 						<view>应缴金额</view>
 						<view class="really-money">{{orderInfo.payAmount || 0}} 元</view>
 					</view>
-					<view class="parking-lock-info-item" v-if="orderInfo.vehicleNo==''">
+					<view class="parking-lock-info-item">
+						<view>订单编号</view>
+						<view>{{orderInfo.orderId}}</view>
+					</view>
+					<!-- <view class="parking-lock-info-item" v-if="orderInfo.vehicleNo">
+						<view>车牌信息</view>
+						<view class="really-license">{{ orderInfo.vehicleNo }}</view>
+					</view> -->
+					<!-- <view class="parking-lock-info-item" v-if="orderInfo.vehicleNo==''">
 						<view>车牌信息</view>
 						<view class="really-license"><text class="really-license-txt" @click="addvehicleNo">添加车牌</text>
 						</view>
@@ -64,15 +80,20 @@
 						<view>车牌信息</view>
 						<view class="really-license">{{orderInfo.vehicleNo}} <text @click="changevehicleNo"
 								class="really-license-txt1">更换</text></view>
-					</view>
+					</view> -->
 				</view>
 				<view class="parking-lock-pay-btn">
 					<button type="default" @click="payMoney">立即支付</button>
 				</view>
-				<view class="parking-lock-pay-attention">
+				<!-- <view class="parking-lock-pay-attention">
 					<text>
 						温馨提示：车牌信息可填可不填，如果您已通过本机号码办理了特定车或包月车业务，则需要输入车牌号，否则将按照常规收费标准进行收费。
 					</text>
+				</view> -->
+				<view class="parking-lock-pay-attention">
+					<text>
+						温馨提示：车辆计费前您有15分钟免费停车时长，15分钟过后则升板锁车开始计费。
+					</text>
 				</view>
 			</view>
 		</template>
@@ -268,7 +289,7 @@
 				this.show = false
 			}
 		},
-		onHide() {
+		onUnload() {
 			if (this.timer) {
 				clearInterval(this.timer)
 			}
@@ -387,39 +408,39 @@
 				//     title: '订单查询中'
 				// });
 				this.$u.api.getOrderDetail({
-						id: id
-					}).then(res => {
+					id: id
+				}).then(res => {
 
-						console.log(res)
-						if (res.code === 200) {
-							// 获取页面完整url
-							const local = window.location.href
-							// 获取url后面的参数
-							const locationLocaturl = window.location.search;
-							// 截取url中的isBack
-							let isBack = getUrlParams(local, "isBack");
-							console.log('isBack', isBack);
-							console.log('isBack', isBack == null || isBack != '1');
-							// 如果没有isBack，则去请求
-							if (!isBack) {
-								// uni.hideLoading();
-								this.show = false
-								clearInterval(this.timer1)
-							}
-							this.orderInfo = res.data
-							if (res.data.payStatus === 1) {
-								// uni.hideLoading();
-								this.show = false
-								clearInterval(this.timer1)
-								this.checkEqupment()
-							}
+					console.log(res)
+					if (res.code === 200) {
+						// 获取页面完整url
+						const local = window.location.href
+						// 获取url后面的参数
+						const locationLocaturl = window.location.search;
+						// 截取url中的isBack
+						let isBack = getUrlParams(local, "isBack");
+						console.log('isBack', isBack);
+						console.log('isBack', isBack == null || isBack != '1');
+						// 如果没有isBack，则去请求
+						if (!isBack) {
+							// uni.hideLoading();
+							this.show = false
+							clearInterval(this.timer1)
 						}
-					}).catch(() => {
-						this.$refs.uToast.show({
-							title: '程序错误!订单Id:' + id,
-							type: 'error',
-						});
-					})
+						this.orderInfo = res.data
+						if (res.data.payStatus === 1) {
+							// uni.hideLoading();
+							this.show = false
+							clearInterval(this.timer1)
+							this.checkEqupment()
+						}
+					}
+				}).catch(() => {
+					this.$refs.uToast.show({
+						title: '程序错误!订单Id:' + id,
+						type: 'error',
+					});
+				})
 			},
 			// 检测设备
 			checkEqupment() {

static/html/wxPayCallback.html

@@ -54,7 +54,7 @@
 		<div class="car-img">
 			<img src="https://h5.pdzhtc.com/static/img/car-html-bg.png" alt="" width="65%" height="25%"/>
 		</div>
-		<a href="javascript:goToBgzchina()" class="button">回到镇宁智慧停车</a>
+		<a href="javascript:goToBgzchina()" class="button">回到普定智慧停车</a>
 	</div>
     <script>
         //const vConsole = new VConsole();//初始化console.log(?)