Merge branch 'gyq_test' into lw_test

androidPrivacy.json

@@ -2,13 +2,13 @@
     "version" : "2",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。你可阅读<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=270\">《服务协议》</a>和<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=826\">《隐私政策》</a>，了解详细信息，如果你同意，请点击下面按钮开始接受我们的服务。。",
+    "message" : "注册即代表您已阅读并同意<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=270\">《服务协议》</a>和<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=826\">《隐私政策》</a>，包括为优化服务而收集设备标识、操作日志等必要信息，否则将退出应用。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "hrefLoader" : "system",
     "second" : {
         "title" : "确认提示",
-        "message" : "进入应用前，你需先同意<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=270\">《服务协议》</a>和<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=826\">《隐私政策》</a>，否则将退出应用。",
+        "message" : "注册即代表您已阅读并同意<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=270\">《服务协议》</a>和<a href=\"https://contract1.bms16.com/new_energy/server/api/web/?r=contract/get&contract_id=826\">《隐私政策》</a>，包括为优化服务而收集设备标识、操作日志等必要信息，否则将退出应用。",
         "buttonAccept" : "同意并继续",
         "buttonRefuse" : "退出应用"
     },

app.css

@@ -139,13 +139,21 @@ view {
 	height: 56rpx;
 	background: #FFFFFF;
 	box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(197, 208, 219, 0.6);
-	border-radius: 28rpx  !important;
-	font-weight: 500  !important;
-	font-size: 26rpx  !important;
-	color: #060809  !important;
+	border-radius: 28rpx !important;
+	font-weight: 500 !important;
+	font-size: 26rpx !important;
+	color: #060809 !important;
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	margin-top: 120rpx;
 }
 
+.line2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+
+}

common/request.js

@@ -54,6 +54,7 @@ async function getRequest(url, data) {
 		url: url,
 		method: 'GET',
 	});
