Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

.env.test.js

@@ -1,8 +1,8 @@
 const UNI_APP = {  
 		ProjectName :"51充电联盟",
     // BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
-	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
-    BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
+	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+    //BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',
    
 
 	NODE_ENV :"test",

apis/site.js

@@ -1,6 +1,67 @@
 import request from '../utils/request.js';
 import Qs from 'qs';
 
+export function getPileDetails(data){
+	var p = new Promise(function(resolve,rejct){
+		if(data != null)
+		{
+			let pile = {
+				no:'A00666',
+				interface:'国际直流',
+				type:'快充',
+				power:60000,
+				price:[
+					{time:'00:00-07:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'07:00-09:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'09:00-15:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'15:00-20:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'20:00-22:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'22:00-23:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'23:00-23:59',single_price:1.0,service_price:0.25,price:1.25},
+				]
+			}; 
+			resolve(pile)
+		}
+		reject(data);
+			
+	})
+	return p;
+}
+
+export function getPriceDetails(data){
+	var p = new Promise(function(resolve,rejct){
+		if(data != null)
+		{
+			let list = [{
+				name: '直流快充',
+				items:[
+					{time:'00:00-07:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'07:00-09:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'09:00-15:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'15:00-20:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'20:00-22:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'22:00-23:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'23:00-23:59',single_price:1.0,service_price:0.25,price:1.25},
+				]
+			}, {
+				name: '交流慢充',
+				items:[
+					{time:'00:00-07:00',single_price:0.5,service_price:0.25,price:0.75},
+					{time:'07:00-09:00',single_price:0.7,service_price:0.25,price:1.00},
+					{time:'09:00-15:00',single_price:0.7,service_price:0.25,price:1.00},
+					{time:'15:00-20:00',single_price:0.7,service_price:0.25,price:1.00},
+					{time:'20:00-22:00',single_price:0.6,service_price:0.25,price:0.90},
+					{time:'22:00-23:00',single_price:0.5,service_price:0.25,price:0.75},
+					{time:'23:00-23:59',single_price:0.5,service_price:0.25,price:0.75},
+				]
+			}];
+			resolve(list)
+		}
+		reject(data);
+			
+	})
+	return p;
+}
 export function getChargerInfoById(data) {
 	//var url='/mobile/regUser/findByOpenId';
 	/*return requestWhite({

components/Chargermap.vue

@@ -464,7 +464,9 @@ opacity:0;
 	position: absolute;
 	top: 89px;
 	left: 38px;
-	.corner{
+	
+}
+.corner{
 	   width: 0;
 	   height: 0;
 		position: absolute;
@@ -477,8 +479,6 @@ opacity:0;
 		border-right: 4px solid transparent;
 		border-top: 6px solid #b58cff ;
 	}
-}
-
 .station-icon2 {
 	width: 100px;
 	height: 36px;
@@ -490,7 +490,9 @@ opacity:0;
 	position: absolute;
 	top: 191px;
 	left: 168px;
-	.icon2-left{
+	
+}
+.icon2-left{
 		width: 36px;
 		height: 36px;
 		line-height: 36px;
@@ -499,12 +501,11 @@ opacity:0;
 		border-radius: 999px;
 		background-color: #fff;
 		color: #00b962;
-	}
-	.icon2-right{
-		color: #ffffff;
-		line-height: 14px;
-		padding: 4px;
-	}
+}
+.icon2-right{
+	color: #ffffff;
+	line-height: 14px;
+	padding: 4px;
 }
 .corner2{
    width: 0;

pages.json

@@ -3,6 +3,14 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages	
+		
+		{
+			"name": "欢迎页",
+			"path": "pages/login/welcome",
+			"style": {
+				//"navigationStyle": "custom" // 隐藏系统导航栏
+			}
+		},
 		{
 			"name": "充电中",
 			"path": "pages/index/index",
@@ -34,13 +42,7 @@
 			}
 
 		},
-		{
-			"name": "欢迎页",
-			"path": "pages/login/welcome",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
+
 		{
 			"name": "主页",
 			"path": "pages/index/index",

pages/login/welcome.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="welcome">
 			<view class="welcome-state1">
-				<view class="welcome-next">跳过</view>
+				<view class="welcome-next" @click="gotoIndex()">跳过</view>
 				<view class="welcome-foot">
 					<u-image width="185px" height="48px" src="../../static/img/logo.png"></u-image>
 				</view>
@@ -28,17 +28,7 @@
 			}
 		},
 		methods: {
-			gotoMain(k){
-				if(k){
-					uni.navigateTo({
-						url:"/pagesA/pages/login/index"
-					})
-				}else{
-					uni.switchTab({
-						url: '/pages/index/index'
-					});
-				}
-			},
+			 
 			findByOpenId(){
 				var openId=this.carhelp.getOpenId()
 				if(openId==""){
@@ -60,30 +50,26 @@
 					}
 				}).then((response) => {
 					let [error, res] = response;
-					
+					 
 					//var backImg="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"
 					this.carhelp.setConfig(res.data.data.configure) 
 					this.setBackImg()
 					
 					if (res.data.code == 200&&res.data.result) {			
 						var token = res ? res.data.data.token : '';					
-						this.carhelp.setPersonInfo(res.data.data.memberInfo );
+						this.carhelp.setPersonInfo(res.data.data.regUser );
 						this.carhelp.setToken(token);
 						this.carhelp.setPersonInfoPlus(res.data.data);
 						
-						setTimeout(()=>{
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-						},1000)
+						
 					
 					} else{
 						this.carhelp.logoff()
-						this.bottonShow=true
+					
 					}
 				}).catch(error => {
 					this.carhelp.logoff()
-					this.bottonShow=true
+				
 				})
 			},
 			setBackImg(){
@@ -91,7 +77,12 @@
 				if(img){
 					this.customStyle0="background:url("+img+") no-repeat;background-size: 100%;"
 				}
+			},gotoIndex(){
+				uni.redirectTo({
+					url: '/pages/index/index'
+				});
 			}
+			
 		},
 		onLoad() {
 			 
@@ -99,7 +90,9 @@
 			 
 		},
 		onReady() {
-			
+			setTimeout(()=>{
+				this.gotoIndex()
+			},3000)
 			this.findByOpenId()
 		}
 	}

pages/searchPile/searchPile.vue

@@ -208,7 +208,7 @@
 									</view>
 								</view>
 								<view class="card_item" style="padding-bottom: 20rpx;">
-									<u-button shape='circle' style="color: #00B962;">
+									<u-button shape='circle' style="color: #00B962;" @click="charge(item)">
 										<u-icon name="scan" size="26" color="#00B962" style="margin-right: 20rpx;"></u-icon>
 										<label>扫码充电</label></u-button>
 									<view class="round">
@@ -380,6 +380,26 @@ export default {
 		}
 	},
 	methods: {
+		charge(item){
+			 console.log('扫码充电')
+			//#ifdef MP-WEIXIN
+			uni.scanCode({
+				success:function(res){
+					uni.navigateTo({
+						url:'chargingPileDetails?pile='+encodeURIComponent(JSON.stringify(data))
+					})
+					
+				}
+			}) 
+			return;
+			//#endif
+			 
+			 console.log('扫码充电1')
+			 uni.navigateTo({
+			 	url:'stationAndPile/chargingPileDetails'
+			 })
+			
+		},
 		moveEnd(e){
 			console.log('moveEnd'+JSON.stringify(e))
 		},

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -7,105 +7,21 @@
 					:current="current" @change="change"></u-tabs>
 			</view>
 			<view class="line-box"><u-line color="#999999" /></view>
-			<view class="time-frame">
+			<view class="time-frame" v-for="(item,index) in list[current].items">
 				<view class="time-items">
 					<view class="time-price">
 						<view class="time">
-							00:00-07:00
+							{{item.time}}
 						</view>
 						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
+							<text style="color: #ff3d00; font-size: 18px;">{{item.price.toFixed(2)}}</text>
 							<text class="unit">元/度</text>
 						</view>
 					</view>
 					<view class="unitPrice-serviceCharge">
-						充电单价：￥1.0000 | 服务费：￥0.2500
+						充电单价：￥{{item.single_price.toFixed(4)}} | 服务费：￥{{item.service_price.toFixed(4)}}
 					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							00:70-09:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							09:00-15:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							15:00-20:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							20:00-22:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							22:00-23:00
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-				<view class="time-items">
-					<view class="time-price">
-						<view class="time">
-							23:00-23:59
-						</view>
-						<view class="price">
-							<text style="color: #ff3d00; font-size: 18px;">1.2500</text>
-							<text class="unit">元/度</text>
-						</view>
-					</view>
-					<view class="unitPrice-serviceCharge">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
+				</view> 
 			</view>
 		</view>
 	<view class="hint">
@@ -115,17 +31,46 @@
 </template>
 
 <script>
+	import * as api from "@/apis/site.js"
+	let _self;
 	export default {
 		data() {
 			return {
 				list: [{
-					name: '直流快充'
+					name: '直流快充',
+/*					items:[
+						{time:'00:00-07:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'07:00-09:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'09:00-15:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'15:00-20:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'20:00-22:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'22:00-23:00',single_price:1.0,service_price:0.25,price:1.25},
+						{time:'23:00-23:59',single_price:1.0,service_price:0.25,price:1.25},
+					]*/
 				}, {
-					name: '交流慢充'
+					name: '交流慢充',
+/*					items:[
+						{time:'00:00-07:00',single_price:0.5,service_price:0.25,price:0.75},
+						{time:'07:00-09:00',single_price:0.7,service_price:0.25,price:1.00},
+						{time:'09:00-15:00',single_price:0.7,service_price:0.25,price:1.00},
+						{time:'15:00-20:00',single_price:0.7,service_price:0.25,price:1.00},
+						{time:'20:00-22:00',single_price:0.6,service_price:0.25,price:0.90},
+						{time:'22:00-23:00',single_price:0.5,service_price:0.25,price:0.75},
+						{time:'23:00-23:59',single_price:0.5,service_price:0.25,price:0.75},
+					]*/
 				}],
 				current: 0
 			}
 		},
