优化

common/config.js

@@ -1,26 +1,9 @@
 const config = {
 	wxAppid:'wxbe90cc7c5233dd84',// 测试wxAppid 
-	// wxAppid: 'wx45c3cf2b632f5fd5', // 正式公众号
-	// baseUrl:'http://wx.hw.hongweisoft.com/parking/client',//64
-	baseUrl:'http://wx.hw.hongweisoft.com/parking/client',//殷登顺
-	// 正式接口访问地址
-	// baseUrl:'http://parking.pdzhtc.com/client',
-	
-	
-	//登录链接
-	// loginUrl:'http://wx.hw.hongweisoft.com/parking/client/wechat/h5/authorize?returnUrl=http://wx.hw.hongweisoft.com/wxpaydemoh5',
-	//七牛云
-	// imgUrl:"http://qny.gzsdtfp.com/",
-	
-	// 登录重定向首页地址
-	// jumpHomeUrl: 'http://h5.pdzhtc.com/#/', // 正式服务器地址
-	jumpHomeUrl: 'http://wx.hw.hongweisoft.com/wxpaydemoh5/#/', // 64服务器地址
-	// jumpHomeUrl: 'http://localhost:8080/#/', // 本地测试地址
-	// 重定位登录页
-	// jumpLoginUrl: 'http://h5.pdzhtc.com/#/pages/center/phoneLogin/phoneLogin', // 正式环境地址
-	jumpLoginUrl: 'http://wx.hw.hongweisoft.com/wxpaydemoh5/#/pages/center/phoneLogin/phoneLogin', // 64环境地址
-	// jumpLoginUrl: 'http://localhost:8080/#/pages/center/phoneLogin/phoneLogin', // 本地环境地址
+	// wxAppid: 'wx45c3cf2b632f5fd5', // 正式wxAppid
 	
+	baseUrl:'http://wx.hw.hongweisoft.com/parking/client',// 64服务器
+	// baseUrl:'http://parking.pdzhtc.com/client', //正式接口访问地址
 }
 export {
 	config

common/http.interceptor.js

@@ -48,13 +48,13 @@ const install = (Vue, vm) => {
 		if(res.code == 200) {
 			// 如果把originalData设置为了true，这里return回什么，this.$u.post的then回调中就会得到什么
 			return res;  
-		} else if(res.msg == "令牌不能为空"||res.code == 401){
-			localStorage.setItem('backUrl', location.href)
+		} else if(res.msg == "令牌不能为空" || res.code == 401){
+			const backUrl = location.href
 			const loginUrl = 'phoneLogin'
-			console.log(loginUrl.indexOf(location.href))
-			if (loginUrl.indexOf(location.href) > 0) {
-				console.log(loginUrl.indexOf(location.href))
+			if (backUrl.indexOf(loginUrl) > 0) {
+				localStorage.clear()
 			} else {
+				localStorage.setItem('backUrl', location.href)
 				alert('还未登录,即将跳转登录');
 				uni.navigateTo({
 					url: "/pages/center/phoneLogin/phoneLogin"

manifest.json

@@ -30,14 +30,29 @@
                 "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_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>"
+					/* 百度地图 */
+					"<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.BLUETOOTH_ADMIN\" />"
                 ]
             },
             /* ios打包配置 */

pages/center/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<u-navbar title-color="#fff" :custom-back="customBack" :border-bottom="false" back-icon-color="#CCE8FF" :background="{background: '#008CFF' }" title="我的"></u-navbar>
-		<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30">
+		<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30 u-p-t-30">
 			<view class="u-m-r-24" @click="clickHead">
 				<u-avatar :src="userInfo.headImgUrl || userInfo.avatar||pic" size="140"></u-avatar>
 			</view>
@@ -82,17 +82,17 @@
 		</view> -->
 		<!-- 登出提示-->
 		<u-modal
-		v-model="logoutPop"
-		:title-style="{color: '#404040'}"
-		title="登出提示"
-		:show-confirm-button="true"
-		confirm-text="确认"
-		:confirm-style="{backgroundColor: '#3397FA', color: '#fff'}"
-		:show-cancel-button="true"
-		cancel-text="取消"
-		@cancel="logoutPop = false"
-		:cancel-style="{backgroundColor: '#EBF1FF', color: '#3397FA'}"
-		@confirm="loginOut">
+			v-model="logoutPop"
+			:title-style="{color: '#404040'}"
+			title="登出提示"
+			:show-confirm-button="true"
+			confirm-text="确认"
+			:confirm-style="{backgroundColor: '#3397FA', color: '#fff'}"
+			:show-cancel-button="true"
+			cancel-text="取消"
+			@cancel="logoutPop = false"
+			:cancel-style="{backgroundColor: '#EBF1FF', color: '#3397FA'}"
+			@confirm="loginOut">
 			<view class="slot-content">
 				<view class="pay-tips">你确认退出登录吗?</view>
 			</view>
@@ -103,14 +103,15 @@
 
 <script>
 	import getUrlParams from "../../utils/getUrlParams.js";
-	import {config} from "./../../common/config"
 	export default {
 		data() {
 			return {
-				pic:'/static/img/default-avatar.png',
-				userInfo:[],
-				code:null,
-				phoneNo:'114',
+				// 默认头像
+				pic: '/static/img/default-avatar.png',
+				// 用户信息
+				userInfo: [],
+				code: null,
+				phoneNo: '114',
 				logoutPop: false
 			}
 		},
@@ -127,14 +128,13 @@
 				this.userInfo = [];
 			};
 			let locationLocaturl = window.location.search;
-			this.code = getUrlParams(locationLocaturl,"code");
-			if(this.code&&!this.$store.state.vuex_wxinfo.openId){this.handleGetWXInfo(this.code)};
-			
-
+			this.code = getUrlParams(locationLocaturl, "code");
+			if (this.code&&!this.$store.state.vuex_wxinfo.openId){
+				this.handleGetWXInfo(this.code)
+			};
 		},
 		methods: {
 			openPage(path) {
-				console.log('path',path);
 				this.$u.route({ 
 					url: path
 				})
@@ -143,7 +143,6 @@
 			login(status){
 				console.log('this.$store.state.vuex_hasLogin',this.$store.state.vuex_hasLogin);
 				if(!status){
-					console.log('config',this.config);
 					this.$u.route({
 						url: 'pages/center/phoneLogin/phoneLogin'
 					});
@@ -169,7 +168,6 @@
 					this.code = ''
 					localStorage.clear()
 					this.logoutPop = false
-					// location.href = config.jumpLoginUrl
 					uni.navigateTo({
 						url: '/pages/center/phoneLogin/phoneLogin'
 					})
@@ -180,23 +178,6 @@
 					this.logoutPop = true
 				}
 			}
-			// 贵州银行支付
-			// guizhouPay(){
-			// 	let tradeNo = new Date().getTime();
-			// 	uni.setStorage({
-			// 		key:'gzbankTradeNo',
-			// 		data:tradeNo
-			// 	});
-			// 	this.$u.api.gzbank({orderId:tradeNo,openid:'111'})
-			// 	.then(res=>{
-			// 		let bankLink = res.msg;
-			// 		location.href = bankLink;
-			// 	}).catch(err=>{
-			// 		console.log('gzbank err',err);
-			// 	});
-				
-			// },// 贵州银行支付
-
 		}
 	}
 </script>

pages/center/monthly/monthly.vue

@@ -25,7 +25,7 @@
 						</view>
 						<view class="monthly-list-item-bottom" >
 							<view class="mlib-item">
-								<view>包期</view>:
+								<view>有效期限</view>:
 								<view>{{(monthlyItem.beginTime.split('-')).join('.')}}-{{(monthlyItem.endTime.split('-')).join('.')}}</view>
 							</view>
 							<view class="mlib-item">

pages/center/order/order.vue

@@ -19,8 +19,8 @@
 								<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">出场时间：{{orderItem.outTime}}</view>
-									<view class="order-center-item">停留时间：{{orderItem.duration}}</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.duration}}</view>
 									<view class="order-center-item">应付金额：<span class="pay-amount">{{orderItem.payAmount}}</span></view>
 								</view>
 								<view class="order-bottom">
@@ -46,7 +46,7 @@ export default {
 			list: [
 				{index:0,name: '全部',orderStatu:null,pageNum:1,total:null},
 				{index:1,name: '未出场',orderStatu:1,pageNum:1,total:null},
-				{index:2,name: '缴费中',orderStatu:2,pageNum:1,total:null},
+				{index:2,name: '出场未缴',orderStatu:2,pageNum:1,total:null},
 				{index:3,name: '已完成',orderStatu:4,pageNum:1,total:null}
 			],
 			current: 0,

pages/center/phoneLogin/phoneLogin.vue

@@ -25,7 +25,6 @@
 
 <script>
 import getUrlParams from "./../../../utils/getUrlParams.js";
-import { config } from '@/common/config.js';
 export default {
 	data() {
 		return {
@@ -51,7 +50,7 @@ export default {
 	computed: {
 		inputStyle() {
 			let style = {};
-			if(this.tel.length==11&&this.messageDisable==false&&this.$u.test.mobile(this.tel)) {
+			if(this.tel.length == 11&&this.messageDisable==false&&this.$u.test.mobile(this.tel)) {
 				style.color = "#fff";
 				style.backgroundColor = '#5295F5';
 				this.telError = false;
@@ -132,27 +131,6 @@ export default {
 					this.$u.vuex('vuex_user', res.data);
 					this.$u.vuex('vuex_hasLogin', true);
 					this.wechatLogin()
-					// location.href = backUrl;
-					// this.$refs.uToast.show({
-					// 	title: '操作成功',
-					// 	url: backUrl,
-					// 	// isTab:true,
-					// 	callback :function(err){
-					// 		console.log('err',err)
-					// 	}
-					// });
-					
-					// this.$u.api.getuseinfo().then(res => {
-					// 	console.log('getuseinfo',res.retBody);
-					// 	this.$u.vuex('vuex_user', res.retBody);
-					// 	this.toastMsg = '操作成功';
-					// 	this.showToast();
-					// 	setTimeout(() => {
-					// 		this.$u.route({
-					// 			url: 'pages/template/wxCenter/index'
-					// 		})
-					// 	}, 2000);
-					// });
 					
 				}else{
 					this.toastMsg = res.msg;
@@ -178,10 +156,19 @@ export default {
 		// 微信已登录则跳转到首页
 		jumpIndex() {
 			let ret = localStorage.getItem('backUrl')
-			if (ret) {
-				location.href = ret;
+			if (ret && ret.indexOf('phoneLogin') < 0) {
+				// 截取url
+				const pagesIndex = ret.indexOf('pages')
+				const pageUrl = ret.slice(pagesIndex)
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/' + pageUrl
+					})
+				}, 100)
 			} else {
-				location.href = config.jumpHomeUrl
+				uni.switchTab({
+					url: '../../index/index'
+				})
 			}
 		},
 		// 获取code

pages/favourableActivity/favourableActivity.scss

@@ -15,8 +15,10 @@
 		.penny-parking-content {
 			width: 100%;
 			background-image: url('/static/img/penny-parking-bg.png');
-			background-size: 100% 100%;
-			background-position: center 50rpx;
+			// background-size: 100% 100%;
+			background-size: cover;
+			background-position: center center;
+			background-repeat: no-repeat;
 			view {
 				&:nth-child(1) {
 					color: #4E4E4E;
@@ -46,7 +48,7 @@
 					line-height: 96rpx;
 					background-color: #008CFF;
 					color: #fff;
-					margin-top: 60rpx;
+					margin-top: 80rpx;
 					border-radius: 10rpx;
 					font-size: 28rpx;
 					font-weight: 500;

pages/handleMonthly/handleMonthly.vue

@@ -25,7 +25,7 @@
 			</view>
 		</view>
 		<view class="handle-monthly-item">
-			<view>包期</view>
+			<view>有效期限</view>
 			<view>{{dateRange}}</view>
 		</view>
 		<view class="handle-monthly-explain">

pages/index/index.vue

@@ -14,17 +14,17 @@
 		
 		<u-city-select v-model="cityOpen" @city-change="cityChange" :areaCode='["52", "5201"]' ></u-city-select>
 		
-		<view class="notice-bar-wrap u-flex" v-if="noticeList.length>=1" @click="openPage('pages/message/message')">
+		<view class="notice-bar-wrap u-flex" v-if="noticeList.length >= 1" @click="openPage('pages/message/message')">
 			<u-icon custom-prefix="custom-icon" size="50" name="xiaoxi" color="#008CFF"></u-icon>
 			<u-notice-bar
-			 class="u-flex-1"
-			mode="vertical"
-			:autoplay="true"
-			 :list="noticeList" 
-			 :volume-icon="false" 
-			 bg-color="#fff" 
-			 color="#727272"
-			 :more-icon="true"></u-notice-bar>
+				class="u-flex-1"
+				mode="vertical"
+				:autoplay="true"
+				:list="noticeList" 
+				:volume-icon="false" 
+				bg-color="#fff" 
+				color="#727272"
+				:more-icon="true"></u-notice-bar>
 		</view>
 		<u-card :show-head="false" :show-foot="false" border-radius="16" margin="20rpx 40rpx" padding="30">
 			<view class="content-nav" slot="body">
@@ -73,15 +73,16 @@
 						<view class="pending-order-body-left">
 							<view class="car-number">{{item.vehicleNo}}</view>
 							<view class="item-cell">
-								<span class="pending-order-body-left-label">入场时间:</span>
+								<span class="pending-order-body-left-label">入场时间：</span>
 								<span>{{item.inTime}}</span>
 							</view>
 							<view class="item-cell">
-								<span class="pending-order-body-left-label">出场时间:</span>
-								<span>{{item.outTime}}</span>
+								<span class="pending-order-body-left-label">出场时间：</span>
+								<!-- <span>{{item.outTime}}</span> -->
+								<span>计时中</span>
 							</view>
 							<view class="item-cell">
-								<span class="pending-order-body-left-label">预计金额:</span>
+								<span class="pending-order-body-left-label">预计金额：</span>
 								<span>{{item.payAmount}}</span>
 							</view>
 							<!-- <view class="item-cell">
@@ -120,37 +121,11 @@
 				</view>
 			</u-card>
 		</template>
-		<!-- <view class="promotion" @click="$refs.uToast.show({title: '建设中'})">
-			<view class="promotion-header u-flex u-row-between">
-				<view class="promotion-header-til">优惠活动</view>
-				<view class="promotion-header-con">去领取</view>
-			</view>
-			<view class="promotion-body">
-				<view class="promotion-body-til">八折停车</view>
-				<view class="promotion-body-con">从客户启用贵州银行行卡支付的第四个月开始，使用我行卡支付永久享受八折优惠（单日不限次数)...</view>
-			</view>
-		</view> -->
 		<view class="promotion-box">
 			<view class="promotion-title">
 				<text>优惠活动</text>
 			</view>
 			<view class="promotion-banner">
-				<!-- <swiper
-					class="promotion-banner-swiper"
-					:indicator-dots="true"
-					indicator-color="rgba(170, 216, 255, 1)"
-					indicator-active-color="#008CFF"
-					:autoplay="true"
-					:duration="500"
-					mode="dot"
-					:interval="3000"
-					:circular="true">
-					<swiper-item v-for="(item, index) in promotionBannerList" :key="'bannner' + index">
-						<view class="promotion-banner-item">
-							<image :src="item.image" mode=""></image>
-						</view>
-					</swiper-item>
-				</swiper> -->
 				<u-swiper
 					:list="promotionBannerList"
 					@click="promotionBannerClick"
@@ -196,7 +171,7 @@
 		},
 		data() {
 			return {
-				city: '普定县',
+				city: '贵州省',
 				keyword:'',
 				bannerList:[
 					{image: '/static/img/index-banner01.png',title: ''}
@@ -235,8 +210,7 @@
 		},
 		onShow() {
 			this.handleGetIndexData();
-			// this.getLocation();
-			// this.getCityNameByLonLat({latitude: 26.301447, longitude: 105.743197})
+			this.getLocation();
 			let locationLocaturl = window.location.search;
 			this.code = getUrlParams(locationLocaturl,"code");
 			if(this.code&&!this.$store.state.vuex_wxinfo.openId){this.handleGetWXInfo(this.code)};
@@ -252,7 +226,7 @@
 						that.latLongItude = {latitude: res.latitude,longitude:res.longitude};
 						that.latitude = res.latitude;
 						that.longitude = res.longitude;
-						// that.getCityNameByLonLat(that.latLongItude)
+						that.getCityNameByLonLat(that.latLongItude)
 					},
 					fail: () => {
 						console.log("获取经纬度失败");
@@ -376,83 +350,6 @@
 					}
 				})
 			},
-			// gyBankPay() {
-			// 	this.$u.api.payGzbank({orderList: this.curOrderList}).then(res=>{
-			// 		let payUrl = res.data.url;
-			// 		this.currentPayUrl=encodeURIComponent(res.data.url);
-			// 		this.$u.route({
-			// 			url: 'pages/payLists/pay',
-			// 			params: {
-			// 				currentPayUrl: this.currentPayUrl
-			// 			}
-			// 		});
-			// 	}).catch(err=>{
-			// 		this.$refs.uToast.show({
-			// 			title: err.msg,
-			// 			type: 'error',
-			// 		});
-			// 	});
-			// },
-			// // 微信支付
-			// wechatPay() {
-			// 	const openId = this.$store.state.vuex_wxinfo.openId
-			// 	if (openId) {
-			// 		this.getWXPay(this.curOrderList)
-			// 	} else {
-			// 		this.getCode()
-			// 	}
-			// },
-			// async getWXPay(list){
-			// 	let params = {
-			// 		orderList: list,
-			// 		openid: this.$store.state.vuex_wxinfo.openId
-			// 	};
-			// 	await this.$wxApi.config();
-			// 	this.$pay.wechatPay(params).then(res =>{
-			// 		if(res.code == 0){
-			// 			// 成功
-			// 			this.$u.route({
-			// 				url:'/',
-			// 			});
-			// 		}else if(res.code == 1){
-			// 			// 取消
-			// 			// uni.redirectTo({
-			// 			// 	url: '/pages/userCenter/myOrder/myOrder'
-			// 			// })
-			// 		}else if(res.code == 2){
-			// 			this.$refs.uToast.show({
-			// 				title: '支付失败，请检查!',
-			// 				type: 'error',
-			// 				// url: '/pages/user/index'
-			// 			});
-			// 		}
-			// 	});
-			// },
-			// getCode () {
-			// 	var local = window.location.href // 获取页面url
-			// 	let locationLocaturl = window.location.search;
-			// 	this.code = getUrlParams(locationLocaturl,"code"); // 截取code
-			// 	if (this.code == null || this.code === '') { // 如果没有code，则去请求
-			// 		window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${this.config.wxAppid}&redirect_uri=${encodeURIComponent(local)}&response_type=code&scope=snsapi_userinfo&#wechat_redirect`
-			// 	} else {
-			// 		this.handleGetWXInfo(this.code) //把code传给后台获取用户信息
-			// 	}
-			// },
-			// handleGetWXInfo (code) { // 通过code获取 openId等用户信息，/api/user/wechat/login 为后台接口
-			// 	let _this = this
-			// 	this.$u.api.getWXInfo(code).then((res) => {
-			// 		if (res.code === 200 ) {
-			// 			this.$u.vuex('vuex_wxinfo', res.data);
-			// 			// 继续支付
-			// 			this.getWXPay(this.currentItem)
-			// 		}
-			// 	}).catch((err) => {
-			// 		this.$refs.uToast.show({
-			// 			title: err.msg,
-			// 			type: 'error',
-			// 		});
-			// 	})
-			// },
 			// 关闭弹框
 			closePaymentMethod() {
 				this.payWayPop = false

pages/parkingLists/parkingLists.vue

@@ -103,11 +103,13 @@
 			</view>
 		</view>
 		<u-select v-model="mapSelect" :list="mapSelectList" @confirm="mapSelectConfirm"></u-select>
+		<map id="map" hidden="true"></map>
 		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
+	import Map from '@/js_sdk/ms-openMap/openMap.js'
 	export default{
 		data(){
 			return{
@@ -207,21 +209,30 @@
 			  * 导航 
 			  * */
 			navigation (latitude, longitude) {
-				this.currentPositionHover = {
-					latitude: latitude,
-					longitude: longitude
-				}
-				this.mapSelect = true
+				// this.currentPositionHover = {
+				// 	latitude: latitude,
+				// 	longitude: longitude
+				// }
+				// this.mapSelect = true
 				// 腾讯地图用webview
-				// uni.navigateTo({
-				//   url: '/pages/parkingLists/map_web_view/map_web_view?url=https://3gimg.qq.com/lightmap/v1/marker/?marker=coord:'+latitude+','+longitude+'&referer=myApp&key=BOGBZ-2BZ33-O4L32-Y3QJR-PGN66-RFFEL'
-				// })
+				uni.navigateTo({
+				  url: '/pages/parkingLists/map_web_view/map_web_view?url=https://3gimg.qq.com/lightmap/v1/marker/?marker=coord:'+latitude+','+longitude+'&referer=myApp&key=BOGBZ-2BZ33-O4L32-Y3QJR-PGN66-RFFEL'
+				})
+				/* 组件多地图调用 */
+				// this.nearParkingFlag = false
+				// var options = {
+				//     destination:{  // 导航终点点坐标和名称
+				//         latitude: latitude,
+				//         longitude: longitude,
+				//         name: "终点"
+				//     },
+				//     mapId: "map" // map 组件的 id (微信小程序端必传)
+				// }
+				// Map.navigation(options)
 			},
 			// 多地图选择
 			mapSelectConfirm(item) {
 				const name = item[0].label
-				console.log(this.currentPosition)
-				console.log(this.currentPositionHover)
 				switch(name) {
 					case '腾讯地图':
 						uni.navigateTo({

pages/payLists/payLists.vue

@@ -15,8 +15,8 @@
 						<view class="pay-center">
 							<view class="pay-center-item">停车泊位：{{payItem.spaceName}}</view>
 							<view class="pay-center-item">入场时间：{{payItem.inTime}}</view>
-							<view class="pay-center-item">出场时间：{{payItem.outTime}}</view>
-							<view class="pay-center-item">停留时间：{{payItem.duration}}</view>
+							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">出场时间：{{payItem.outTime}}</view>
+							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">停留时间：{{payItem.duration}}</view>
 							<view class="pay-center-item">应付金额：<span class="pay-amount">{{payItem.payAmount}}</span></view>
 						</view>
 						<view class="pay-bottom">
@@ -72,9 +72,7 @@
 			return {
 				currentPayUrl: "",
 				payList: [],
-				list: [
-					{index:0,name: '未缴费',orderStatu:3,pageNum:1,total:null}
-				],
+				list: [],
 				orderList: [],
 				PayUrl: "",
 				payTipsPop: false,

pages/paymentMethod/paymentMethod.vue

@@ -63,8 +63,18 @@
 					jumpUrl: window.location.href
 				};
 				this.$u.api.payGzbank(params).then(res=>{
-					let payUrl = res.data.url;
-					window.location.href = payUrl;
+					if (res.data.needPay) {
+						let payUrl = res.data.url;
+						window.location.href = payUrl;
+					} else {
+						this.$refs.uToast.show({
+							title: '无需支付',
+							type: 'info',
+						});
+						setTimeout(() => {
+							location.reload()
+						}, 1000)
+					}
 				}).catch(err=>{
 					this.$refs.uToast.show({
 						title: err.msg,

utils/filter.js

@@ -71,7 +71,7 @@ Vue.filter("filterOrderStatus",function(status){
 			return '停放中'
 			break;
 		case 2:
-			return '出场未缴'
+			return '出场中'
 			break;
 		case 3:
 			return '欠费'