Merge branch 'gczdev' of http://dzgogs.hw.hongweisoft.com/parking/parking_h5 into gczdev

node_modules/vue-jsonp/package.json

@@ -1,80 +0,0 @@
-{
-  "_from": "vue-jsonp",
-  "_id": "vue-jsonp@2.0.0",
-  "_inBundle": false,
-  "_integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==",
-  "_location": "/vue-jsonp",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "vue-jsonp",
-    "name": "vue-jsonp",
-    "escapedName": "vue-jsonp",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
-  "_shasum": "3bfac56bb72941a2511c11e1a123b876f03427f7",
-  "_spec": "vue-jsonp",
-  "_where": "H:\\company-project\\parking_h5",
-  "author": {
-    "name": "LancerComet",
-    "email": "chw644@hotmail.com"
-  },
-  "bugs": {
-    "url": "https://github.com/LancerComet/vue-jsonp/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "A tiny library for handling JSONP request.",
-  "devDependencies": {
-    "@types/expect-puppeteer": "^4.4.3",
-    "@types/jest": "^26.0.14",
-    "@types/jest-environment-puppeteer": "^4.4.0",
-    "@types/puppeteer": "^3.0.2",
-    "jest": "^26.4.2",
-    "jest-puppeteer": "^4.4.0",
-    "puppeteer": "^5.3.1",
-    "rollup": "^2.28.2",
-    "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-delete": "^2.0.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.27.3",
-    "ts-jest": "^26.4.1",
-    "tslint": "^6.1.3",
-    "typescript": "^4.0.3",
-    "vue": "^2.6.12"
-  },
-  "files": [
-    "dist/",
-    "index.d.ts",
-    "README.md"
-  ],
-  "homepage": "https://github.com/LancerComet/vue-jsonp#readme",
-  "keywords": [
-    "Vue",
-    "JSONP"
-  ],
-  "license": "MIT",
-  "main": "./dist/index.js",
-  "module": "./dist/index.esm.js",
-  "name": "vue-jsonp",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/LancerComet/vue-jsonp.git"
-  },
-  "scripts": {
-    "build": "rollup -c",
-    "prepublish": "npm run test",
-    "pretest": "npm run build",
-    "preversion": "npm run test",
-    "test": "jest"
-  },
-  "version": "2.0.0"
-}

pages.json

