修复bug， 刷新后不能返回问题

components/u-navbar/u-navbar.vue

@@ -0,0 +1,324 @@
+<template>
+	<view class="">
+		<view class="u-navbar" :style="[navbarStyle]" :class="{ 'u-navbar-fixed': isFixed, 'u-border-bottom': borderBottom }">
+			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
+			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
+				<view class="u-back-wrap" v-if="isBack" @tap="goBack">
+					<view class="u-icon-wrap">
+						<u-icon :name="backIconName" :color="backIconColor" :size="backIconSize"></u-icon>
+					</view>
+					<view class="u-icon-wrap u-back-text u-line-1" v-if="backText" :style="[backTextStyle]">{{ backText }}</view>
+				</view>
+				<view class="u-navbar-content-title" v-if="title" :style="[titleStyle]">
+					<view
+					    class="u-title u-line-1"
+					    :style="{
+							color: titleColor,
+							fontSize: titleSize + 'rpx',
+							fontWeight: titleBold ? 'bold' : 'normal'
+						}">
+						{{ title }}
+					</view>
+				</view>
+				<view class="u-slot-content">
+					<slot></slot>
+				</view>
+				<view class="u-slot-right">
+					<slot name="right"></slot>
+				</view>
+			</view>
+		</view>
+		<!-- 解决fixed定位后导航栏塌陷的问题 -->
+		<view class="u-navbar-placeholder" v-if="isFixed && !immersive" :style="{ width: '100%', height: Number(navbarHeight) + statusBarHeight + 'px' }"></view>
+	</view>
+</template>
+
+<script>
+	// 获取系统状态栏的高度
+	let systemInfo = uni.getSystemInfoSync();
+	let menuButtonInfo = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/**
+	 * navbar 自定义导航栏
+	 * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uniapp自带的导航栏。
+	 * @tutorial https://www.uviewui.com/components/navbar.html
+	 * @property {String Number} height 导航栏高度(不包括状态栏高度在内，内部自动加上)，注意这里的单位是px（默认44）
+	 * @property {String} back-icon-color 左边返回图标的颜色（默认#606266）
+	 * @property {String} back-icon-name 左边返回图标的名称，只能为uView自带的图标（默认arrow-left）
+	 * @property {String Number} back-icon-size 左边返回图标的大小，单位rpx（默认30）
+	 * @property {String} back-text 返回图标右边的辅助提示文字
+	 * @property {Object} back-text-style 返回图标右边的辅助提示文字的样式，对象形式（默认{ color: '#606266' }）
+	 * @property {String} title 导航栏标题，如设置为空字符，将会隐藏标题占位区域
+	 * @property {String Number} title-width 导航栏标题的最大宽度，内容超出会以省略号隐藏，单位rpx（默认250）
+	 * @property {String} title-color 标题的颜色（默认#606266）
+	 * @property {String Number} title-size 导航栏标题字体大小，单位rpx（默认32）
+	 * @property {Function} custom-back 自定义返回逻辑方法
+	 * @property {String Number} z-index 固定在顶部时的z-index值（默认980）
+	 * @property {Boolean} is-back 是否显示导航栏左边返回图标和辅助文字（默认true）
+	 * @property {Object} background 导航栏背景设置，见官网说明（默认{ background: '#ffffff' }）
+	 * @property {Boolean} is-fixed 导航栏是否固定在顶部（默认true）
+	 * @property {Boolean} immersive 沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效（默认false）
+	 * @property {Boolean} border-bottom 导航栏底部是否显示下边框，如定义了较深的背景颜色，可取消此值（默认true）
+	 * @example <u-navbar back-text="返回" title="剑未配妥，出门已是江湖"></u-navbar>
+	 */
+	export default {
+		name: "u-navbar",
+		props: {
+			// 导航栏高度，单位px，非rpx
+			height: {
+				type: [String, Number],
+				default: ''
+			},
+			// 返回箭头的颜色
+			backIconColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 左边返回的图标
+			backIconName: {
+				type: String,
+				default: 'nav-back'
+			},
+			// 左边返回图标的大小，rpx
+			backIconSize: {
+				type: [String, Number],
+				default: '44'
+			},
+			// 返回的文字提示
+			backText: {
+				type: String,
+				default: ''
+			},
+			// 返回的文字的 样式
+			backTextStyle: {
+				type: Object,
+				default () {
+					return {
+						color: '#606266'
+					}
+				}
+			},
+			// 导航栏标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 标题的宽度，如果需要自定义右侧内容，且右侧内容很多时，可能需要减少这个宽度，单位rpx
+			titleWidth: {
+				type: [String, Number],
+				default: '250'
+			},
+			// 标题的颜色
+			titleColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 标题字体是否加粗
+			titleBold: {
+				type: Boolean,
+				default: false
+			},
+			// 标题的字体大小
+			titleSize: {
+				type: [String, Number],
+				default: 32
+			},
+			isBack: {
+				type: [Boolean, String],
+				default: true
+			},
+			// 对象形式，因为用户可能定义一个纯色，或者线性渐变的颜色
+			background: {
+				type: Object,
+				default () {
+					return {
+						background: '#ffffff'
+					}
+				}
+			},
+			// 导航栏是否固定在顶部
+			isFixed: {
+				type: Boolean,
+				default: true
+			},
+			// 是否沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效
+			immersive: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示导航栏的下边框
+			borderBottom: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [String, Number],
+				default: ''
+			},
+			// 自定义返回逻辑
+			customBack: {
+				type: Function,
+				default: null
+			}
+		},
+		data() {
+			return {
+				menuButtonInfo: menuButtonInfo,
+				statusBarHeight: systemInfo.statusBarHeight
+			};
+		},
+		computed: {
+			// 导航栏内部盒子的样式
+			navbarInnerStyle() {
+				let style = {};
+				// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+				style.height = this.navbarHeight + 'px';
+				// // 如果是各家小程序，导航栏内部的宽度需要减少右边胶囊的宽度
+				// #ifdef MP
+				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+				style.marginRight = rightButtonWidth + 'px';
+				// #endif
+				return style;
+			},
+			// 整个导航栏的样式
+			navbarStyle() {
+				let style = {};
+				style.zIndex = this.zIndex ? this.zIndex : this.$u.zIndex.navbar;
+				// 合并用户传递的背景色对象
+				Object.assign(style, this.background);
+				return style;
+			},
+			// 导航中间的标题的样式
+			titleStyle() {
+				let style = {};
+				// #ifndef MP
+				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				style.right = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				// #endif
+				// #ifdef MP
+				// 此处是为了让标题显示区域即使在小程序有右侧胶囊的情况下也能处于屏幕的中间，是通过绝对定位实现的
+				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				style.right = rightButtonWidth - (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + rightButtonWidth +
+					'px';
+				// #endif
+				style.width = uni.upx2px(this.titleWidth) + 'px';
+				return style;
+			},
+			// 转换字符数值为真正的数值
+			navbarHeight() {
+				// #ifdef APP-PLUS || H5
+				return this.height ? this.height : 44;
+				// #endif
+				// #ifdef MP
+				// 小程序特别处理，让导航栏高度 = 胶囊高度 + 两倍胶囊顶部与状态栏底部的距离之差(相当于同时获得了导航栏底部与胶囊底部的距离)
+				// 此方法有缺陷，暂不用(会导致少了几个px)，采用直接固定值的方式
+				// return menuButtonInfo.height + (menuButtonInfo.top - this.statusBarHeight) * 2;//导航高度
+				let height = systemInfo.platform == 'ios' ? 44 : 48;
+				return this.height ? this.height : height;
+				// #endif
+			}
+		},
+		created() {},
+		methods: {
+			goBack() {
+				
+				console.log("自定义")
+				// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
+				if (typeof this.customBack === 'function') {
+					// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+					// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+					this.customBack.bind(this.$u.$parent.call(this))();
+				} else {
+					const pages=getCurrentPages()
+					if(pages.length===1){
+						history.back()
+					}else{
+						uni.navigateBack();
+					}
+					
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	// @import "../../libs/css/style.components.scss";
+
+	.u-navbar {
+		width: 100%;
+	}
+
+	.u-navbar-fixed {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 991;
+	}
+
+	.u-status-bar {
+		width: 100%;
+	}
+
+	.u-navbar-inner {
+		// @include vue-flex;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		align-items: center;
+	}
+
+	.u-back-wrap {
+		display: flex;
+		align-items: center;
+		flex: 1;
+		flex-grow: 0;
+		padding: 14rpx 14rpx 14rpx 24rpx;
+	}
+
+	.u-back-text {
+		padding-left: 4rpx;
+		font-size: 30rpx;
+	}
+
+	.u-navbar-content-title {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60rpx;
+		text-align: center;
+		flex-shrink: 0;
+	}
+
+	.u-navbar-centent-slot {
+		flex: 1;
+	}
+
+	.u-title {
+		line-height: 60rpx;
+		font-size: 32rpx;
+		flex: 1;
+	}
+
+	.u-navbar-right {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.u-slot-content {
+		flex: 1;
+		display: flex;
+		align-items: center;
+	}
+</style>

pages.json

@@ -1,6 +1,8 @@
 {
 	"easycom": {
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue",
+		"ujp-navbar": "components/u-navbar/u-navbar.vue"
+		
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages	
 		

pages/MyInvoice/editInvoiceTitle.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<u-navbar title="编辑发票抬头">
+		<ujp-navbar title="编辑发票抬头">
 			<text class="delete" @click="delBtn()" v-if="obj.id&&!invoice">删除</text>
-		</u-navbar>
+		</ujp-navbar>
 
 		<u-cell-group>
 			<u-cell-item title="抬头类型" required :arrow="false">

pages/MyInvoice/invioceExplain.vue

@@ -1,8 +1,8 @@
 <template>
 	 <view >
-		 <u-navbar title="开票说明">
+		 <ujp-navbar title="开票说明">
 		 	
-		 </u-navbar>
+		 </ujp-navbar>
 		 <view class="main">
 		 	<p>
 				1.月结发票：为已完全交清欠费用户出具的月消费账单发票。实缴发票：依据用户实际缴纳金额为用户开具的发票。发票金额不包括不能参与实销发票打印的费用，如：一卡充充值、赠费等。

pages/MyInvoice/invioceResult.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<u-navbar title="电子发票"></u-navbar>
+		<ujp-navbar title="电子发票"></ujp-navbar>
 		<view class="success">
 			<u-icon name="chenggong" custom-prefix="custom-icon" size="180" color="#00B962"></u-icon>
 			<p class="success-text">申请成功</p>

pages/MyInvoice/invoiceDetail.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
 		<view v-show="step==1">
-			<u-navbar title="开票充电订单" :custom-back="customback2">
+			<ujp-navbar title="开票充电订单" :custom-back="customback2">
 				
-			</u-navbar>
+			</ujp-navbar>
 			<view class="invoiced" >
 			  	<view class="invoiced-item" v-for="(item,index) in list" :key="index"   >
 			  		<view class="content oldTextjp2" 
@@ -26,7 +26,7 @@
 		</view>
 		
 		<view v-show="step==0">
-			<u-navbar title="发票详情"></u-navbar>
+			<ujp-navbar title="发票详情"></ujp-navbar>
 			<view class="price">
 				<view class="num">
 					{{invoiceInfo.amount}}元

pages/MyInvoice/invoiceManagement.vue

@@ -1,8 +1,8 @@
 <template>
 	<view >
-		<u-navbar title="收款账户">
+		<ujp-navbar title="收款账户">
 			<text class="management" @click="gotoUrl('pages/MyInvoice/invoiceTitleManagement')">抬头管理</text>
-		</u-navbar>
+		</ujp-navbar>
 		
 	
 			<u-tabs  inactive-color="#888888" active-color="#101010" :list="list" :is-scroll="true"

pages/MyInvoice/invoicePreview.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<u-navbar title="发票预览"></u-navbar>
+		<ujp-navbar title="发票预览"></ujp-navbar>
 		<view style="margin: 10px 0;">
 			<H2>长按发票图片保存至本地</H2>
 		</view>

pages/MyInvoice/invoiceTitleManagement.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="发票抬头管理"></u-navbar>
+		<ujp-navbar title="发票抬头管理"></ujp-navbar>
 		<view class="main">
     <view class="item">
     	<view class="title">

pages/MyInvoice/issueInvoice.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<u-navbar title="开具发票">
+		<ujp-navbar title="开具发票">
 			<text class="explain" @click="gotoUrl('pages/article/details?code=KPSM')">开票说明</text>
-		</u-navbar>
+		</ujp-navbar>
 		<view class="invioice-info">
 			<p class="title">发票信息</p>
 			<u-cell-group>

pages/article/articleDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="background-color: #fff;">
-		<u-navbar title="文章详情"></u-navbar>
+		<ujp-navbar title="文章详情"></ujp-navbar>
 		<view class="main">
 			<view class="new-title oldTextjp" oldstyle="font-size: 22px;">
 				{{newsDetail.title}}

pages/article/details.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="background-color: #fff;">
-		<u-navbar :title="newsDetail.title"></u-navbar>
+		<ujp-navbar :title="newsDetail.title"></ujp-navbar>
 		<view class="main">
 			
 			

pages/article/newsNotice.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="background-color: #fff;height:1135px;" >
-		<u-navbar title="新闻公告"></u-navbar>
+		<ujp-navbar title="新闻公告"></ujp-navbar>
 		
 		<view class="options">
 			<view class="options-item">

pages/login/completeInfo.vue

@@ -1,11 +1,11 @@
 <template>
 	<view>
-		<u-navbar title="完善信息">
+		<ujp-navbar title="完善信息">
 			
 				
 				<view slot="right"  @click="gotoLink" style=" margin-right: 10px;"> 跳过</view>
 			
-		</u-navbar>
+		</ujp-navbar>
 		<view class="data">
 			<view class="data-img">
 				<view class="data-icon">

pages/parking/outPayment.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="无车辆扫码停车" :is-back="false"></u-navbar>
+		<ujp-navbar title="无车辆扫码停车" :is-back="false"></ujp-navbar>
 		<view class="main">
 			<view class="park-name" v-if="detail.parkName">
 				<img src="../../static/img/if-location-pin@2x.png" alt="">

pages/parking/pay.vue

@@ -2,9 +2,9 @@
 	<view>
 		
 		<view class="carNone" v-if="kongResult">
-			<u-navbar title="停车缴费" :is-back="false">
+			<ujp-navbar title="停车缴费" :is-back="false">
 				
-			</u-navbar>
+			</ujp-navbar>
 			<img src="static/img/暂无数据-缺省页.png" alt="">
 			<p>未查询到停车数据</p>
 			<u-button class="login-btn2"  type="default" shape="circle" @click="channelPayDetail">刷新</u-button>

pages/parking/payResult.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="充值结果" :is-back="false"></u-navbar>
+		<ujp-navbar title="充值结果" :is-back="false"></ujp-navbar>
 		<view class="paySuccess">
 			<u-icon name="chenggong" custom-prefix="custom-icon" size="180" color="#00B962"></u-icon>
 			<view class="title oldTextjp" oldstyle="font-size: 20px;">支付完成{{detail.payStatusStr}}</view>
@@ -15,25 +15,25 @@
 	</view>
 </template>
 
-<script>
-	import * as API from '@/apis/finance.js'
+<script>
+	import * as API from '@/apis/finance.js'
 	
 	export default {
 		data() {
 			return {
 				detail: {},
-				id: "",
-		
-				
+				id: "",
+		
+				
 
 			}
-		},
-		onLoad(op) {
-			
-			
-		},
-		onReady() {
-			
+		},
+		onLoad(op) {
+			
+			
+		},
+		onReady() {
+			
 		},
 		methods: {
 
@@ -97,4 +97,4 @@
 		border-color: #00B962 !important;
 		color: #fff !important;
 	}
-</style>
+</style>

pages/parking/paymentResult.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="缴费结果" back-icon-name="close" back-icon-size="30"></u-navbar>
+		<ujp-navbar title="缴费结果" back-icon-name="close" back-icon-size="30"></ujp-navbar>
 		<view class="success">
 			<u-icon name="chenggong" custom-prefix="custom-icon" size="180" color="#00B962"></u-icon>
 			<view class="title" >缴费成功</view>

pages/parking/registration.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<u-navbar title="无牌车辆扫码停车" :is-back="false" ></u-navbar>
+		<ujp-navbar title="无牌车辆扫码停车" :is-back="false" ></ujp-navbar>
 		<view class="main">
 			<view class="park-name" v-if="detail.parkName">
 				<img src="../../static/img/if-location-pin@2x.png" alt="">

pages/parking/request.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="请求进场"back-icon-name="close" back-icon-size="30" :is-back="false" ></u-navbar>
+		<ujp-navbar title="请求进场"back-icon-name="close" back-icon-size="30" :is-back="false" ></ujp-navbar>
 		<view class="success">
 			<u-icon name="chenggong" custom-prefix="custom-icon" size="180" color="#00B962"></u-icon>
 			<view class="title" >进场成功</view>

pages/parking/search.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="wrap" v-if="!kongResult">
-			<u-navbar title="车牌查询" :is-back="false">
-			</u-navbar>
+			<ujp-navbar title="车牌查询" :is-back="false">
+			</ujp-navbar>
 			<view class="key-input">
 				<u-message-input :focus="true" :value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></u-message-input>
 			</view>

pages/record/details.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="充电详情"></u-navbar>
+		<ujp-navbar title="充电详情"></ujp-navbar>
 		<view class="details">
 			<view class="details-head">
 				<u-icon name="charging-pile-fill" custom-prefix="custom-icon" color="#27B148" size="48"></u-icon>

pages/record/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="充电订单"></u-navbar>
+		<ujp-navbar title="充电订单"></ujp-navbar>
 		
 		<view class="record">
 			<view class="recordTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">

pages/search/search.vue

@@ -1,9 +1,9 @@
 
 <template>
 	<view>
-		<u-navbar title="" ref='navbar' id='navbar' :height='nav_height'> 
+		<ujp-navbar title="" ref='navbar' id='navbar' :height='nav_height'> 
 			<u-search id='search' ref='search'   :input-style='inputStyle'  placeholder="搜索站点名称" @change="search()" v-model="keyword" color="#c8c8c8" @search="search" @click="search" @clickicon='back' @custom='search'></u-search>		 
-		</u-navbar>
+		</ujp-navbar>
 		<view class="recommend">推荐充电站</view>
 		<view class="charing-slow" v-for="(item,index) in stations_filter" :key="item.id" @click="stationDetail(item)">
 			<text :class="item.type == '快充' ? 'fast-charge':(item.type == '慢充' ? 'trickle-charge':'fast-trickle-charge')">{{item.type}}</text> <text class="station-items">{{item.name}}</text>

pages/searchPile/apointment/apointmentRecharge.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="预约充电"></u-navbar>
+		<ujp-navbar title="预约充电"></ujp-navbar>
 		<!-- 站点详情 -->
 		<view class="station-details box">
 			<p class="station-name">{{detail.stationName}}</p>

pages/searchPile/chargeProcess/charge.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="充电"  :is-back="isback" ></u-navbar>
+		<ujp-navbar title="充电"  :is-back="isback" ></ujp-navbar>
 		<view class="recharge" >
 			<view class="title">请选择充电金额</view>
 			<p>当前余额{{user.balance}}元</p>

pages/searchPile/chargeProcess/dcChargeEnd.vue

@@ -1,7 +1,7 @@
 <template>
 	<view >
-		<u-navbar title="充电结束">
-		</u-navbar>
+		<ujp-navbar title="充电结束">
+		</ujp-navbar>
 		<view class="progress-bar">
 				<u-circle-progress width="400" active-color="green" :percent="50" border-width="20">
 					<view class="u-progress-content">

pages/searchPile/chargeProcess/dcCharging.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view v-if="chargingRecord.status==2">
-			<u-navbar title="充电结束">
-			</u-navbar>
+			<ujp-navbar title="充电结束">
+			</ujp-navbar>
 			<view class="progress-bar2">
 				<u-circle-progress width="400" active-color="green" duration='20'  :percent="100" border-width="20">
 					<view class="u-progress-content">
@@ -79,8 +79,8 @@
 		</view>
 
 		<view style="background-color: #fff; padding-bottom: 60px;" v-else>
-			<u-navbar title="充电详情">
-			</u-navbar>
+			<ujp-navbar title="充电详情">
+			</ujp-navbar>
 			<view class="iconfont tittle-font" @click="show = true">
 				&#xe616;
 			</view>
@@ -92,7 +92,7 @@
 
 					
 					<view class="u-progress-content" v-if="chargingRecord.status==4">
-						<text class='u-progress-info' v-if="waitNum==1">排队中</text>
+						<text class='u-progress-info' v-if="waitNum==1">排队中</text>
 						<text class='u-progress-info' v-else >前方等待{{waitNum-1}}位</text>
 					</view>
 					<view class="u-progress-content" v-else-if="chargingGun.gunType==1">
@@ -281,19 +281,19 @@
 			}
 			
 
-		},
-		onShow() {
-		
-			if(!this.isReady){
-				this.getInfo()
-			}
-			
-		},
-		onHide() {
-			this.isReady=false;
-			console.log("onHide")
+		},
+		onShow() {
+		
+			if(!this.isReady){
+				this.getInfo()
+			}
+			
+		},
+		onHide() {
+			this.isReady=false;
+			console.log("onHide")
 			},
-		onUnload() {
+		onUnload() {
 				console.log("onUnload")
 			this.isReady=false;
 		},
@@ -490,8 +490,8 @@
 			submit() {
 				if(this.chargingRecord.status==1||this.chargingRecord.status==4){
 					
-				}else{
-					return
+				}else{
+					return
 				}
 				uni.showModal({
 					title: '提示',

pages/searchPile/chargeProcess/exChanging.vue

@@ -1,7 +1,7 @@
 <template>
 	<view style="background-color: #fff;">
-		<u-navbar title="排队中">
-		</u-navbar>
+		<ujp-navbar title="排队中">
+		</ujp-navbar>
 		<view class="iconfont tittle-font">
 			&#xe616;
 		</view>

pages/searchPile/chargeProcess/exChargeEnd.vue

@@ -1,7 +1,7 @@
 <template>
 	<view >
-		<u-navbar title="充电结束">
-		</u-navbar>
+		<ujp-navbar title="充电结束">
+		</ujp-navbar>
 		<view class="progress-bar">
 				<u-circle-progress width="400" active-color="#00B962" :percent="100" border-width="20">
 					<view class="u-progress-content">

pages/searchPile/searchPile.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class='font1'>
-		<u-navbar :is-back="false" :height='nav_height'style="background-color: bisque;">
+		<ujp-navbar :is-back="false" :height='nav_height'style="background-color: bisque;">
 			<view style="display: flex;flex-direction: column; width: 100%;height: 100%;">
 				<view style="display: flex;flex-direction: row; height: 100%; align-items: center;margin-top:0rpx;padding-top: 0rpx;padding-bottom: 20rpx;">
 					<view style="margin-left:20rpx;width: 160rpx;">
@@ -46,7 +46,7 @@
 					</view>
 				</view>
 			</view>
-		</u-navbar>
+		</ujp-navbar>
 		<view class="content" >
 			<view v-if="show" class="preference" :style="show ? 'z-index:1024;top:'+navBarHeight+'px;' : 'z-index:0'" style="width: 100%;">
 				<view class="content-s">

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="padding-bottom: 296rpx;">
-		<u-navbar title="充电价格详情"></u-navbar>
+		<ujp-navbar title="充电价格详情"></ujp-navbar>
 		<view class="main" >
 			<view class="tabs-box">
 				<u-tabs  inactive-color="#888888" active-color="#101010" :list="list" :is-scroll="true"

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
 		<view v-show="step==1">
-				<u-navbar title="费用说明页" :custom-back="customback2">
+				<ujp-navbar title="费用说明页" :custom-back="customback2">
 					
-				</u-navbar>
+				</ujp-navbar>
 				<view class="main2">
 					<view class="item">
 						<view class="title">
@@ -51,140 +51,140 @@
 					</view>
 					
 				</view>
-		</view >
-	<view v-show="step==0">
-		<u-navbar title="充电枪详情" :custom-back="customback">
-			<view class="iconfont service" @click="openModal">
-				&#xe60d;
-			</view>
-		</u-navbar>
-		<!-- 未插枪提示 -->
-		<u-alert-tips type="warning"  v-if="!isInsert" :description="description" :show-icon="true"></u-alert-tips>
-		<view class="main">
-			<view class="text-1">
-				{{isInsert?'可充电':'未插枪'}}
-			</view>
+		</view >
+	<view v-show="step==0">
+		<ujp-navbar title="充电枪详情" :custom-back="customback">
+			<view class="iconfont service" @click="openModal">
+				&#xe60d;
+			</view>
+		</ujp-navbar>
+		<!-- 未插枪提示 -->
+		<u-alert-tips type="warning"  v-if="!isInsert" :description="description" :show-icon="true"></u-alert-tips>
+		<view class="main">
+			<view class="text-1">
+				{{isInsert?'可充电':'未插枪'}}
+			</view>
 			<view class="text-2">
-				{{isInsert?'充电枪已连接，可进行充电':'未检测到充电枪，若已插枪，请拔出重插'}}
-				
-			</view>
-			<view class="charging-info">
-				<view class="name">
+				{{isInsert?'充电枪已连接，可进行充电':'未检测到充电枪，若已插枪，请拔出重插'}}
+				
+			</view>
+			<view class="charging-info">
+				<view class="name">
 					{{detail.name}}/充电枪{{gun.channelNo>9?gun.channelNo:'0'+gun.channelNo}}
 					
 					<text class="free" v-if="gunDetail.chargingAppointment&&gunDetail.isMeAppoint">您已预约</text>
-					<text class="free" v-else-if="gunDetail.chargingAppointment&&!gunDetail.isMeAppoint">已被预约</text>
-					<text class="free" v-else>{{gun.workStatusText}}</text>
-				</view>
-				<view class="price">
-					<text>{{price.costPrice}}</text><text class="unit">元/度</text>
-				</view>
-				<view class="address">
-					{{detail.stationAddress}}
-					<text class="explain" @click="step=1">费用说明</text>
-				</view>
-			</view>
-		</view>
-		<!--提示  -->
-		<view class="tips" >
-			<p class="p">提示：</p>
-			<!-- <view class="content" v-if="!isInsert">
-
-				点击降锁后，请稍等几十秒，待地锁完全下降后，再驶入车位。
-				
+					<text class="free" v-else-if="gunDetail.chargingAppointment&&!gunDetail.isMeAppoint">已被预约</text>
+					<text class="free" v-else>{{gun.workStatusText}}</text>
+				</view>
+				<view class="price">
+					<text>{{price.costPrice}}</text><text class="unit">元/度</text>
+				</view>
+				<view class="address">
+					{{detail.stationAddress}}
+					<text class="explain" @click="step=1">费用说明</text>
+				</view>
+			</view>
+		</view>
+		<!--提示  -->
+		<view class="tips" >
+			<p class="p">提示：</p>
+			<!-- <view class="content" v-if="!isInsert">
+
+				点击降锁后，请稍等几十秒，待地锁完全下降后，再驶入车位。
+				
 			</view> -->
 			<view class="content">
 			
 				{{carDetText}}
 				
-			</view>
-			
-		</view>
-		<!-- 入场车辆 -->
-		<!-- 未填写车牌状态 -->
-		<view class="car" v-if="false">
-			<view class="car-name">
-				入场车辆
-			</view>
-			<input type="text" placeholder="填写车牌号减免停车费">
-		</view>
-		<!-- 填写车牌后状态 -->
-		<view class="car">
-			<view class="car-name">
-				入场车辆
-			</view>
-			<view class="car-number">
-				{{car?car.carNum:''}}
-				<img @click="carDet(car?car.carNum:'')" src="../../../static/img/riLine-edit-box-line Copy.svg" alt="">
-			</view>
-		</view>
-
-		<view class="bottom">
-			 
-			<!-- 解锁中 -->
-			<!-- 						<u-button shape="circle" type="success" style="opacity: 0.4;">
-							解锁中<img style="margin-left: 4px;" src="../../../static/img/riLine-refresh-line.svg" alt="">
-						</u-button> -->
+			</view>
+			
+		</view>
+		<!-- 入场车辆 -->
+		<!-- 未填写车牌状态 -->
+		<view class="car" v-if="false">
+			<view class="car-name">
+				入场车辆
+			</view>
+			<input type="text" placeholder="填写车牌号减免停车费">
+		</view>
+		<!-- 填写车牌后状态 -->
+		<view class="car">
+			<view class="car-name">
+				入场车辆
+			</view>
+			<view class="car-number">
+				{{car?car.carNum:''}}
+				<img @click="carDet(car?car.carNum:'')" src="../../../static/img/riLine-edit-box-line Copy.svg" alt="">
+			</view>
+		</view>
+
+		<view class="bottom">
+			 
+			<!-- 解锁中 -->
+			<!-- 						<u-button shape="circle" type="success" style="opacity: 0.4;">
+							解锁中<img style="margin-left: 4px;" src="../../../static/img/riLine-refresh-line.svg" alt="">
+						</u-button> -->
 			<!-- 刷新充电枪状态 -->
 			<u-button shape="circle" type="success" @click="getPile()" v-if="gunDetail.chargingAppointment&&!gunDetail.isMeAppoint"   >已被预约</u-button>
-			
+			
 			<u-button shape="circle" v-else-if="!isInsert" @click="getPile()" type="success">刷新充电枪状态</u-button>
-			
-			<!-- 开始充电 -->
-			 <u-button shape="circle" type="success" v-else  @click="charge"  >开始充电</u-button>
-		</view>
-		<!-- 弹窗 -->
-		<view>
-
-			<u-modal v-model="show" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266"
-				:show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" :content="consumerPhone"
-				:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
-		</view>
+			
+			<!-- 开始充电 -->
+			 <u-button shape="circle" type="success" v-else  @click="charge"  >开始充电</u-button>
+		</view>
+		<!-- 弹窗 -->
+		<view>
+
+			<u-modal v-model="show" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266"
+				:show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" :content="consumerPhone"
+				:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
+		</view>
+	</view>
 	</view>
-	</view>
-</template>
-
-<script>
-	import * as API from "@/apis/chargeProcess.js"
-	import {
-		hourDistanceArr,
-		currentTimeStamp,
-		parseUnixTime
-	} from '@/utils'
-
-	export default {
-		data() {
+</template>
+
+<script>
+	import * as API from "@/apis/chargeProcess.js"
+	import {
+		hourDistanceArr,
+		currentTimeStamp,
+		parseUnixTime
+	} from '@/utils'
+
+	export default {
+		data() {
 			return {
 				step:0,
-				isInsert:false,
-				isReady: false,
-				onShowRole: false,
-				id: "",
-				car: {},
-				isback: false,
-				gun: {},
+				isInsert:false,
+				isReady: false,
+				onShowRole: false,
+				id: "",
+				car: {},
+				isback: false,
+				gun: {},
 				prices: {},
-				price: {},
-				gunDetail:{},
-				detail: {
-					no: '',
-					interface: '',
-					type: '',
-					power: 0,
-					price: [
-
-					]
-
-				},
-				consumerPhone: "",
-				description: '温馨提示：充电前请确保您的车辆已与充电桩连接！并关闭车内电源。',
-				show: false,
-				title: '联系客服',
-
-				confirmText: '拨打电话',
-				content: '余额不足5，请先充值。',
-				carDetText: '',
-			}
+				price: {},
+				gunDetail:{},
+				detail: {
+					no: '',
+					interface: '',
+					type: '',
+					power: 0,
+					price: [
+
+					]
+
+				},
+				consumerPhone: "",
+				description: '温馨提示：充电前请确保您的车辆已与充电桩连接！并关闭车内电源。',
+				show: false,
+				title: '联系客服',
+
+				confirmText: '拨打电话',
+				content: '余额不足5，请先充值。',
+				carDetText: '',
+			}
 		},
 		onShow() {
 			uni.hideToast();
@@ -193,7 +193,7 @@
 				this.getPile()
 			}
 		
-		},
+		},
 		methods: {
 			priceDetail(){
 				uni.navigateTo({
@@ -227,131 +227,131 @@
 					})
 				}
 				
-			},
-			openModal() {
-				this.show = true;
-			},
-			confirmPhone() {
-				this.show = false;
-				uni.makePhoneCall({
-					phoneNumber: this.consumerPhone //仅为示例
-				});
-			},
-			role() {
-				 
-				
-			},
-			getPile() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-
-				API.chargingDeviceGunDetail({
-					gunNo: this.id,
-					jpcode: "jp_team51_charge_id:A_" + this.id
-				}).then((res) => {
-					this.gunDetail= res.data;
-					this.detail = res.data.device
+			},
+			openModal() {
+				this.show = true;
+			},
+			confirmPhone() {
+				this.show = false;
+				uni.makePhoneCall({
+					phoneNumber: this.consumerPhone //仅为示例
+				});
+			},
+			role() {
+				 
+				
+			},
+			getPile() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				API.chargingDeviceGunDetail({
+					gunNo: this.id,
+					jpcode: "jp_team51_charge_id:A_" + this.id
+				}).then((res) => {
+					this.gunDetail= res.data;
+					this.detail = res.data.device
 					this.prices = res.data.prices
-					this.price=res.data.price
-					this.gun = res.data.gun
+					this.price=res.data.price
+					this.gun = res.data.gun
 					this.car = res.data.car
 					
-					this.isInsert=this.gun.insertStatus
-					this.role()
-					if (res.data.chargingAppointment) {
-
-						if (res.data.isMeAppoint) {
-							
-						} else {
-							var chargingAppointment = res.data.chargingAppointment
-							var data = new Date(chargingAppointment.createTime).getTime()
-							var c = hourDistanceArr(new Date(), new Date(data + chargingAppointment
-								.reserveMinutes * 60 * 1000))
-
-							var description = '当前充电枪已被其他车主预约，' + c[1] + '分' + c[2] + "秒后预约自动失效。";
-							this.isReady = false;
-
+					this.isInsert=this.gun.insertStatus
+					this.role()
+					if (res.data.chargingAppointment) {
+
+						if (res.data.isMeAppoint) {
+							
+						} else {
+							var chargingAppointment = res.data.chargingAppointment
+							var data = new Date(chargingAppointment.createTime).getTime()
+							var c = hourDistanceArr(new Date(), new Date(data + chargingAppointment
+								.reserveMinutes * 60 * 1000))
+
+							var description = '当前充电枪已被其他车主预约，' + c[1] + '分' + c[2] + "秒后预约自动失效。";
+							this.isReady = false;
+
 							uni.showModal({
-								title:"提示",
-								content: description,
-								showCancel: false,
-								success: () => {
-
-								}
-							})
-						}
-
-					}
-
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			charge() {
-				//this.role()
-				
-					uni.navigateTo({
-						url: '/pages/searchPile/chargeProcess/charge?stationId=' + this.detail.stationId +
-							'&deviceNo=' + this.detail.deviceNo + "&gun=" + this.gun.channelNo + "&carNumber=" + (
-								this.car ? this.car.carNum : '')
-					})
-				
-
+								title:"提示",
+								content: description,
+								showCancel: false,
+								success: () => {
+
+								}
+							})
+						}
+
+					}
+
+					uni.hideLoading()
+
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			charge() {
+				//this.role()
+				
+					uni.navigateTo({
+						url: '/pages/searchPile/chargeProcess/charge?stationId=' + this.detail.stationId +
+							'&deviceNo=' + this.detail.deviceNo + "&gun=" + this.gun.channelNo + "&carNumber=" + (
+								this.car ? this.car.carNum : '')
+					})
+				
+
 			},
 			isInsertBtn(){
 				this.isInsert=true;
-			}
-		},
-
-		onReady() {
-
-			 
-			var consumerPhone = this.carhelp.getConfig().consumerPhone
-			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
-			if (consumerPhone) {
-				this.consumerPhone = consumerPhone
-			}
-			var carDetText = this.carhelp.getConfig().carDet
-			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
-			if (carDetText) {
-				this.carDetText = carDetText
-			}
-		},
-		onLoad(op) {
-			if (op.isback) {
-				this.isback = true
-			}
-			if (op.id) {
-				this.id = op.id
-				//this.carhelp.setGunId(op.id)
-				this.getPile()
-			} else {
-				uni.showToast({
-					title: "请扫码充电"
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #F6F8F8;
-		padding-bottom: 100px;
-	}
-
-	.service {
-		font-size: 24px;
-		color: #101010;
-		position: absolute;
-		right: 16px;
-	}
+			}
+		},
+
+		onReady() {
+
+			 
+			var consumerPhone = this.carhelp.getConfig().consumerPhone
+			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+			if (consumerPhone) {
+				this.consumerPhone = consumerPhone
+			}
+			var carDetText = this.carhelp.getConfig().carDet
+			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+			if (carDetText) {
+				this.carDetText = carDetText
+			}
+		},
+		onLoad(op) {
+			if (op.isback) {
+				this.isback = true
+			}
+			if (op.id) {
+				this.id = op.id
+				//this.carhelp.setGunId(op.id)
+				this.getPile()
+			} else {
+				uni.showToast({
+					title: "请扫码充电"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F6F8F8;
+		padding-bottom: 100px;
+	}
+
+	.service {
+		font-size: 24px;
+		color: #101010;
+		position: absolute;
+		right: 16px;
+	}
 .main2{
 		background-color: #fff;
 		padding-left: 16px;
@@ -378,128 +378,128 @@
 				
 			}
 		}
-	}
-	.main {
-		padding: 28px 20px;
-		background-image: linear-gradient(#D6EEDC, #F6F8F8);
-
-		.text-1 {
-			color: rgba(0, 170, 90, 100);
-			font-size: 24px;
-			line-height: 33px;
-
-		}
-
-		.text2 {
-			color: rgba(102, 102, 102, 100);
-			font-size: 16px;
-			line-height: 22px;
-		}
-
-		.charging-info {
-
-			background-color: #fff;
-			margin: 20px auto 0;
-			border-radius: 12px;
-			padding: 20px;
-
-			.name {
-				line-height: 23px;
-				color: rgba(16, 16, 16, 100);
-				font-size: 18px;
-
-				.free {
-					display: inline-block;
-					width: 72px;
-					height: 20px;
-					line-height: 20px;
-					border-radius: 50px;
-					background-color: rgba(208, 246, 228, 100);
-					color: rgba(0, 185, 98, 100);
-					font-size: 14px;
-					text-align: center;
-					margin-left: 12px;
-				}
-
-			}
-
-			.price {
-				color: rgba(0, 185, 98, 100);
-				font-size: 28px;
-				margin-top: 12px;
-
-				.unit {
-					font-size: 16px
-				}
-			}
-
-			.address {
-				line-height: 23px;
-				color: rgba(102, 102, 102, 100);
-				font-size: 16px;
-				margin-top: 12px;
-
-				.explain {
-					line-height: 22px;
-					color: rgba(22, 119, 255, 100);
-					font-size: 16px;
-					float: right;
-				}
-			}
-		}
-	}
-
-	.tips {
-		background-color: #fff;
-		margin: 0 20px;
-		border-radius: 12px;
-		padding: 20px;
-
-		.p {
-			line-height: 25px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 18px;
-		}
-
-		.content {
-			margin-top: 8px;
-			line-height: 22px;
-			color: rgba(102, 102, 102, 100);
-			font-size: 16px;
-		}
-	}
-
-	.bottom {
-		background-color: #fff;
-		width: 100%;
-		padding: 12px 0;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-
-		.u-btn {
-			width: 91.4%
-		}
-	}
-
-	/deep/.u-alert-desc {
-		color: rgba(255, 115, 0, 100);
-		font-size: 16px
-	}
-
-	// 入场车辆
-	.car {
-		background-color: #fff;
-		margin: 20px;
-		border-radius: 12px;
-		padding: 20px;
-		display: flex;
-		justify-content: space-between;
-		font-size: 18px;
-
-		img {
-
-			vertical-align: middle;
-		}
-	}
+	}
+	.main {
+		padding: 28px 20px;
+		background-image: linear-gradient(#D6EEDC, #F6F8F8);
+
+		.text-1 {
+			color: rgba(0, 170, 90, 100);
+			font-size: 24px;
+			line-height: 33px;
+
+		}
+
+		.text2 {
+			color: rgba(102, 102, 102, 100);
+			font-size: 16px;
+			line-height: 22px;
+		}
+
+		.charging-info {
+
+			background-color: #fff;
+			margin: 20px auto 0;
+			border-radius: 12px;
+			padding: 20px;
+
+			.name {
+				line-height: 23px;
+				color: rgba(16, 16, 16, 100);
+				font-size: 18px;
+
+				.free {
+					display: inline-block;
+					width: 72px;
+					height: 20px;
+					line-height: 20px;
+					border-radius: 50px;
+					background-color: rgba(208, 246, 228, 100);
+					color: rgba(0, 185, 98, 100);
+					font-size: 14px;
+					text-align: center;
+					margin-left: 12px;
+				}
+
+			}
+
+			.price {
+				color: rgba(0, 185, 98, 100);
+				font-size: 28px;
+				margin-top: 12px;
+
+				.unit {
+					font-size: 16px
+				}
+			}
+
+			.address {
+				line-height: 23px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 16px;
+				margin-top: 12px;
+
+				.explain {
+					line-height: 22px;
+					color: rgba(22, 119, 255, 100);
+					font-size: 16px;
+					float: right;
+				}
+			}
+		}
+	}
+
+	.tips {
+		background-color: #fff;
+		margin: 0 20px;
+		border-radius: 12px;
+		padding: 20px;
+
+		.p {
+			line-height: 25px;
+			color: rgba(16, 16, 16, 100);
+			font-size: 18px;
+		}
+
+		.content {
+			margin-top: 8px;
+			line-height: 22px;
+			color: rgba(102, 102, 102, 100);
+			font-size: 16px;
+		}
+	}
+
+	.bottom {
+		background-color: #fff;
+		width: 100%;
+		padding: 12px 0;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+
+		.u-btn {
+			width: 91.4%
+		}
+	}
+
+	/deep/.u-alert-desc {
+		color: rgba(255, 115, 0, 100);
+		font-size: 16px
+	}
+
+	// 入场车辆
+	.car {
+		background-color: #fff;
+		margin: 20px;
+		border-radius: 12px;
+		padding: 20px;
+		display: flex;
+		justify-content: space-between;
+		font-size: 18px;
+
+		img {
+
+			vertical-align: middle;
+		}
+	}
 </style>

pages/searchPile/stationAndPile/costExplain.vue

@@ -1,8 +1,8 @@
 <template>
 	<view >
-		<u-navbar title="费用说明页">
+		<ujp-navbar title="费用说明页">
 			
-		</u-navbar>
+		</ujp-navbar>
 		<view class="main">
 			<view class="item">
 				<view class="title">

pages/searchPile/stationAndPile/stationDetails.vue

@@ -1,10 +1,10 @@
 <template>
 	<view style="padding-bottom: 138px;">
-		<u-navbar title="站点详情">
+		<ujp-navbar title="站点详情">
 		<!-- 	<view class="iconfont qr-code">
 				&#xe61a;
 			</view> -->
-		</u-navbar>
+		</ujp-navbar>
 		 
 		<view v-if="stationDetail.station!=null"  class="station-details">
 			<u-image border-radius='15rpx'  v-if="stationDetail.station != null && stationDetail.station.image != null" class="img" width="26.6%" height="75px" :src="stationDetail.station.image" loading-icon="photo" @click="previewImage(stationDetail.station.image)"></u-image>			

pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<u-navbar title="站点详情"></u-navbar>
+		<ujp-navbar title="站点详情"></ujp-navbar>
 		<view class="content" >
 			 
 			<view>

pages/user/InviteFriends.vue

@@ -5,7 +5,7 @@
 				
 		</u-mask>
 		
-		<u-navbar title="邀请好友"></u-navbar>
+		<ujp-navbar title="邀请好友"></ujp-navbar>
 		<view class="InviteFriends" :class="{
 			opacityClass:show
 		}">

pages/user/about.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="all">
-		<u-navbar title="关于我们"></u-navbar>
+		<ujp-navbar title="关于我们"></ujp-navbar>
 		<view class="about">
 			<img src="../../static/img/aboutus.png" alt="">
 			<p class="font-weight2">{{projectName}}</p>

pages/user/appointmentExplain.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="轻松预约 告别排队" :is-back="false"></u-navbar>
+		<ujp-navbar title="轻松预约 告别排队" :is-back="false"></ujp-navbar>
 		<view class="main">
 			<view class="item">
 				<view class="title">

pages/user/car/carAdd.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<u-navbar title="车辆管理">
+		<ujp-navbar title="车辆管理">
 			<view class="slot-wrap">
 				<span class="navBtn oldTextjp2" oldstyle="font-size: 16px;" @click="showDelete">删除车辆</span>
 			</view>
-		</u-navbar>
+		</ujp-navbar>
 		<view>
 			<u-modal v-model="show" @confirm="confirmDelete" confirm-color="#fa3534" :show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" 
 				:content="content" :confirm-text="confirmText"></u-modal>

pages/user/car/carDet.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="wrap">
-		<u-navbar title="添加车牌">
- 		</u-navbar>
+		<ujp-navbar title="添加车牌">
+ 		</ujp-navbar>
 		<view class="key-input">
 			<u-message-input :focus="true" :value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></u-message-input>
 		</view>

pages/user/car/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="车辆管理"></u-navbar>
+		<ujp-navbar title="车辆管理"></ujp-navbar>
 		<view class="carNone" v-if="carList.length == 0">
 			<img src="static/img/none2.svg" alt="">
 			<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无绑定车辆</p>

pages/user/coupon/chooseCoupons.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<u-navbar title="我的优惠券"><view class="exchange oldTextjp2" oldstyle="font-size: 16px;" @click="toConversion">兑换</view></u-navbar>
+		<ujp-navbar title="我的优惠券"><view class="exchange oldTextjp2" oldstyle="font-size: 16px;" @click="toConversion">兑换</view></ujp-navbar>
 		
 		<u-alert-tips size="12" :show-icon="true"  type="warning"
 		 description="同类型优惠券只显示一张"></u-alert-tips>

pages/user/coupon/conversion.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<u-navbar title="优惠券兑换"></u-navbar>
+		<ujp-navbar title="优惠券兑换"></ujp-navbar>
 		
 		<view class="input-box">
 			<u-input v-model="exchangeCode" placeholder="请输入兑换码" :placeholder-style="elderStatus ? 'font-size: 16px;' : ''"></u-input>

pages/user/coupon/couponDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<u-navbar title="优惠券详情"></u-navbar>
+		<ujp-navbar title="优惠券详情"></ujp-navbar>
 		<view class="" style="background-color: rgba(188, 225, 208, 100);padding: 12px 0 ;">
 			<view class="list-item" style="margin-top: 0	;">
 				<view class="voucher" v-if="userCoupon.classify == '1'">优惠券</view>

pages/user/coupon/myCoupon.vue

@@ -1,6 +1,6 @@
 <template>
 	<view >
-		<u-navbar title="我的优惠券"><view class="exchange oldTextjp2" oldstyle="font-size: 16px;" @click="toConversion">兑换</view></u-navbar>
+		<ujp-navbar title="我的优惠券"><view class="exchange oldTextjp2" oldstyle="font-size: 16px;" @click="toConversion">兑换</view></ujp-navbar>
 		<view class="tab" >
 			<u-tabs :font-size="elderStatus ? 36 : 30" :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
 		</view>

pages/user/data.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="个人资料"></u-navbar>
+		<ujp-navbar title="个人资料"></ujp-navbar>
 		<view class="data">
 			<view class="data-img">
 				<view class="data-icon">

pages/user/finance/balance.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<u-navbar title="我的余额">
+		<ujp-navbar title="我的余额">
 			<view class="slot-wrap">
 				<span class="navBtn oldTextjp2" oldstyle="font-size: 16px;" @click="toRefundList">退余额</span>
 			</view>
-		</u-navbar>
+		</ujp-navbar>
 		<view class="balance">
 			<view class="balanceHead">
 				<view class="balanceCard">

pages/user/finance/recharge.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="充值"></u-navbar>
+		<ujp-navbar title="充值"></ujp-navbar>
 		<view class="recharge">
 			<view class="title oldTextjp" oldstyle="font-size:20px">选择充值金额</view>
 			<p class="oldTextjp2" oldstyle="font-size:16px">当前余额{{detail.balance}}元</p>

pages/user/finance/rechargeDet.vue

@@ -1,7 +1,7 @@
 
 <template>
 	<view>
-		<u-navbar title="充值详情"></u-navbar>
+		<ujp-navbar title="充值详情"></ujp-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
 				<font>{{detail.payFee}}</font><span>元</span>

pages/user/finance/rechargeList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="充值记录"></u-navbar>
+		<ujp-navbar title="充值记录"></ujp-navbar>
 		<view class="rechargeTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">
 			<u-picker mode="time" v-model="show" :params="params" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
 			<span>{{month}}月</span>

pages/user/finance/rechargeRes.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="充值结果"></u-navbar>
+		<ujp-navbar title="充值结果"></ujp-navbar>
 		<view class="paySuccess">
 			<u-icon name="chenggong" custom-prefix="custom-icon" size="180" color="#00B962"></u-icon>
 			<view class="title oldTextjp" oldstyle="font-size: 20px;">{{detail.payStatusStr}}</view>
@@ -12,50 +12,50 @@
 		<view class="paySuccess-btn">
 			<u-button class="success-btn1 oldTextjp2" oldstyle="font-size: 18px;" shape="circle" type="" @click="rechargeContinue">
 				<span>继续充值</span>
-			</u-button>
+			</u-button>
 			
-			<u-button class="success-btn2 oldTextjp2" oldstyle="font-size: 18px;"
-			 v-if="charge"
+			<u-button class="success-btn2 oldTextjp2" oldstyle="font-size: 18px;"
+			 v-if="charge"
 			 shape="circle" type="success" @click="chargeLook">
 				<span>前往充电</span>
-			</u-button>
-			<u-button class="success-btn2 oldTextjp2" oldstyle="font-size: 18px;"
-			 v-else
-			 shape="circle" type="success" @click="balanceLook">
-				<span>查看余额</span>
+			</u-button>
+			<u-button class="success-btn2 oldTextjp2" oldstyle="font-size: 18px;"
+			 v-else
+			 shape="circle" type="success" @click="balanceLook">
+				<span>查看余额</span>
 			</u-button>
 		</view>
 	</view>
 </template>
 
-<script>
-	import * as API from '@/apis/finance.js'
+<script>
+	import * as API from '@/apis/finance.js'
 	
 	export default {
 		data() {
 			return {
 				detail: {},
-				id: "",
-				charge:false,
-				chargeObj:{},
-				
+				id: "",
+				charge:false,
+				chargeObj:{},
+				
 
 			}
-		},
-		onLoad(op) {
-			if(op.id){
-				this.id=op.id
-				this.getInfo();
-			}
-			var obj=this.carhelp.getGunIdCharge();
-			if(obj){
-				this.charge=true
-				this.chargeObj=obj
-			}
-			
-		},
-		onReady() {
-			
+		},
+		onLoad(op) {
+			if(op.id){
+				this.id=op.id
+				this.getInfo();
+			}
+			var obj=this.carhelp.getGunIdCharge();
+			if(obj){
+				this.charge=true
+				this.chargeObj=obj
+			}
+			
+		},
+		onReady() {
+			
 		},
 		methods: {
 
@@ -81,13 +81,13 @@
 				uni.redirectTo({
 					url: '/pages/user/finance/recharge'
 				})
-			},
-			chargeLook(){
-				
-				uni.redirectTo({
-					url:'/pages/searchPile/chargeProcess/charge?isback=1&deviceNo='+this.chargeObj.deviceNo+"&gun="+this.chargeObj.channelNo+"&carNumber="+this.chargeObj.carNumber
-				})
-				
+			},
+			chargeLook(){
+				
+				uni.redirectTo({
+					url:'/pages/searchPile/chargeProcess/charge?isback=1&deviceNo='+this.chargeObj.deviceNo+"&gun="+this.chargeObj.channelNo+"&carNumber="+this.chargeObj.carNumber
+				})
+				
 			},
 			balanceLook() {
 				uni.redirectTo({
@@ -153,4 +153,4 @@
 		border-color: #00B962 !important;
 		color: #fff !important;
 	}
-</style>
+</style>

pages/user/finance/refundApp.vue

@@ -1,6 +1,6 @@
 <template>
   <view>
-		<u-navbar title="退费申请"></u-navbar>	
+		<ujp-navbar title="退费申请"></ujp-navbar>	
 		<view class="paySuccess">
 			<u-icon name="chenggong" custom-prefix="custom-icon" size="180" color="#00B962"></u-icon>
 			<view class="title">退费申请成功</view>

pages/user/finance/refundDet.vue

@@ -1,7 +1,7 @@
 
 <template>
 	<view>
-		<u-navbar title="退费详情"></u-navbar>
+		<ujp-navbar title="退费详情"></ujp-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
 				<font>{{refund.refundRealAmount}}</font><span>元</span>

pages/user/finance/refundList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="退费记录"></u-navbar>
+		<ujp-navbar title="退费记录"></ujp-navbar>
 		<view class="balance">
 			<view class="balanceHead">
 				<view class="payPrice">

pages/user/freeInstallment.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="all">
-		<u-navbar title="免费安桩" :is-back="back" ></u-navbar>
+		<ujp-navbar title="免费安桩" :is-back="back" ></ujp-navbar>
 	    <view class="main">
 			<view class="text">
 				     为响应政府号召，积极推动充电桩普及，“51充电联盟”现面向公共停车场、私家车位提供“免费安桩”服务，有意加盟“51充电联盟”的机构和个人，均可申请免费安装电动汽车/摩托车/自行车充电桩，在平台的运营支持下，共享风口红利。

pages/user/help.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="操作指南"></u-navbar>
+		<ujp-navbar title="操作指南"></ujp-navbar>
 		<view class="collapse">
 			<!-- -->
 			<u-collapse :activeStyle='activeStyle'  :itemStyle="itemStyle"  :headStyle="headerStyle" :bodyStyle="bodyStyle"  v-if="itemList.length" >

pages/user/logout.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="all">
-		<u-navbar title="注销账号"></u-navbar>
+		<ujp-navbar title="注销账号"></ujp-navbar>
 		<view class="logout-head">
 			<img src="../../static/img/logout.png" alt="">
 			<p>注销帐号</p>

pages/user/message.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="all">
-		<u-navbar title="意见反馈"></u-navbar>	  
+		<ujp-navbar title="意见反馈"></ujp-navbar>	  
 		<view class="message">
 			<view class="message-form">
 				<u-form :model="subForm" ref="uForm" label-width ="100">

pages/user/myPile/myPile.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="充电桩设置"></u-navbar>
+		<ujp-navbar title="充电桩设置"></ujp-navbar>
 		<!-- <view class="main">
 			<view class="pile-details">
 				<view class="detail-content">

pages/user/myPile/pileManagement.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<u-navbar title="电桩管理">
+		<ujp-navbar title="电桩管理">
 			<view class="delete">删除</view>
-		</u-navbar>
+		</ujp-navbar>
 		<view class="details">
 			<view class="name">
 				大润发顶楼停车场01号直流80kW

pages/user/myReservation/myReservation.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<u-navbar title="我的预约">
+		<ujp-navbar title="我的预约">
 			<view class="screen oldTextjp2" oldstyle="font-size: 16px;" @click="screenClick">筛选</view>
-		</u-navbar>
+		</ujp-navbar>
 		<view>
 			<view v-if="screenShow" class="preference" :style="screenShow ? 'z-index:1024;top:'+navBarHeight+'px;' : 'z-index:0'"
 				style="width: 100%;">

pages/user/myReservation/reservationListDetails.vue

@@ -1,8 +1,8 @@
 <template>
 	<view >
-		<u-navbar title="预约单详情" :custom-back="customback" >
+		<ujp-navbar title="预约单详情" :custom-back="customback" >
 		
-		</u-navbar>
+		</ujp-navbar>
 	<!-- 	<view class="iconfont tittle-font">
 			&#xe616;
 		</view> -->

pages/user/phone.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="all">
-		<u-navbar title="修改手机号"></u-navbar>
+		<ujp-navbar title="修改手机号"></ujp-navbar>
 		<view class="login-form">
 			<view class="login-form-item">
 				<view class="input">

pages/user/preengaged/preengaged.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<u-navbar title="我被预约">
+		<ujp-navbar title="我被预约">
 			<view class="screen">筛选</view>
-		</u-navbar>
+		</ujp-navbar>
 		<view class="reservation-items">
 			<view class="station-name">
 				预约30分钟后充电

pages/user/preengaged/preengagedListDetails.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<u-navbar title="预约单详情" :custom-back="customback" >
+		<ujp-navbar title="预约单详情" :custom-back="customback" >
 
-		</u-navbar>
+		</ujp-navbar>
 		
 		<u-alert-tips type="warning" v-if="detail.status==0"  :description="description"></u-alert-tips>
 		<view class="reverse-time">

pages/user/setting.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="设置"></u-navbar>
+		<ujp-navbar title="设置"></ujp-navbar>
 		<u-cell-group>
 			<u-cell-item title="修改手机号" :title-style="checked ? titleStyle : {}" v-model="userPhone" @click="gotoUrl('pages/user/phone')"
 				:value-style="checked ? {fontSize:'16px'} : {}">

pages/user/toJoin.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="all">
-		<u-navbar :is-back="back" title="我要加盟" ></u-navbar>
+		<ujp-navbar :is-back="back" title="我要加盟" ></ujp-navbar>
 	
 		<view class="main">
 			<view class="main-content">