zhengkaixin 3 سال پیش
والد
کامیت
5802431b1f
5فایلهای تغییر یافته به همراه29 افزوده شده و 17 حذف شده
  1. 1 1
      pages/index/index.vue
  2. 9 4
      pages/login/login.vue
  3. 14 8
      pages/login/welcome.vue
  4. 1 1
      pages/searchPile/stationAndPile/chargingPileDetails.vue
  5. 4 3
      utils/mixin.js

+ 1 - 1
pages/index/index.vue

@@ -250,7 +250,7 @@
 				this.indexLogo=indexLogo;
 				this.indexLogo=indexLogo;
  			}
  			}
 			if(op.jpcode){
 			if(op.jpcode){
-				var k=API.codeOperation(op.jpcode);
+				var k=API.codeOperation(op.jpcode)
 				if(k){
 				if(k){
 					uni.navigateTo({
 					uni.navigateTo({
 						url:k
 						url:k

+ 9 - 4
pages/login/login.vue

@@ -39,6 +39,7 @@
 
 
 <script>
 <script>
 	import * as loginApi from '@/apis/login.js'
 	import * as loginApi from '@/apis/login.js'
+	import * as API from '@/apis/index.js'
 	
 	
 	import {
 	import {
 		checkPhone
 		checkPhone
@@ -188,10 +189,14 @@
 					this.carhelp.setPersonInfo(response.data.regUser);
 					this.carhelp.setPersonInfo(response.data.regUser);
 					
 					
 					if(this.code == 'A') {
 					if(this.code == 'A') {
-						uni.redirectTo({
-						//	url: '/pages/searchPile/stationAndPile/chargingPileDetails?id=' + this.codeId
-							url: '/pages/index/index?jpcode=jp_team51_charge_id:A_' +this.codeId
-						})
+						
+						var k=API.codeOperation("jp_team51_charge_id:A_"+this.codeId);
+						if(k){
+							uni.redirectTo({
+								url:k
+							})
+						}
+						
 					} else {
 					} else {
 						uni.redirectTo({
 						uni.redirectTo({
 							url: '/pages/index/index'
 							url: '/pages/index/index'

+ 14 - 8
pages/login/welcome.vue

@@ -120,16 +120,22 @@
 			this.findNoLTextConfigure()
 			this.findNoLTextConfigure()
 			this.findByOpenId()
 			this.findByOpenId()
 			if(op.gunId){
 			if(op.gunId){
-				uni.redirectTo({
-					url: '/pages/index/index?jpcode=jp_team51_charge_id:A_'+op.gunId
-				})
-				
+				var k=API.codeOperation("jp_team51_charge_id:A_"+op.gunId);
+				if(k){
+					uni.redirectTo({
+						url:k
+					})
+				}
+			
 			}else if(op.jpcode){
 			}else if(op.jpcode){
 				
 				
-				uni.redirectTo({
-					url: '/pages/index/index?jpcode='+op.jpcode
-				})
-				
+				var k=API.codeOperation(op.jpcode);
+				if(k){
+					uni.redirectTo({
+						url:k
+					})
+				}
+							
 			}else{
 			}else{
 				this.onReadyIng()
 				this.onReadyIng()
 			}
 			}

+ 1 - 1
pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<view>
 	<view>
-		<u-navbar title="充电桩详情" ></u-navbar>
+		<u-navbar title="充电桩详情" :is-back="false" ></u-navbar>
 
 
 		<!-- 充电桩信息 -->
 		<!-- 充电桩信息 -->
 		<view class="main">
 		<view class="main">

+ 4 - 3
utils/mixin.js

@@ -2,10 +2,11 @@ var prefix = 'jp_charging_' + process.car.NODE_ENV + '_';
 
 
 var app = {
 var app = {
 	getGunIdCharge :()=>{
 	getGunIdCharge :()=>{
-		var date= uni.get( "GunId_Date_charge")
+
+		var date= uni.getStorageSync( prefix + "GunId_Date_charge")
 		var now=new Date().getTime()
 		var now=new Date().getTime()
-		if(date+5*60*1000<now){
-			return  uni.get( "GunId_Date_Show_charge")
+		if(date+5*60*1000>now){
+			return  uni.getStorageSync(prefix +  "GunId_Date_Show_charge")
 		}else{
 		}else{
 			return "";
 			return "";
 		}
 		}