@@ -6,14 +6,14 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationStyle": "custom", // 隐藏系统导航栏
 				"navigationBarTitleText": "城市智慧停车"
 			}
 		},
 		{
 			"path": "pages/center/index",
 			"style": {
-				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationStyle": "custom", // 隐藏系统导航栏
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "城市智慧停车"
 			}
@@ -22,7 +22,7 @@
 			"path": "pages/center/phoneLogin/phoneLogin",
 			"style": {
 				"navigationBarTitleText": "手机号登录",
-				"navigationStyle":"custom"
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -61,17 +61,17 @@
 		{
 			"path": "pages/parkingLists/parkingLists",
 			"style": {
-				"navigationStyle":"custom",
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "停车场"
 			}
 		},
 		{
 			"path": "pages/myCars/myCars",
 			"style": {
-				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationStyle": "custom", // 隐藏系统导航栏
 				"navigationBarTitleText": "我的车辆"
 			}
-		},		
+		},
 		{
 			"path": "pages/payPage/payPage",
 			"style": {
@@ -82,222 +82,195 @@
 		{
 			"path": "pages/message/message",
 			"style": {
-				"navigationStyle":"custom",// 隐藏系统导航栏
-				"navigationBarTitleText":"消息中心"
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTitleText": "消息中心"
 			}
 		},
 		{
 			"path": "pages/message/messageInfo",
 			"style": {
-				"navigationStyle":"custom",// 隐藏系统导航栏
-				"navigationBarTitleText":"消息中心"
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTitleText": "消息中心"
 			}
 		},
 		{
 			"path": "pages/payLists/payLists",
 			"style": {
-				"navigationStyle":"custom",// 隐藏系统导航栏
-				"navigationBarTitleText":"停车缴费"
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTitleText": "停车缴费"
 			}
 		},
 		{
-            "path" : "pages/parkingInformation/parkingInformation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "停车场信息",
-                "enablePullDownRefresh": false,
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-            
-        }
-        ,{
-            "path" : "pages/chargeStandard/chargeStandard",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "收费标准",
-                "enablePullDownRefresh": false,
+			"path": "pages/parkingInformation/parkingInformation",
+			"style": {
+				"navigationBarTitleText": "停车场信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "pages/chargeStandard/chargeStandard",
+			"style": {
+				"navigationBarTitleText": "收费标准",
+				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#008CFF",
 				"navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/handleMonthly/handleMonthly",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "办理包月",
-                "enablePullDownRefresh": false,
-                "navigationBarBackgroundColor": "#008CFF",
-                "navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/center/monthly/monthly1",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的包月",
-                "navigationBarBackgroundColor": "#008CFF",
-                "navigationBarTextStyle": "white",
+			}
+
+		}, {
+			"path": "pages/handleMonthly/handleMonthly",
+			"style": {
+				"navigationBarTitleText": "办理包月",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/center/monthly/monthly1",
+			"style": {
+				"navigationBarTitleText": "我的包月",
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
-            }
-        },
+			}
+		},
 		{
-		    "path" : "pages/center/monthly/monthly",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "我的包月",
-		        "navigationBarBackgroundColor": "#008CFF",
-		        "navigationBarTextStyle": "white",
+			"path": "pages/center/monthly/monthly",
+			"style": {
+				"navigationBarTitleText": "我的包月",
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
-		    }
+			}
 		},
 		{
-		    "path" : "pages/payLists/pay",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle":"custom",// 隐藏系统导航栏
-		        "navigationBarTitleText":"支付"
-		    }
-		    
+			"path": "pages/payLists/pay",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTitleText": "支付"
+			}
+
 		},
 		{
-		    "path" : "pages/paymentMethod/jumpMiddle",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle":"custom",// 隐藏系统导航栏
-		        "navigationBarTitleText":"跳转"
-		    }
-		    
+			"path": "pages/paymentMethod/jumpMiddle",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTitleText": "跳转"
+			}
+
 		},
 		{
-		    "path" : "pages/handleMonthly/monthPay",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle":"custom",// 隐藏系统导航栏
-		        "navigationBarTitleText":"包月支付"
-		    }
-		    
+			"path": "pages/handleMonthly/monthPay",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTitleText": "包月支付"
+			}
+
 		},
 		{
-		    "path" : "pages/searchparking/searchparking",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle":"custom",// 隐藏系统导航栏
-		        "navigationBarTitleText":"停车查询"
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/favourableActivity/favourableActivity",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "一分钱停车",
-                "enablePullDownRefresh": false,
-                "navigationBarBackgroundColor": "#008CFF",
-                "navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/parkingLock/parkingLock",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "车位锁",
-                "enablePullDownRefresh": false,
+			"path": "pages/searchparking/searchparking",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"navigationBarTitleText": "停车查询"
+			}
+
+		}, {
+			"path": "pages/favourableActivity/favourableActivity",
+			"style": {
+				"navigationBarTitleText": "一分钱停车",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/parkingLock/parkingLock",
+			"style": {
+				"navigationBarTitleText": "车位锁",
+				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#008CFF",
 				"navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/parkingLists/map_web_view/map_web_view",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom",
+			}
+
+		}, {
+			"path": "pages/parkingLists/map_web_view/map_web_view",
+			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "导航",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/bannerDetails/bannerDetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "详情页",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/bannerDetails/bannerDetails",
+			"style": {
+				"navigationBarTitleText": "详情页",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/applyRefund/applyRefund",
+			"style": {
+				"navigationBarTitleText": "申请退款",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/applyRefundDetails/applyRefundDetails",
+			"style": {
+				"navigationBarTitleText": "申请退款",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#008CFF",
 				"navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/applyRefund/applyRefund",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "申请退款",
-                "enablePullDownRefresh": false,
-                "navigationBarBackgroundColor": "#008CFF",
-                "navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/applyRefundDetails/applyRefundDetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "申请退款",
-                "enablePullDownRefresh": false,
-                "navigationBarBackgroundColor": "#008CFF",
-                "navigationBarTextStyle": "white"
-            }
-            
-        },{
-            "path" : "pages/applyRefundDetails/applyRefundAchieveDetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "订单详情"
-            }
-            
-        }
-        ,{
-            "path" : "pages/privacyPolicy/privacyPolicy",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "隐私政策",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+			}
+
+		}, {
+			"path": "pages/applyRefundDetails/applyRefundAchieveDetails",
+			"style": {
+				"navigationBarTitleText": "订单详情"
+			}
+
+		}, {
+			"path": "pages/privacyPolicy/privacyPolicy",
+			"style": {
+				"navigationBarTitleText": "隐私政策",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uView",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
-		"backgroundColorTop":"#FFFFFF"
+		"backgroundColorTop": "#FFFFFF"
 	},
 	"tabBar": {
-	    "color": "#909399",
-	    "selectedColor": "#303133",
-	    "borderStyle": "black",
-	    "backgroundColor": "#ffffff",
-	    "list": [{
-	        "pagePath": "pages/index/index",
-	        "iconPath": "static/index.png",
-	        "selectedIconPath": "static/index-selected.png",
-	        "text": "首页"
-	    }, {
-	        "pagePath": "pages/parkingLists/parkingLists",
-	        "iconPath": "static/car_h.png",
-	        "selectedIconPath": "static/car.png",
-	        "text": "找车位"
-	    }, {
-	        "pagePath": "pages/center/index",
-	        "iconPath": "static/center.png",
-	        "selectedIconPath": "static/center-selected.png",
-	        "text": "我"
-	    }]
+		"color": "#909399",
+		"selectedColor": "#303133",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+			"pagePath": "pages/index/index",
+			"iconPath": "static/index.png",
+			"selectedIconPath": "static/index-selected.png",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/parkingLists/parkingLists",
+			"iconPath": "static/car_h.png",
+			"selectedIconPath": "static/car.png",
+			"text": "找车位"
+		}, {
+			"pagePath": "pages/center/index",
+			"iconPath": "static/center.png",
+			"selectedIconPath": "static/center-selected.png",
+			"text": "我"
+		}]
 	}
 }

