auto commit

common/config.js

@@ -1,9 +1,9 @@
 const config = {
-	wxAppid:'wxbe90cc7c5233dd84',// 测试wxAppid 
-	// wxAppid: 'wx45c3cf2b632f5fd5', // 正式wxAppid
+	// wxAppid:'wxbe90cc7c5233dd84',// 测试wxAppid 
+	wxAppid: 'wx45c3cf2b632f5fd5', // 正式wxAppid
 	
-	baseUrl:'https://wx.hw.hongweisoft.com/parking',// 64服务器
-	// baseUrl: 'https://parking.pdzhtc.com', //正式接口访问地址
+	// baseUrl:'https://wx.hw.hongweisoft.com/parking',// 64服务器
+	baseUrl: 'https://parking.pdzhtc.com', //正式接口访问地址
 }
 export {
 	config

common/http.api.js

@@ -31,7 +31,7 @@ const install = (Vue, vm) => {
 	
 	let getOrderList = (params = {}) => vm.$u.get(apiurl.getOrderListUrl,params);
 	let getOrderinfo = (params = {}) => vm.$u.get(apiurl.getOrderinfoUrl+params.id);
-	let getOrderDetail = (params = {}) => vm.$u.get(apiurl.getOrderDetailUrl+params.id);
+	let getOrderDetail = (params = {}) => vm.$u.get(apiurl.getOrderDetailUrl+params.id,{showLoading: false});
 	
 	let getMessageList = (params = {}) => vm.$u.get(apiurl.getMessageListUrl,params);
 	let messageRead = (params ={}) => vm.$u.put(apiurl.messageReadUrl+params.newId);

pages/center/index.vue

@@ -126,7 +126,7 @@ export default {
       // 用户信息
       userInfo: [],
       code: null,
-      phoneNo: '16608538666',
+      phoneNo: '18885351206',
       logoutPop: false,
       messageNum: 0
     }

pages/center/order/order.vue

@@ -64,6 +64,7 @@
                 </view>
                 <view class="order-center">
                   <view class="order-center-item">订单编号：{{ orderItem.orderId }}</view>
+				  <view class="order-center-item" v-if="orderItem.deviceType !=1">设备编号：{{ orderItem.deviceNo }}</view>
                   <view class="order-center-item">入场时间：{{ orderItem.inTime }}</view>
 				  <view
 				    class="order-center-item"

pages/index/index.scss

@@ -156,6 +156,14 @@ page{background-color: $my-page-bg-color;}
 			border-radius: 10rpx;
 			cursor: pointer;
 		}
+		.go-pay1{
+			display: inline-block;
+			padding: 12rpx 39rpx 11rpx;
+			background: linear-gradient(90deg, #D3D3D3 0%, #F5F5F5 100%, #DCDCDC 100%);
+			color: #fff;
+			border-radius: 10rpx;
+			cursor: pointer;
+		}
 	}
 	
 }

pages/index/index.vue

@@ -119,7 +119,7 @@
                 <span>{{ item.inTime }}</span>
               </view>
               <view class="item-cell">
-                <span class="pending-order-body-left-label">预计出场时间：</span>
+                <span class="pending-order-body-left-label">出场时间：</span>
                 <span>{{item.outTime}}</span>
               </view>
               <view class="item-cell">
@@ -146,7 +146,8 @@
               <view class="order">停车泊位:{{ item.spaceName }}</view>
             </view>
             <view class="go-pay-wrap">
-              <view class="go-pay" @click="goPay(item.id)">出场缴费</view>
+              <view class="go-pay" @click="goPay(item.id)"v-if="item.payAmount != 0">出场缴费</view>
+			  <view class="go-pay1" v-else>出场缴费</view>
             </view>
           </view>
           <view class="pending-order-body-wrap" v-show="orderNav == 1">

pages/parkingLock/parkingLock.scss

@@ -195,4 +195,61 @@
   to{
     transform: rotate(359deg);
   }
