components/navBar/navigation.vue

@@ -1,9 +1,11 @@
 <template>
-		<view class="top-view flex-row"
+		<view>
+			<view class="top-view flex-row"
 			:style="{'padding-top':`${statusBarHeight1}px`,background:`rgba(255,255,255,${opacity})`}">
 			<view class="navHei" :style="{'height':`calc(${navabarHeight}rpx)`,'width':'100%',}">
 				<view v-if="isback" class="left" @tap="bindReturnView">
-					<view class="pos">
+					<img v-if="type" class="return-view" src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" />
+					<view v-else class="pos">
 						<view   class="car-detail-style">
 							<image  class="return-view"
 								src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" mode="aspectFit"></image>
@@ -17,6 +19,8 @@
 				<text class="top-text">{{name}}</text>
 			</view>
 		</view>
+		<view v-if="type" :style="{'height':`calc(${navabarHeight}rpx + ${statusBarHeight1}px)`}"></view>
+		</view>
 </template>
 
 <script>
@@ -33,6 +37,10 @@
 			scroll: {
 				default: 0,
 				type: Number
+			},
+			type:{
+				type: Boolean,
+				default: false
 			}
 		},
 		watch: {

pages/addUser/addUser.vue

@@ -3,7 +3,7 @@
 		<navBar :name="$t('添加成员')" left="0"/>
 		<view class="flex-row email-input-view">
 			<input class="email-input-style" type="email" v-model="email" :placeholder="$t('请输入被邀人邮箱号')"  placeholder-style="font-size: 32rpx; font-weight: 400; color: #BAC1D0;">
-			<img class="clear-btn" src="https://qiniu.bms16.com/Fjpf2YnHUK1_CFf20kKRvjX9YdC3" alt="">
+			<img @tap="closeEmail" class="clear-btn" src="https://qiniu.bms16.com/Fjpf2YnHUK1_CFf20kKRvjX9YdC3" alt="">
 		</view>
 		<view @click="nextFn" class="next-btn" :class="{'next-btn-i':!isEmailFn(email)}">{{ $t('下一步') }}</view>
 	</view>
@@ -27,6 +27,9 @@
 		onLoad: function(options) {
 		},
 		methods: {
+			closeEmail(){
+				this.email = ""
+			},
 			isEmailFn(str){
 				return isEmail(str)
 			},
@@ -90,5 +93,6 @@
 	height: 40rpx;
 	right: 36rpx;
 	top: 28rpx;
+	z-index: 9;
 }
 </style>

pages/batteryPackage/batteryPackage.css

@@ -1,5 +1,10 @@
 .battery-package-main{
 	padding: 32rpx;
+	width: 100%;
+    min-height: 100vh;
+    background: linear-gradient(180deg, #CFD1DE 0%, #F1F3F4 100%), #F1F3F4;
+    background-size: 100% 528rpx;
+    background-repeat: no-repeat;
 }
 .package-icon-view{
 	margin-bottom: 40rpx;

pages/batteryPackage/batteryPackage.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="battery-package-main">
-		<navBar bgColor="#fff" :name="$t('换电套餐')" />
+		<navigation :type="true" :name="$t('换电套餐')" />
 		
 		<view class="package-icon-view flex-row">
 			<img src="https://qiniu.bms16.com/FqF7erLOB8OutmFnre7-mbTkwpZr" alt="">
@@ -47,7 +47,7 @@
 		<view style="height: 200rpx;">
 			
 		</view>
-		<view v-if="form.package_code" @click="isShowToBuy = true"  class="pay-btn">{{ $t('立即购买') }}</view>
+		<view v-if="form.package_code" @click="isShowToBuy = true"  class="pay-btn">{{ $t('需到店支付') }}</view>
 		<payTypeModel @closeShow='isShowToBuy = false' :free_price='form.price' :isShowToBuy='isShowToBuy' @payToOrder='submit'></payTypeModel>
 	</view>
 </template>

pages/index/index.vue

@@ -37,21 +37,23 @@
 						<view :style="{height: `${statusBarHeight + 50}px`}"></view>
 						<!-- #endif -->
 					</view>
-					<view v-if="isOverdueShow" class="overdue-view flex-row flex-between">
-						<view class="overdue-view-text flex-row">
-							<text class="overdue-text-left">{{ $t('您已逾期') }}
-								<text class="overdue-num">
-									<block v-if="orderInfo.hire_duration_time">
-										{{orderInfo.hire_duration_time.day > 0 ? orderInfo.hire_duration_time.day :'' }}<text
-											v-if="orderInfo.hire_duration_time.day>0">{{ $t('日') }}</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
-											v-if="orderInfo.hire_duration_time.hour>0">{{ $t('小时') }}</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
-											v-if="orderInfo.hire_duration_time.minute>0">{{ $t('分') }}</text>
-									</block>
+					<view v-if="isOverdueShow" class="overdue-view-box">
+						<view class="overdue-view flex-row flex-between">
+							<view class="overdue-view-text flex-row">
+								<text class="overdue-text-left">{{ $t('您已逾期') }}
+									<text class="overdue-num">
+										<block v-if="orderInfo.hire_duration_time">
+											{{orderInfo.hire_duration_time.day > 0 ? orderInfo.hire_duration_time.day :'' }}<text
+												v-if="orderInfo.hire_duration_time.day>0">{{ $t('日') }}</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
+												v-if="orderInfo.hire_duration_time.hour>0">{{ $t('小时') }}</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
+												v-if="orderInfo.hire_duration_time.minute>0">{{ $t('分') }}</text>
+										</block>
+									</text>
 								</text>
-							</text>
-							<text style="font-size: 24rpx;opacity: 0.5;">{{ $t('请及时续费或归还车辆') }}</text>
+								<text style="font-size: 24rpx;opacity: 0.5;">{{ $t('请及时续费或归还车辆') }}</text>
+							</view>
+							<view @click="routerLink('/pages/order/order')" class="renew-btn">{{ $t('去续费') }}</view>
 						</view>
-						<view @click="routerLink('/pages/order/order')" class="renew-btn">{{ $t('去续费') }}</view>
 					</view>
 					<view class="car-img-view" >
 						<view v-if="!car_info.sold_time" class="flex-row flex-between" style="align-items: center;">

pages/powerSetting/powerSetting.vue

@@ -2,8 +2,8 @@
 		<view class="power-setting-main">
 			<navBar :name="$t('权限设置')" bgColor="transparent"></navBar>
 			<view class="flex-row power-setting-head">
-				<image class="head-img" :src="headimg" mode="aspectFit"></image>
-				<view class="head-name">{{nickname}}</view>
+				<image class="head-img" :src="form.headimg"></image>
+				<view class="head-name">{{form.nickname}}</view>
 				<text class="head-email">{{form.email}}</text>
 			</view>
 			<view class="setting-card" style="margin-bottom: 20rpx;">
@@ -60,10 +60,10 @@
 		data() {
 			return {
 				isSet:"",
-				headimg: "",
-				nickname: "",
 				target_user_id:0,
 				form: {
+					headimg: "",
+					nickname: "",
 					car_sn: "",
 					email: "",
 					authority_list: [5]
@@ -83,7 +83,7 @@
 				return
 			}
 			this.form.email = options.email;
-			this.headimg = options.headimg;
+			this.form.headimg = options.headimg;
 			this.form.nickname = options.nickname;
 		},
 		methods: {
@@ -100,8 +100,8 @@
 					})
 					this.form.authority_list = data.data.authority
 					this.form.email = data.data.email
-					this.nickname = data.data.nickname
-					this.headimg = data.data.headimg
+					this.form.nickname = data.data.nickname
+					this.form.headimg = data.data.headimg
 				}
 			},
 			async delSubmit() {

pages/userManagement/userManagement.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<navBar :name="$t('共享用户')" />
+		<navBar :name="$t('用车人管理')" />
 		<view class="user-card">
 			<view class="flex-row align-center user-card-heard">
 				<img style="width: 48rpx;height: 48rpx;" src="https://qiniu.bms16.com/FieeNq75ybyjIzQO6fmNcdTlRsp5" alt="">