pages/handleMonthly/handleMonthly.vue

@@ -341,8 +341,8 @@
 							// } else {
 							// 	location.href = res.data.qrCodeUrl
 							// }
-							location.href = res.data.qrCodeUrl
 							localStorage.setItem('jumpUrl', this.jumpUrl)
+							location.href = res.data.qrCodeUrl
 						} else {
 							this.$refs.uToast.show({
 								title: res.msg,

pages/parkingLock/parkingLock.vue

@@ -15,11 +15,15 @@
 					<view>{{orderInfo.spaceName}}</view>
 				</view>
 				<view class="parking-lock-info-item">
-					<view>入场时间</view>
+					<view>免费时长</view>
+					<view>15分钟</view>
+				</view>
+				<view class="parking-lock-info-item">
+					<view>开始计费</view>
 					<view>{{orderInfo.inTime}}</view>
 				</view>
 				<view class="parking-lock-info-item">
-					<view>出场时间</view>
+					<view>结束计费</view>
 					<view>{{orderInfo.outTime}}</view>
 				</view>
 				<view class="parking-lock-info-item">

pages/paymentMethod/paymentMethod.vue

@@ -28,7 +28,7 @@
 					</view>
 					<view class="pay-way-item pay-way-item-jh" @click="wechatPay">
 						<image src="../../static/img/juhe-icon.png" mode=""></image>
-						<view class="title">聚合支付</view>
+						<view class="title">微信/支付宝</view>
 					</view>
 				</view>
 				<button class="pay-way-close-btn" @click="closePaymentMethod">关闭</button>

static/html/wxPayCallback.html

@@ -1,4 +1,3 @@
-<!--周世豪，20210716-->
 <html>
 <head>
     <meta charset="utf-8">
@@ -9,53 +8,58 @@
     <script type="text/javascript" src="https://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
     <script type="text/javascript" charset="UTF-8" src="https://wx.gtimg.com/pay_h5/goldplan/js/jgoldplan-1.0.0.js"></script>
     <style type="text/css">
-			body {
-				margin: 0;
-				padding: 0;
-				width: 100%;
-				height: 600px;
-			}
-			.container {
-				height: 100%;
-				padding: 50px 0;
-				text-align: center;
-				background: linear-gradient(138deg, #7EBAB8 0%, #48999A 100%);
-				box-shadow: 0px 2px 4px 0px #0B7C7D;
-			}
-			.text-img {
-				width: calc(100% - 40px);
-				margin: 0 auto;
-			}
-			.car-img {
-				width: 100%;
-				margin-top: 39px;
-			}
-			.button {
-				display: inline-block;
-				width: calc(100% - 84px);
-				height: 6vh;
-				line-height: 6vh;
-				text-decoration: none;
-				margin-top: 4vh;
-				outline: none;
-				border: none;
-				background: #FFFFFF;
-				box-shadow: 0px 7px 13px 0px rgba(0, 105, 106, 0.26);
-				border-radius: 10px;
-				font-size: 1.1em;
-				font-weight: 500;
-				color: #1D8587;
-				font-family: 'PingFangSC-Medium, PingFang SC';
-			}
+    	body {
+    		margin: 0;
+    		padding: 0;
+    		width: 100%;
+    		height: 600px;
+    	}
+    	.container {
+    		height: 100%;
+    		padding: 50px 0;
+    		text-align: center;
+    		background: linear-gradient(138deg, #7EBAB8 0%, #48999A 100%);
+    		box-shadow: 0px 2px 4px 0px #0B7C7D;
+    	}
+    	.text-img {
+    		margin: 0 auto;
+    	}
+    	.car-img {
+    		margin-top: 39px;
+    	}
+    	.button {
+    		display: inline-block;
+    		width: calc(100% - 84px);
+    		height: 6vh;
+    		line-height: 6vh;
+    		text-decoration: none;
+    		margin-top: 4vh;
+    		outline: none;
+    		border: none;
+    		background: #FFFFFF;
+    		box-shadow: 0px 7px 13px 0px rgba(0, 105, 106, 0.26);
+    		border-radius: 10px;
+    		font-size: 1.1em;
+    		font-weight: 500;
+    		color: #1D8587;
+    		font-family: 'PingFangSC-Medium, PingFang SC';
+    	}
     </style>
 </head>
 <body>
     <div class="container">
 		<div class="text-img">
+<<<<<<< HEAD
+			<img src="https://h5.pdzhtc.com/static/img/text-html-bg.png" alt="" width="290" height="100"/>
+		</div>
+		<div class="car-img">
+			<img src="https://h5.pdzhtc.com/static/img/car-html-bg.png" alt="" width="300" height="170"/>
+=======
 			<img src="https://h5.pdzhtc.com/static/img/text-html-bg.png" alt="" width="80%" height="20%"/>
 		</div>
 		<div class="car-img">
 			<img src="https://h5.pdzhtc.com/static/img/car-html-bg.png" alt="" width="65%" height="25%"/>
+>>>>>>> 07d8f3d90719874f4d560a7a8a47ab08f65cf0fc
 		</div>
 		<a href="javascript:goToBgzchina()" class="button">回到普定智慧停车</a>
 	</div>
@@ -86,11 +90,10 @@
                                height:960};//高度可选（参考说明文档）
         var postData = JSON.stringify(mchData);
         parent.postMessage(postData,'https://payapp.weixin.qq.com');
-    
+        
+        const jumpUrl = localStorage.getItem('jumpUrl')
         //测试跳转到其他页面【非必需】
         function goToBgzchina() {
-			// let jumpUrl = localStorage.getItem('jumpUrl') || 'https://h5.pdzhtc.com';
-			// alert('111',jumpUrl)
             var mchData = {
                 action: 'jumpOut',
                 jumpOutUrl: 'https://h5.pdzhtc.com?type=jumpurl' //要跳转到的页面。注意：不支持跳转到小程序