+		onLoad(op){
+			_self = this;
+			api.getPriceDetails(op).then(function(res){
+					_self.list = res;
+ 				},function(err){
+					
+				}
+			);
+		},
 		methods: {
 			change(index) {
 				this.current = index;

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -9,25 +9,25 @@
 			   <view class="detail-name">
 			   	充电桩编号
 			   </view>
-		   	    <view class="detail-content" style="font-weight: 900;">A000152</view>
+		   	    <view class="detail-content" style="font-weight: 900;">{{pile.no}}</view>
 		   </view>
 		   <view class="main-detail">
 		   			   <view class="detail-name">
 		   			   	接口类型
 		   			   </view>
-		   	    <view class="detail-content">国际直流</view>
+		   	    <view class="detail-content">{{pile.interface}}</view>
 		   </view>
 		   <view class="main-detail">
 		   			   <view class="detail-name">
 		   			   	类型
 		   			   </view>
-		   	    <view class="detail-content">快充</view>
+		   	    <view class="detail-content">{{pile.type}}</view>
 		   </view>
 		   <view class="main-detail">
 		   			   <view class="detail-name">
 		   			   	充电功率
 		   			   </view>
-		   	    <view class="detail-content"  style="font-weight: 900;">60000.0kW</view>
+		   	    <view class="detail-content"  style="font-weight: 900;">{{pile.power.toFixed(1)}}kW</view>
 		   </view>
 	    <!-- 收费标准 -->
 		<view class="rates">
@@ -42,127 +42,23 @@
 			</view>
 			<!-- 时段分类 -->
 		<view class="time-rates">
-			<view class="time-part">
+			<view class="time-part"  v-for="(item,index) in pile.price">
 				<view class="part-top">
 					<view class="time">
-						00:00-07:00
+						{{item.time}}
 					</view>
 					<view class="price">
 						
-						<text class="price-number">1.2500</text>
+						<text class="price-number">{{item.price}}</text>
 						<text class="price-unit">元/度</text>
 					</view>
 				</view>
 				<view class="part-bottom">
 					<view class="unitPrice-servicePrice">
-						充电单价：￥1.0000 | 服务费：￥0.2500
+						充电单价：￥{{item.single_price.toFixed(4)}} | 服务费：￥{{item.service_price.toFixed(4)}}
 					</view>
 				</view>
-			</view>
-			<view class="time-part">
-				<view class="part-top">
-					<view class="time">
-						00:70-09:00
-					</view>
-					<view class="price">
-						
-						<text class="price-number">1.2500</text>
-						<text class="price-unit">元/度</text>
-					</view>
-				</view>
-				<view class="part-bottom">
-					<view class="unitPrice-servicePrice">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-			</view>
-			<view class="time-part">
-				<view class="part-top">
-					<view class="time">
-						09:00-15:00
-					</view>
-					<view class="price">
-						
-						<text class="price-number">1.2500</text>
-						<text class="price-unit">元/度</text>
-					</view>
-				</view>
-				<view class="part-bottom">
-					<view class="unitPrice-servicePrice">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-			</view>
-			<view class="time-part">
-				<view class="part-top">
-					<view class="time">
-						15:00-20:00
-					</view>
-					<view class="price">
-						
-						<text class="price-number">1.2500</text>
-						<text class="price-unit">元/度</text>
-					</view>
-				</view>
-				<view class="part-bottom">
-					<view class="unitPrice-servicePrice">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-			</view>
-			<view class="time-part">
-				<view class="part-top">
-					<view class="time">
-						20:00-22:00
-					</view>
-					<view class="price">
-						
-						<text class="price-number">1.2500</text>
-						<text class="price-unit">元/度</text>
-					</view>
-				</view>
-				<view class="part-bottom">
-					<view class="unitPrice-servicePrice">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-			</view>
-			<view class="time-part">
-				<view class="part-top">
-					<view class="time">
-						22:00-23:00
-					</view>
-					<view class="price">
-						
-						<text class="price-number">1.2500</text>
-						<text class="price-unit">元/度</text>
-					</view>
-				</view>
-				<view class="part-bottom">
-					<view class="unitPrice-servicePrice">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-			</view>
-			<view class="time-part">
-				<view class="part-top">
-					<view class="time">
-						23:00-23:59
-					</view>
-					<view class="price">
-						
-						<text class="price-number">1.2500</text>
-						<text class="price-unit">元/度</text>
-					</view>
-				</view>
-				<view class="part-bottom">
-					<view class="unitPrice-servicePrice">
-						充电单价：￥1.0000 | 服务费：￥0.2500
-					</view>
-				</view>
-			</view>
-			
-			
+			</view> 			
 		</view>
 
 		</view >
@@ -178,20 +74,60 @@
 <!-- 底部按钮 -->
 
 <view class="bottom">
-	<view class="botton">开始充电</view>
+	<view class="botton" @click="charge">开始充电</view>
 </view>
 	</view>
 	
 	
 </template>
 <script>
+	
+	import * as api from "@/apis/site.js"
+	let _self;
 	export default {
 		data() {
 		return{
-			
+			pile:{
+				no:'',
+				interface:'',
+				type:'',
+				power:0,
+				price:[
+					 
+				]
+/*				no:'A00666',
+				interface:'国际直流',
+				type:'快充',
+				power:60000,
+				price:[
+					{time:'00:00-07:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'07:00-09:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'09:00-15:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'15:00-20:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'20:00-22:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'22:00-23:00',single_price:1.0,service_price:0.25,price:1.25},
+					{time:'23:00-23:59',single_price:1.0,service_price:0.25,price:1.25},
+				]*/
+			},
 			description: '温馨提示：充电前请确保您的车辆已与充电桩连接！并关闭车内电源。'
 		}
 		}
+		,
+		onLoad(op){
+			_self = this;
+			api.getPileDetails(op).then(function(res){
+				_self.pile = res;
+			})
+		},
+		methods:{
+			charge(){
+				uni.navigateTo({
+					url:'/pages/searchPile/chargeProcess/charge?pile='+encodeURIComponent(JSON.stringify(_self.pile))
+					 
+				})
+			}
+			
+		}
 	}
 </script>
 

pages/searchPile/stationAndPile/stationDetails.vue

@@ -113,6 +113,7 @@
 </template>
 
 <script>
+	import api from "@/apis/site.js"
 	let _self;
 	export default {
  
@@ -186,6 +187,8 @@
 				}
 			},
 			charge(){
+				 console.log('扫码充电')
+				//#ifdef MP-WEIXIN
 				uni.scanCode({
 					success:function(res){
 						uni.navigateTo({
@@ -193,7 +196,15 @@
 						})
 						
 					}
-				})
+				}) 
+				return;
+				//#endif
+				 
+				 console.log('扫码充电1')
+				 uni.navigateTo({
+				 	url:'chargingPileDetails'
+				 })
+				
 			},
 			priceDetail(){
 				uni.navigateTo({

utils/mixin.js

@@ -18,6 +18,14 @@ var app = {
 		}
 		 return configure;
 	},
+	logoff:()=>{
+		uni.removeStorageSync(prefix + 'token_tdate')
+		uni.removeStorageSync(prefix + 'token')
+		uni.removeStorageSync(prefix  + 'personInfo');
+		uni.removeStorageSync(prefix + 'personInfoPlus');
+		//uni.removeStorageSync(prefix+'wx_openId');
+		
+	},
 	setConfig : (value) => uni.setStorageSync(prefix + '_config_$', value),
 	
 	getPersonInfo : () => {