+	
 	uni.hideLoading();
 	 res = res[1]
 	 if(!res.data.code){

component/scanCabBtn/scanBtn.vue

@@ -129,7 +129,7 @@
 			//#endif
 			bluetooth.initBluetooth()
 			this.bluetoothClose()
-			this.loadBatteryInfo()
+			// this.loadBatteryInfo()
 			//this.loadExchangeInfo()
 		},
 		/**
@@ -205,8 +205,6 @@
 					let item = this.listData.boxList[index];
 					if(item.tag_info) boxBattery.push(item.tag_info)
 				}
-				console.log(userBattery)
-				console.log(boxBattery)
 				for (let index = 0; index < userBattery.length; index++) {
 					let item = userBattery[index];
 					for (var i = 0; i < boxBattery.length; i++) {
@@ -218,10 +216,21 @@
 						}
 					}
 				}
-				console.log(tagCode)
 				return tagCode
 			},
+			loadIsLogin() {
+				uni.navigateTo({
+					url: '/pages/loginRegister/login',
+				})
+			},
 			async sacnBtn() {
+				const user_token = storage.getUserToken()
+				if (!user_token) {
+					this.loadIsLogin()
+					return
+				}
+				await this.loadBatteryInfo()
+				
 				if(this.listData.can_exchange_num == 0){
 					this.isModelCenter = true
 					this.packType = 2
@@ -579,9 +588,7 @@
 			},
 
 			async loadBatteryInfo() {
-				console.log("加载电池信息")
 				const me = this
-				console.log(2222);
 				
 				let resp = await http.postApi(config.API_CAR_DEVICE_LIST, {})
 				if (resp.data.code === 200) {

main.js

@@ -9,9 +9,17 @@ Polyfill.init();
 import Mixin from './polyfill/mixins';
 import i18n from './locale/index'
 import uView from "uview-ui";
+Vue.use(uView)
 
-Vue.use(uView);
+import gyq_utils from '@/utils/gyq_utils'
+Vue.use(gyq_utils)
 
+uni.addInterceptor('request', {
+	fail: (err) => {
+		uni.hideLoading()
+		return false; // 阻止默认弹窗
+	}
+});
 
 // #ifndef VUE3
 import Vue from 'vue';
@@ -21,7 +29,7 @@ Vue.config.productionTip = false;
 App.mpType = 'app';
 const app = new Vue({
 	i18n,
-    ...App
+	...App
 });
 app.$mount();
 // #endif
@@ -40,4 +48,4 @@ app.$mount();
 //         app
 //     };
 // }
-// // #endif
+// // #endif

pages/activation/activation.vue

@@ -152,6 +152,7 @@
 					current_time
 				})
 				if (data.code == 200) {
+					uni.removeStorageSync('car_info')
 					common.simpleToast('还车成功！')
 					setTimeout(() => {
 						uni.switchTab({

pages/carDetail/carDetail.css

@@ -143,9 +143,10 @@
 	height: 64rpx;
 }
 .use-car-view{
-	padding: 24rpx 24rpx 40rpx ;
+	padding: 24rpx 24rpx 40rpx;
 	position:fixed;
 	bottom: 0;
+	left: 0;
 	background: #FFFFFF;
 	box-shadow: 0rpx -2rpx 0rpx 0rpx #F4F5F6;
 	width: 100%;

pages/carDetail/carDetail.vue

@@ -66,7 +66,7 @@
 							<img style="width: 84rpx;height: 64rpx;margin-right: 20rpx;"
 								src="https://qiniu.bms16.com/FkZYljvsgGtXUGnQaA0wk_sbjlUC" alt="">
 						</view>
-						<view @tap="">
+						<view @tap="navAddress">
 							<img style="width: 112rpx;height: 64rpx;"
 								src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
 						</view>
@@ -75,6 +75,9 @@
 				</view>
 			</view>
 		</view>
+		<view class="nodes">
+			<rich-text v-if="car_detail.desc" :nodes="car_detail.desc"></rich-text>
+		</view>
 		<view style="height: 150rpx;"></view>
 		<view class="use-car-view flex-row">
 			<view @tap="useCarBtn" class="use-car-btn">我要用车</view>
@@ -174,7 +177,6 @@
 					confirmText: '确定',
 					success: (res) => {
 						if (res.confirm) {
-							me.clearTimer()
 							uni.makePhoneCall({
 								phoneNumber: phone,
 								success() {},
@@ -227,4 +229,9 @@
 </script>
 <style>
 	@import './carDetail.css';
+	.nodes{
+		color: #333;
+		font-size: 28rpx;
+		padding: 34rpx 32rpx 32rpx;
+	}
 </style>

pages/carFunctionSet/more.vue

@@ -44,7 +44,6 @@
 		</view>
 	</view>
 </template>
-
 <script>
 	// import draggable from 'vuedraggable'
 	import {

pages/index/components/unleasedPages/unleasedPages.css

@@ -5,7 +5,7 @@
 	text-align: center;
 }
 .unleased-pages-main{
-	height: 100vh;
+	min-height: calc(100vh - 150rpx);
 	padding-top: 100rpx;
 	background: linear-gradient( 180deg,#BAC0CC 100%, #EFF7FC 0%, #BAC0CC 100%);
 }
@@ -28,6 +28,7 @@
 	margin-bottom: 20rpx;
 	max-width: 538rpx;
 	
+	
 }
 .car-img{
 	width: 700rpx;

pages/index/components/unleasedPages/unleasedPages.vue

@@ -8,8 +8,7 @@
 		<view :style="{height: `${statusBarHeight}px`}"></view>
 		<!-- #endif -->
 		
-		<view class="recommend-car-name w_100 text-center">{{moder_info.model_name}}</view>
-		<view class="recommend-car-tip w_100 text-center">{{moder_info.title||'续航开新路 路遥见实力'}}</view>
+		
 		<view >
 			<view style="margin: 0 50rpx 0rpx;height: 420rpx;">
 				<u-swiper
@@ -26,12 +25,14 @@
 			</view>
 			
 			<view class="car-model-step">
-				<view class="flex-row flex-around" style="padding-top: 80rpx;margin-bottom: 60rpx;">
+				<view  style="padding-top: 80rpx;margin-bottom: 60rpx;">
+					<view class="recommend-car-name w_100 text-center">{{moder_info.model_name}}</view>
+					<view class="recommend-car-tip w_100 text-center line2">{{moder_info.title||'续航开新路 路遥见实力'}}</view>
 					<!-- <view class="car-speed-view">
 						<view class="car-speed">72 <text class="company">km</text></view>
 						<text>全速续航</text>
-					</view>
-					<view class="car-speed-view">
+					</view> -->
+					<!-- <view class="car-speed-view">
 						<view class="car-speed">52 <text class="company">km/h</text></view>
 						<text>极速可达</text>
 					</view> -->

pages/index/index.vue

@@ -1,143 +1,147 @@
 <template>
 	<view>
-		<block v-if="isLogin && car_info.car_sn">
-			<view class="container-view"> 
-			<!-- #ifdef MP-WEIXIN -->
-			<view :style="{height: `${statusBarHeight + 30}px`}"></view>
-			<!-- #endif -->
-			<!-- #ifdef APP -->
-			<view :style="{height: `${statusBarHeight}px`}"></view>
-			<!-- #endif -->
-			<!-- <navBar type="index" /> -->
-				<view class="flex-row flex-between align-center padding_about_40">
-					<view class="car-name-view" @tap="navSwitchCar">
-						<text class="text" style="margin-right: 10rpx;">{{car_info.car_name}}</text>
-						<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI"
-							style="width: 14rpx;height: 14rpx;" alt="">
-					</view>
-					<view @click="routerLink('/pages/message/index')" class="news">
-						<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">{{newsList.plate_count + newsList.device_count}}</view>
-						<image src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx"
-							style="width: 48rpx;height: 48rpx;" mode=""></image>
+		<!-- #ifdef APP -->
+		<u-no-network  zIndex='9999' @retry='retry'></u-no-network>
+		<!-- #endif -->
+		<view v-if="isConnected">
+			<block v-if="isLogin && car_info.car_sn">
+				<view class="container-view"> 
+				<!-- #ifdef MP-WEIXIN -->
+				<view :style="{height: `${statusBarHeight + 30}px`}"></view>
+				<!-- #endif -->
+				<!-- #ifdef APP -->
+				<view :style="{height: `${statusBarHeight}px`}"></view>
+				<!-- #endif -->
+				<!-- <navBar type="index" /> -->
+					<view class="flex-row flex-between align-center padding_about_40">
+						<view class="car-name-view" @tap="navSwitchCar">
+							<text class="text" style="margin-right: 10rpx;">{{car_info.car_name}}</text>
+							<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI"
+								style="width: 14rpx;height: 14rpx;" alt="">
+						</view>
+						<view @click="routerLink('/pages/message/index')" class="news">
+							<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">{{newsList.plate_count + newsList.device_count}}</view>
+							<image src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx"
+								style="width: 48rpx;height: 48rpx;" mode=""></image>
+						</view>
 					</view>
-				</view>
-				<view v-if="isOverdueShow" class="overdue-view flex-row flex-between">
-					<view class="overdue-view-text flex-row">
-						<text class="overdue-text-left">您已逾期
-							<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">日</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
-										v-if="orderInfo.hire_duration_time.hour>0">小时</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
-										v-if="orderInfo.hire_duration_time.minute>0">分</text>
-								</block>
+					<view v-if="isOverdueShow" class="overdue-view flex-row flex-between">
+						<view class="overdue-view-text flex-row">
+							<text class="overdue-text-left">您已逾期
+								<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">日</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
+											v-if="orderInfo.hire_duration_time.hour>0">小时</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
+											v-if="orderInfo.hire_duration_time.minute>0">分</text>
+									</block>
+								</text>
 							</text>
-						</text>
-						<text style="font-size: 24rpx;opacity: 0.5;">请及时续费或归还车辆</text>
-					</view>
-					<view @click="routerLink('/pages/order/order')" class="renew-btn">去续费</view>
-				</view>
-				<view class="car-img-view" @tap="toMoreInfoPage">
-					<view class="quantity-view flex-row">
-						<text class="quantity flex-row">{{car_info.soc}} <text
-								style="font-size: 28rpx;font-weight: 500;">%</text></text>
-						<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10" :show-percent="false"
-							:percent="car_info.soc"></u-line-progress>
-						<view class="quantity-text flex-row">
-							<view style="font-weight:400;font-size: 22rpx;width: 44rpx;">{{$t("续航")}}</view>
-							<view style="font-size: 36rpx;">{{formatDistance(car_info.endurance) }}<text style="font-size: 30rpx;">{{car_info.endurance>1000?'km':'m'}}</text></view> 
+							<text style="font-size: 24rpx;opacity: 0.5;">请及时续费或归还车辆</text>
 						</view>
+						<view @click="routerLink('/pages/order/order')" class="renew-btn">去续费</view>
 					</view>
-					<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
-					<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
-						style="width: 100%;height: 526rpx;" alt="">
-					<view class="flex-row align-center update-time-view">
-						<text style="margin-right: 10rpx;">{{$t("车辆已关机")}} </text>
-						<text v-if="car_info.heart_time != 0" style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time|| ''}}</text>
-						<img :src="'https://qiniu.bms16.com/'+(isBluethConnect?'Fk3f9H_o-1Wq2xXx7I_xo7bxK1xJ':'FsL6XWGoIhfsVB7jRg6EGFVsuaTZ')"
-							:style="{width: (isBluethConnect?32:24)+'rpx',height: '32rpx'}" alt="">
-					</view>
-				</view>
-				<Control :contrilList="contrilList" />
-
-
-				<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time"
-					class="flex-row flex-between map-card-view">
-					<MapCard :car_info="car_info" />
-
-					<view class="card-right">
-						<view class="card-bg" @tap="navTravelingTrack">
-							<view class="flex-row flex-between card-top-title">
-								<view class="flex-row align-center">
-									<img style="width: 36rpx;height: 36rpx;"
-										src="https://qiniu.bms16.com/FkrcMCV__HraZ0W0NBNdEZPIlwss" alt="">
-									<text class="margin_l_8">{{isTrackOrAll?'最近骑行':'总里程'}}</text>
-								</view>
-								<view @tap.stop="isTrackOrAll=!isTrackOrAll"><img style="width: 24rpx;height: 20rpx;"
-										src="https://qiniu.bms16.com/FltPK-o7KGS3dQ2pfQHXGSxOdzaN" alt=""></view>
+					<view class="car-img-view" @tap="toMoreInfoPage">
+						<view class="quantity-view flex-row">
+							<text class="quantity flex-row">{{car_info.soc}} <text
+									style="font-size: 28rpx;font-weight: 500;">%</text></text>
+							<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10" :show-percent="false"
+								:percent="car_info.soc"></u-line-progress>
+							<view class="quantity-text flex-row">
+								<view style="font-weight:400;font-size: 22rpx;width: 44rpx;">{{$t("续航")}}</view>
+								<view style="font-size: 36rpx;">{{formatDistance(car_info.endurance) }}<text style="font-size: 30rpx;">{{car_info.endurance>1000?'km':'m'}}</text></view> 
 							</view>
-							<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text></view>
 						</view>
-
-						<view class="card-bg">
-							<view class="flex-row card-top-title">
-								<img style="width: 36rpx;height: 36rpx;"
-									src="https://qiniu.bms16.com/FtalApKa3STyruaBxxRB4O9hHXyE" alt="">
-								<text class="margin_l_8">{{$t("换电套餐")}}</text>
-							</view>
-							<view v-if="car_info.package_type == 1" class=" card-top-text">
-								{{calculateRemainingDays(car_info.exchange_package_info.expire_time)}} <text
-									class="font_24">{{$t("天")}}</text>
+						<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
+						<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
+							style="width: 100%;height: 526rpx;" alt="">
+						<view class="flex-row align-center update-time-view">
+							<text style="margin-right: 10rpx;">{{$t("车辆已关机")}} </text>
+							<text v-if="car_info.heart_time != 0" style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time|| ''}}</text>
+							<img :src="'https://qiniu.bms16.com/'+(isBluethConnect?'Fk3f9H_o-1Wq2xXx7I_xo7bxK1xJ':'FsL6XWGoIhfsVB7jRg6EGFVsuaTZ')"
+								:style="{width: (isBluethConnect?32:24)+'rpx',height: '32rpx'}" alt="">
+						</view>
+					</view>
+					<Control :contrilList="contrilList" />
+			
+			
+					<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time"
+						class="flex-row flex-between map-card-view">
+						<MapCard :car_info="car_info" />
+			
+						<view class="card-right">
+							<view class="card-bg" @tap="navTravelingTrack">
+								<view class="flex-row flex-between card-top-title">
+									<view class="flex-row align-center">
+										<img style="width: 36rpx;height: 36rpx;"
+											src="https://qiniu.bms16.com/FkrcMCV__HraZ0W0NBNdEZPIlwss" alt="">
+										<text class="margin_l_8">{{isTrackOrAll?'最近骑行':'总里程'}}</text>
+									</view>
+									<view @tap.stop="isTrackOrAll=!isTrackOrAll"><img style="width: 24rpx;height: 20rpx;"
+											src="https://qiniu.bms16.com/FltPK-o7KGS3dQ2pfQHXGSxOdzaN" alt=""></view>
+								</view>
+								<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text></view>
 							</view>
-							<view v-if="car_info.package_type == 2" class=" card-top-text">{{item.last_num}} <text
-									class="font_24">{{$t("次")}}</text></view>
-							<view v-if="car_info.package_type == 3" class=" card-top-text">
-								{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text class="font_24">{{$t("次")}}</text>
+			
+							<view class="card-bg">
+								<view class="flex-row card-top-title">
+									<img style="width: 36rpx;height: 36rpx;"
+										src="https://qiniu.bms16.com/FtalApKa3STyruaBxxRB4O9hHXyE" alt="">
+									<text class="margin_l_8">{{$t("换电套餐")}}</text>
+								</view>
+								<view v-if="car_info.package_type == 1" class=" card-top-text">
+									{{calculateRemainingDays(car_info.exchange_package_info.expire_time)}} <text
+										class="font_24">{{$t("天")}}</text>
+								</view>
+								<view v-if="car_info.package_type == 2" class=" card-top-text">{{item.last_num}} <text
+										class="font_24">{{$t("次")}}</text></view>
+								<view v-if="car_info.package_type == 3" class=" card-top-text">
+									{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text class="font_24">{{$t("次")}}</text>
+								</view>
 							</view>
 						</view>
 					</view>
-				</view>
-				<view class="config-view">
-					<view @tap="navToPage" class="flex-row config-car-view">
-						<view class="margin_r_20"><img class="icon_style_64"
-								src="https://qiniu.bms16.com/Ftzyvs5whxDdMFksYChHaWKVb0Uk" alt=""></view>
-						<view class="flex-row config-text-view" @tap="inductiveUnlockHandle">
-							<view class="flex-row font_w_600">{{$t("感应解锁")}}</view>
-							<view class="flex-row tip-text-config">{{isBluethConnect?$t("蓝牙配对成功"):$t("请先连接蓝牙")}}</view>
+					<view class="config-view">
+						<view @tap="navToPage" class="flex-row config-car-view">
+							<view class="margin_r_20"><img class="icon_style_64"
+									src="https://qiniu.bms16.com/Ftzyvs5whxDdMFksYChHaWKVb0Uk" alt=""></view>
+							<view class="flex-row config-text-view" @tap="inductiveUnlockHandle">
+								<view class="flex-row font_w_600">{{$t("感应解锁")}}</view>
+								<view class="flex-row tip-text-config">{{isBluethConnect?$t("蓝牙配对成功"):$t("请先连接蓝牙")}}</view>
+							</view>
+							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 						</view>
-						<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
-					</view>
-					<view @tap="navToPage" data-url="/pages/userManagement/userManagement"
-						class="flex-row config-car-view">
-						<view class="margin_r_20"><img class="icon_style_64"
-								src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt=""></view>
-						<view class="flex-row config-text-view">
-							<view class="flex-row font_w_600">{{$t("用车人管理")}}</view>
-							<view class="flex-row tip-text-config">{{car_info.share_num + $t("个家庭账号")}}</view>
+						<view @tap="navToPage" data-url="/pages/userManagement/userManagement"
+							class="flex-row config-car-view">
+							<view class="margin_r_20"><img class="icon_style_64"
+									src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt=""></view>
+							<view class="flex-row config-text-view">
+								<view class="flex-row font_w_600">{{$t("用车人管理")}}</view>
+								<view class="flex-row tip-text-config">{{car_info.share_num + $t("个家庭账号")}}</view>
+							</view>
+							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 						</view>
-						<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
-					</view>
-					<view @click="srcFn(`/pages/deviceInfo/deviceInfo`)" class="flex-row config-car-view">
-						<view class="margin_r_20"><img class="icon_style_64"
-								src="https://qiniu.bms16.com/FsAg6mHEBJfbtpgIHBrDdNiPo1iH" alt=""></view>
-						<view class="flex-row config-text-view">
-							<view class="flex-row font_w_600">{{$t("设备信息")}}</view>
-							<view class="flex-row tip-text-config">{{$t("软件版本") + (car_info.firmware||'')}}</view>
+						<view @click="srcFn(`/pages/deviceInfo/deviceInfo`)" class="flex-row config-car-view">
+							<view class="margin_r_20"><img class="icon_style_64"
+									src="https://qiniu.bms16.com/FsAg6mHEBJfbtpgIHBrDdNiPo1iH" alt=""></view>
+							<view class="flex-row config-text-view">
+								<view class="flex-row font_w_600">{{$t("设备信息")}}</view>
+								<view class="flex-row tip-text-config">{{$t("软件版本") + (car_info.firmware||'')}}</view>
+							</view>
+							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 						</view>
-						<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 					</view>
+					<view style="height: 264rpx;"></view>
 				</view>
-				<view style="height: 264rpx;"></view>
-			</view>
-		</block>
-
-		<block v-else>
-			<UnleasedPages :model_list="model_list" :img_list="img_list" />
-		</block>
-		<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />
-		<CustomTabbar @changCar='changCar' curt-tab="home"/>
-		<AndroidUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission" v-if="isShowPermission && (platform === 'android')" />
-		<IosUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission" v-else-if="isShowPermission && (platform === 'ios')" />
+			</block>
+			<block v-else>
+				<UnleasedPages :model_list="model_list" :img_list="img_list" />
+			</block>
+			<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />
+			<CustomTabbar @changCar='changCar' curt-tab="home"/>
+			<AndroidUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission" v-if="isShowPermission && (platform === 'android')" />
+			<IosUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission" v-else-if="isShowPermission && (platform === 'ios')" />
+		</view>
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -166,6 +170,8 @@
 	export default {
 		data() {
 			return {
+				isModel:false,
+				isConnected:false,
 				statusBarHeight:0,
 				newsList: {},
 				img_list: [],
@@ -198,63 +204,47 @@
 			AndroidUnlockAuth,
 			IosUnlockAuth
 		},
+		
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
 			this.locationFn()
-			this.loadModelList()
-			const user_token = storage.getUserToken()
-			if (!user_token) {
-				// this.loadIsLogin()
-				return
-			}
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
+			let _this = this
+			// #ifdef APP
+			uni.getNetworkType({
+				success: (res) => {
+					if (res.networkType == 'none') {
+						this.isConnected = false;
+					} else {
+						this.isConnected = true;
+					}
+				}
+			});
+			uni.onNetworkStatusChange((res) => {
+				_this.isConnected = res.isConnected
+				if(res.isConnected){
+					//
+					console.log('有网络了')
+					_this.init()
+				}
+			});
+			// #endif
+			
+			// #ifndef APP
+			this.isConnected = true
+				_this.init()
+			// #endif
+			
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-			// const permissionArr=permision.requestAndroidPermissions()
-			// app.globalData.permissionArr=permissionArr
-			// permision.gotoAppPermissionSetting()
-			// let status = checkBatteryOptimizationStatus();
-			// if (!permissionArr) {
-			//     uni.showModal({
-			//         title: "电池优化提示",
-			//         content: "您的设备开启了电池优化，可能会影响应用后台运行，请在设置中关闭。",
-			//         showCancel: true,
-			//         cancelText: "忽略",
-			//         confirmText: "去设置",
-			//         success(res) {
-			//             if (res.confirm) {
-			//                 permision.gotoAppPermissionSetting(); // 跳转到电池优化设置
-			//             }
-			//         }
-			//     });
-			// }
-			// app.globalData.permissionArr=permissionArr
-			console.log(getFunctionTag().activeTag)
-			this.contrilList = getFunctionTag().activeTag
-			const user_token = storage.getUserToken()
-			this.car_info = uni.getStorageSync('car_info') || {};
-			if (!user_token) {
-				this.isLogin = false
-				//this.loadIsLogin()
-
-				return
-			}
-			console.log(app.globalData.connectionState[this.car_sn],'app.globalData.connectionState[this.car_sn]');
-			this.isBluethConnect=app.globalData.connectionState[this.car_sn] && app.globalData.connectionState[this.car_sn].connected
-			this.newsNumFn()
-			this.isLogin = true
-			if (!this.car_info.car_sn) {
-				this.loadUserCarList()
-			} else {
-				this.loadCarDetail(this.car_info.car_sn)
-			}
-
+			this.init()
 		},
+		
 		// 分享给好友
 		onShareAppMessage: function(res) { //发送给朋友
 			return {
@@ -263,6 +253,24 @@
 			}
 		},
 		methods: {
+			init(){
+				this.loadModelList()
+				this.contrilList = getFunctionTag().activeTag
+				const user_token = storage.getUserToken()
+				this.car_info = uni.getStorageSync('car_info') || {};
+				this.isBluethConnect=app.globalData.connectionState[this.car_sn] && app.globalData.connectionState[this.car_sn].connected
+				if(!user_token) return
+				this.newsNumFn()
+				this.isLogin = true
+				if (!this.car_info.car_sn) {
+					this.loadUserCarList()
+				} else {
+					this.loadCarDetail(this.car_info.car_sn)
+				}
+			},
+			retry(){
+				console.log('115555')
+			},
 			async newsNumFn() {
 				let {
 					data
@@ -270,8 +278,6 @@
 				if (data.code == 200) {
 					this.newsList = data.data
 				}
-
-
 			},
 			locationFn() {
 				uni.getLocation({
@@ -293,21 +299,8 @@
 				})
 			},
 			loadIsLogin() {
-				uni.showModal({
-					title: '提示',
-					content: '您还未登录，请先登录',
-					showCancel: true,
-					cancelText: '取消',
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: '/pages/loginRegister/login',
-							})
-						}
-					},
-					fail: function(res) {},
-					complete: function(res) {},
+				uni.navigateTo({
+					url: '/pages/loginRegister/login',
 				})
 			},
 			toMoreInfoPage() {
@@ -358,6 +351,10 @@
 				this.isHideInduction = true
 			},
 			loadModelList() {
+				if(this.isModel){
+					 return
+				}
+				this.isModel = true
 				const me = this
 				http.postApi(config.API_RECOMMEND_CAR_MODEL_LIST, {}, (resp) => {
 					if (resp.data.code === 200) {
@@ -432,9 +429,7 @@
 			},
 			loadUserCarList() {
 				const me = this
-				common.loading()
 				http.postApi(config.API_FLK_CAR_DEVICE_LIST, {}, (resp) => {
-					uni.hideLoading();
 					if (resp.data.code === 200) {
 						const list = resp.data.data.list
 						if (list.length > 0) {
@@ -451,7 +446,6 @@
 			},
 			loadCarDetail(car_sn) {
 				const me = this
-				common.loading()
 				http.postApi(config.API_FLK_CAR_DETAIL, {
 					car_sn
 				}, (resp) => {

pages/my/my.vue

@@ -7,7 +7,7 @@
 		<view :style="{height: `${statusBarHeight}px`}"></view>
 		<!-- #endif -->
 		<view  class="user-switch-row">
-			<view  @click="routerLink({ url: '/pages/message/index' })" class="news">
+			<view  @click="routerLink({ url: '/pages/message/index',isLogin:1 })" class="news">
 				<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">{{newsList.plate_count + newsList.device_count}}</view>
 				<image :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"
 					 />
@@ -20,16 +20,18 @@
 				{{ userInfo.user_name }}
 			</view>
 		</view>
+		
+		
 		<view v-if="car_info.car_sn" class="common-tabs">
-			<view class="item" @click="routerLink({url:'/pages/dashboard/dashboard'})">
+			<view class="item" @click="routerLink({url:'/pages/dashboard/dashboard',isLogin:1})">
 				<image :src="QINIU_URL + 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1'" class="icon" />
 				<view class="name">{{ $t('我的车辆') }}</view>
 			</view>
-			<view class="item" @click="routerLink({url:'/pages/userManagement/userManagement'})">
+			<view class="item" @click="routerLink({url:'/pages/userManagement/userManagement',isLogin:1})">
 				<image :src="QINIU_URL + 'FnxGW52BCkTkK9HxsTdVrghU7B4D'" class="icon" />
 				<view class="name">{{ $t('用车人') }}</view>
 			</view>
-			<view v-if="car_info.sold_time" class="item" @click="routerLink({url:'',jumpCheck:'combo'})">
+			<view v-if="car_info.sold_time" class="item" @click="routerLink({url:'',jumpCheck:'combo',isLogin:1})">
 				<image :src="QINIU_URL + 'FsOsd1SxYDHDm00aiwrTib_k0Mbr'" class="icon" />
 				<view class="name">{{ $t('换电套餐') }}</view>
 			</view>
@@ -94,12 +96,14 @@ var request = require('@/common/request.js');
 				return [{
 						name: `${lang('我的订单')}`,
 						url: '/pages/order/order',
-						icon: 'FkLJGLo1faYtJWhW4Q0gt5dphI7g'
+						icon: 'FkLJGLo1faYtJWhW4Q0gt5dphI7g',
+						isLogin:1
 					},
 					{
 						name: `${lang('换电记录')}`,
 						url: '/pages/batteryRecord/batteryRecord',
-						icon: 'FnSjwcN7Mcpa-WA7Cqx2cGTvX2V1'
+						icon: 'FnSjwcN7Mcpa-WA7Cqx2cGTvX2V1',
+						isLogin:1
 					},
 					{
 						name: `${lang('意见反馈')}`,
@@ -111,7 +115,8 @@ var request = require('@/common/request.js');
 						name: `${lang('客服中心')}`,
 						url: '',
 						statues:'service',
-						icon: 'FhA9TUbTMF0e7ma6NZXqPrkscN6l'
+						icon: 'FhA9TUbTMF0e7ma6NZXqPrkscN6l',
+						isLogin:1
 					},
 					{
 						name: `${lang('设置')}`,
@@ -178,9 +183,14 @@ var request = require('@/common/request.js');
 			routerLink({
 				url,
 				jumpCheck,
-				statues
+				statues,
+				isLogin
 			}) {
-				console.log(url)
+				if(isLogin && !uni.getStorageSync('storage_user_token')){
+					uni.navigateTo({
+						url:'/pages/loginRegister/login'
+					})
+				}
 				if(statues){
 					return
 				}

pages/my/set.vue

@@ -12,7 +12,7 @@
           <view class="title">{{ item.title }}</view>
           <view :class="['text-right', item.hideArrow && 'hide-arrow']">
             <view v-if="item.textProp == 'registrationTime' && userInfo.ctime"> {{ formatTimestamp(userInfo.ctime) }}</view>
-            <input class="inp" @blur="inpfn" v-if="item.textProp == 'nickname'" v-model="userInfo[item.textProp]" type="text" />
+            <input class="inp" @blur="inpfn" :maxlength="22" v-if="item.textProp == 'nickname'" v-model="userInfo[item.textProp]" type="text" />
             <!-- <view v-if="item.textProp == 'registrationTime'"" class="title">{{ userInfo[item.textProp] }}1</view> -->
             <block v-else>
               {{ userInfo[item.textProp] || '' }}

pages/orderStatus/orderStatus.vue

@@ -207,8 +207,11 @@
 		<!-- 考虑为空的情况 -->
 
 		<view class="payment-info flex-row flex-between">
-			<view v-if="(orderInfo.order_status == 1 || orderInfo.pay_status == 5) && orderInfo.pay_type != 1"
-				class="cancel" @tap="clickCancel">结束订单
+			<view v-if="orderInfo.order_status == 1 || orderInfo.pay_status == 5" class="flex-row"> <!-- 待取车 -->
+				<view v-if="orderInfo.order_type != 3"
+					class="cancel" @tap="clickCancel">结束订单
+				</view>
+				<view @tap="callStorePhone" class="deposit-btn ">联系门店</view>
 			</view>
 			<view v-if="orderInfo.order_status == 1" class="flex-row"> <!-- 待取车 -->
 				<view @tap="callStorePhone" class="deposit-btn ">联系门店</view>

pages/service/components/carRentalList/carRentalList.vue

@@ -190,8 +190,6 @@
 				return '租'
 			},
 			async navToStore(admin_id) {
-				const isLogin = await loginToast()
-				if (!isLogin) return
 				const url = '/pages/storeDetails/storeDetails?admin_id=' + admin_id 
 				uni.navigateTo({
 					url

pages/service/components/leaseType/leaseType.vue

@@ -1,42 +1,47 @@
 <template>
     <view class="container-view-contril">
-		<u-popup v-model="showLeaseType" :mask-close-able='false' :closeable="false" mode="bottom" border-radius="32">
+		<u-popup zIndex='9999' v-model="showLeaseType" :mask-close-able='false' :closeable="false" mode="bottom" border-radius="32">
 		    <view class="bottom-popup">
 		        <view class="title">{{ selectType == 'cabinet' ? '车辆类型' : '用车方案' }}</view>
-		        <view class="item-wrap">
-					<view
-					    :class="['item', leaseType == 100 && 'checked']"
-					    @click="leaseType = 100"
-					>
-					    全部
-					</view>
-                    <template v-if="selectType == 'cabinet'">
-                        <view 
-                            v-for="(item, index) in modelTypeList" 
-                            :class="['item', leaseType == item.id && 'checked']"
-                            :key="index"
-                            @click="leaseType = item.id"
-                        >
-                            {{ item.name }}
-                        </view>
-                    </template>
-                    <template v-if="selectType == 'store'" >
-                        <view 
-                            v-for="(item, index) in LEASE_TYPE_ARR" 
-                            :class="['item', leaseType == item.value && 'checked']"
-                            :key="index"
-                            @click="leaseType = item.value"
-                        >
-                            {{ item.label }}
-                        </view>
-                        <view class="item" style="opacity: 0;"></view>
-                    </template>
-		        </view>
-		        <view class="options-wrap">
+		        <scroll-view style="max-height: 700rpx;" scroll-y>
+		        	<view class="item-wrap">
+		        		<view
+		        		    :class="['item', leaseType == 100 && 'checked']"
+		        		    @click="leaseType = 100"
+		        		>
+		        		    全部
+		        		</view>
+		        	    <template v-if="selectType == 'cabinet'">
+		        	        <view 
+		        	            v-for="(item, index) in modelTypeList" 
+		        	            :class="['item', leaseType == item.id && 'checked']"
+		        	            :key="index"
+		        	            @click="leaseType = item.id"
+		        	        >
+		        	            {{ item.name }}
+		        	        </view>
+		        	    </template>
+		        	    <template v-if="selectType == 'store'" >
+		        	        <view 
+		        	            v-for="(item, index) in LEASE_TYPE_ARR" 
+		        	            :class="['item', leaseType == item.value && 'checked']"
+		        	            :key="index"
+		        	            @click="leaseType = item.value"
+		        	        >
+		        	            {{ item.label }}
+		        	        </view>
+		        	        <view class="item" style="opacity: 0;"></view>
+		        	    </template>
+		        	</view>
+		        </scroll-view>
+				
+				<view class="options-wrap">
 		            <view class="btn cancle" @click="closeLeaseType">取消</view>
 		            <view class="btn confirm" @click="chooseLeaseType">确定</view>
 		        </view>
+				<view style="height: 170rpx;"></view>
 		    </view>
+		
 		</u-popup>
     </view>
 </template>

pages/service/service.vue

@@ -11,7 +11,7 @@
 					{{ item.available_cnt }}
 				</cover-view>
 			</block>
-		</map>
+		</map>	
 		<!-- #endif -->
 
 		<!-- #ifdef APP -->
@@ -293,7 +293,7 @@
 							latitude: item.latitude,
 							iconPath: CABINET_ICON_URLS,
 							iconPathActive: CABINET_ICON_URLS,
-							content: '21'
+							content: item.tag_code.length
 						}
 					})
 					this.getLocationPostion(this.myLocation, markers);

pages/storeDetails/storeDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container-view">
-		<navBar type="index"></navBar>
+		<navBar></navBar>
 		<!-- <view class="store-img-view" style="background-image: url('https://qiniu.bms16.com/FhG-xwyMdxPVjYNrxXnq5enGFT-2');background-repeat: no-repeat;background-size: 100% 500rpx;">
 			
 		</view> -->

utils/gyq_utils.js

@@ -0,0 +1,17 @@
+var storage = require('../common/storage.js');
+function srcFn(url,isLogin){
+	if(isLogin && !storage.getUserToken()){
+		uni.navigateTo({
+			url:'/pages/loginRegister/login'
+		})
+		return
+	}
+	uni.navigateTo({
+		url,
+	})
+}
+export default {
+  install: function (vm) {
+    vm.prototype.$srcFn = srcFn;
+  },
+};

utils/util.js

@@ -79,6 +79,7 @@ function isEmail(email) {
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     return emailRegex.test(email);
 }
+
 module.exports = {
 	isEmail,
 	formatTime: formatTime,

uview-ui/components/u-no-network/u-no-network.vue

@@ -40,7 +40,7 @@
 			// 一个z-index值，用于设置没有网络这个组件的层次，因为页面可能会有其他定位的元素层级过高，导致此组件被覆盖
 			zIndex: {
 				type: [Number, String],
-				default: ''
+				default: '999999999'
 			},
 			// image 没有网络的图片提示
 			image: {