bug修改

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;
+
+}

main.js

@@ -10,7 +10,9 @@ import Mixin from './polyfill/mixins';
 import i18n from './locale/index'
 import uView from "uview-ui";
 
-Vue.use(uView);
+
+import gyq_utils from '@/utils/gyq_utils'
+Vue.use(gyq_utils)
 
 
 // #ifndef VUE3

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() {},

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

@@ -234,7 +234,6 @@
 			//     });
 			// }
 			// app.globalData.permissionArr=permissionArr
-			console.log(getFunctionTag().activeTag)
 			this.contrilList = getFunctionTag().activeTag
 			const user_token = storage.getUserToken()
 			this.car_info = uni.getStorageSync('car_info') || {};
@@ -244,7 +243,6 @@
 
 				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

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/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

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,