+}
+.loadingSelect{
+	    text-align: center;
+	    margin-top: 20rpx;
+}
+.spinner {
+  margin: auto;
+  width: 50px;
+  height: 60px;
+  text-align: center;
+  font-size: 10px;
+}
+ 
+.spinner > view {
+  background-color: #6495ED;
+  height: 100%;
+  width: 10rpx;
+  margin-right: 2rpx;
+  display: inline-block;
+   
+  -webkit-animation: stretchdelay 1.2s infinite ease-in-out;
+  animation: stretchdelay 1.2s infinite ease-in-out;
+}
+ 
+.spinner .rect2 {
+  -webkit-animation-delay: -1.1s;
+  animation-delay: -1.1s;
+}
+ 
+.spinner .rect3 {
+  -webkit-animation-delay: -1.0s;
+  animation-delay: -1.0s;
+}
+ 
+.spinner .rect4 {
+  -webkit-animation-delay: -0.9s;
+  animation-delay: -0.9s;
+}
+ 
+.spinner .rect5 {
+  -webkit-animation-delay: -0.8s;
+  animation-delay: -0.8s;
+}
+ 
+@-webkit-keyframes stretchdelay {
+  0%, 40%, 100% { -webkit-transform: scaleY(0.4) } 
+  20% { -webkit-transform: scaleY(1.0) }
+}
+ 
+@keyframes stretchdelay {
+  0%, 40%, 100% {
+    transform: scaleY(0.4);
+    -webkit-transform: scaleY(0.4);
+  }  20% {
+    transform: scaleY(1.0);
+    -webkit-transform: scaleY(1.0);
+  }
 }

pages/parkingLock/parkingLock.vue

@@ -82,6 +82,16 @@
 			:jumpUrl="jumpUrl"
 			@closePaymentMethod="closePaymentMethod"></PaymentMethod>
 		<u-toast ref="uToast" />
+		<u-popup v-model="show" mode="center" border-radius="14" width="200rpx" height="200rpx">
+				<view class="loadingSelect">订单查询中...</view>
+				<view class="spinner">
+					<view class="rect1"></view>
+					<view class="rect2"></view>
+					<view class="rect3"></view>
+					<view class="rect4"></view>
+					<view class="rect5"></view>
+				</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -112,7 +122,8 @@
 				// 订单id
 				orderId: null,
 				// 重定向地址
-				jumpUrl: location.href
+				jumpUrl: location.href + '&isBack=1',
+				show: true
 			}
 		},
 		onLoad(page) {
@@ -128,9 +139,14 @@
 			}
 		},
 		onShow() {
+			
 			this.timer1 = setInterval(() => {
+				// uni.showLoading({
+				//     title: '订单查询中'
+				// });
+				this.show = true
 				this.getOrderDetails(this.orderId)
-			}, 5000)
+			}, 2000)
 		},
 		onHide() {
 			if (this.timer) {
@@ -146,12 +162,32 @@
 			},
 			// 查询订单信息
 			getOrderDetails(id) {
+				// uni.showLoading({
+				//     title: '订单查询中'
+				// });
 				this.$u.api.getOrderDetail({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()
 							}

pages/payLists/payLists.vue

@@ -14,6 +14,7 @@
 						</view>
 						<view class="pay-center">
 							<view class="pay-center-item">停车泊位：{{payItem.spaceName}}</view>
+							<view class="pay-center-item" v-if="payItem.deviceType != 1">设备编号：{{payItem.deviceNo}}</view>
 							<view class="pay-center-item">入场时间：{{payItem.inTime}}</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>

pages/paymentMethod/paymentMethod.vue

@@ -136,14 +136,14 @@
 					openid: this.$store.state.vuex_wxinfo.openId,
 					deviceNo: deviceNo ? deviceNo : null
 				};
+				
 				await this.$wxApi.config();
 				this.$pay.wechatPay(params).then(res =>{
 					switch (Number(res.code)) {
 						case 0: // 成功
 							//#ifdef H5
-							setTimeout(()=>{
+								
 								window.location.reload();
-							},2000)
 							//#endif
 							break;
 						case 1: // 取消
@@ -184,11 +184,7 @@
 							localStorage.setItem('jumpUrl', this.jumpUrl)
 							location.href = res.data.qrCodeUrl
 						} else {
-							uni.hideLoading()
-							this.$refs.uToast.show({
-								title: res.msg,
-								type: 'error',
-							});
+							uni.hideLoading();
 						}
 					})
 					.catch(err => {