bug修改

common/http.js

@@ -13,6 +13,13 @@ var config = require('./config.js'); // 检查token是否失效 如失效 清除
 // 402: 解析token出错  403: token格式错误  404: 公共声明中缺少必要字段  405: token验证失败
 import crypto from '@/node_modules/crypto-js';
 function _checkTokenValid(res) {
+	if(res.data.code === 305){
+		uni.showToast({
+			title:'账号已在其他设备登录！',
+			icon:'none'
+		})
+		return false
+	}
 	if (
 		res.data.code === 402 ||
 		res.data.code === 403 ||
@@ -62,6 +69,9 @@ function getRequest(url, data, successCallBack, failCallBack) {
 					successCallBack(res);
 					return
 			}
+			if(res.data.code === 503){
+				return
+			}
 			if (_checkTokenValid(res)) {
 				successCallBack(res);
 			}
@@ -111,6 +121,8 @@ function postRequest(url, data, successCallBack, failCallBack) {
 				res.body = res.data
 				successCallBack(res);
 				return
+			} else if(res.data.code === 503){
+				return
 			} else {
 				uni.showToast({ title: res.data.msg, icon: 'none' })
 			}

common/request.js

@@ -13,6 +13,14 @@ var config = require('./config.js'); // 检查token是否失效 如失效 清除
 import crypto from '@/node_modules/crypto-js';
 
 function _checkTokenValid(res) {
+	
+	if(res.data.code === 305){
+		uni.showToast({
+			title:'账号已在其他设备登录！',
+			icon:'none'
+		})
+		return false
+	}
 	if (
 		res.data.code === 402 ||
 		res.data.code === 403 ||
@@ -66,6 +74,9 @@ async function getRequest(url, data) {
 	 if(res.data.code == 200){
 		 return res
 	 }
+	 if(res.data.code === 503){
+	 	throw Error(res.data.msg);
+	 }
 	if (_checkTokenValid(res)) {
 		return res
 	}
@@ -104,6 +115,9 @@ async function postRequest(url, data ) {
 		res.body = res.data
 		return res
 	}
+	if(res.data.code === 503){
+		throw Error(res.data.msg);
+	}
 	if (_checkTokenValid(res)) {
 		return res
 	}

component/smartCalendar/index.vue

@@ -256,11 +256,10 @@
 						this.timeValue[1] = val[1];
 					}
 					//#endif
-					//#ifdef MP-WEIXIN
+					
 					const val = e.detail.value;
 					this.startH = val[0]
 					this.startM = val[1]
-					//#endif
 					this.loadTime()
 				},
 
@@ -269,10 +268,10 @@
 					const _startH = this.startH< 10&&this.startH!== '00' ? ('0' + this.startH ): this.startH
 					const _startM = this.startM< 10&&this.startM!== '00' ? ('0' + this.startM) : this.startM
 					//#endif
-					//#ifdef MP-WEIXIN
+					
 					const _startH = this.startH< 10&&this.startH!== '00' ? ('0' + this.startH) : this.startH
 					const _startM = this.startM< 10&&this.startM!== '00' ? ('0' + this.startM) : this.startM
-					//#endif
+					
 					this.startDate =_startH==0?(this.time+'T0'+_startH+':'+_startM):( this.time+'T'+_startH+':'+_startM)
 					this.startDay = common.formatDate(this.time)+' '+_startH+':'+_startM
 					this.endDate = common.loadAugmentTime(this.duration_unit,this.startDate,this.startN+1)

locale/en.json

@@ -577,5 +577,6 @@
 	"电池和车": "Battery and car",
 	"请关联车辆": "Please contact vehicle",
 	"请输入车辆编号": "Enter vehicle number",
-	"修改成功":"修改成功"
+	"修改成功":"修改成功",
+	"请输入8-18位密码，包含字母数字":"请输入8-18位密码，包含字母数字"
 }

locale/zh.json

@@ -87,5 +87,6 @@
 	"修改成功":"修改成功",
 	"请先连接蓝牙":"请先连接蓝牙",
 	"注册邮件发送成功":"注册邮件发送成功",
-	"蓝牙配对成功":"蓝牙配对成功"
+	"蓝牙配对成功":"蓝牙配对成功",
+	"请输入8-18位密码，包含字母数字":"请输入8-18位密码，包含字母数字"
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "FRANCO MORINI",
     "appid" : "__UNI__111A022",
     "description" : "",
-    "versionName" : "1.3.5",
-    "versionCode" : 135,
+    "versionName" : "1.3.7",
+    "versionCode" : 137,
     "transformPx" : false,
     "loadnativePlugins" : false,
     "sassImplementationName" : "node-sass",

pages/aboutMy/aboutMy.css

@@ -13,15 +13,17 @@
 	width: 148rpx;
 	height: 148rpx;
 	border-radius: 32rpx;
+	overflow: hidden;
 }
 
 .version {
 	height: 100rpx;
-	color: #AEAEAE;
+	color: #060809;
 	text-align: center;
 	margin: 0 auto;
 	margin-top:24rpx;
-	font-size: 24rpx;
+	font-size: 28rpx;
+	font-family: Futura, Futura;
 }
 .align-center{
 	align-items: center;

pages/aboutMy/aboutMy.vue

@@ -2,9 +2,9 @@
 	<view class="container">
 		<navBar name="关于我们"></navBar>
 		<view class="header_view flex-row flex-column">
-			<image class="header_img" :src="app_logo" />
-			<view class="header_title">这里是名称</view>
-			<view class="version">{{"V 6.62.5"}}</view>
+			<image class="header_img" :src="app_logo" mode="aspectFill"></image>
+			<view class="header_title">{{appName}}</view>
+			<view class="version">{{"V " + app_version}}</view>
 		</view>
 		
 		<view class="company-text-view">
@@ -20,18 +20,21 @@
 	export default {
 		data() {
 			return {
-				app_logo: 'https://qiniu.bms16.com/FgstQ2-7-sLjIoue4r0magDAIERI',
-				app_version: ''
+				app_logo: 'https://qiniu.bms16.com/FhOh-tx4b0fxr_kglD_zshsyi2_-',
+				app_version: '',
+				appName:''
 			};
 		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
-			const appConfig = storage.getAppConfig()
+			let getAppBaseInfo = uni.getAppBaseInfo()
+			console.log(getAppBaseInfo)
 			this.setData({
 				// app_logo: appConfig.app_logo,
-				app_version: options.app_version || ''
+				app_version: getAppBaseInfo.appVersion || '',
+				appName: getAppBaseInfo.appName || ''
 			})
 		},
 		/**

pages/activation/activation.vue

@@ -156,7 +156,7 @@
 					common.simpleToast('还车成功！')
 					setTimeout(() => {
 						uni.switchTab({
-							url: `/pages/index/index?plate_number=${this.car_sn}`,
+							url: `/pages/index/index`,
 						});
 					}, 800)
 				} else {

pages/carList/carList.vue

@@ -12,10 +12,10 @@
 				<text>当前选择</text>
 			</view>
 		</view>
-		<view class="options">
+		<!-- <view class="options">
 			<view @click="navCarDetail" class="btn btn-left">{{ $t('租赁设备') }}</view>
 			<view class="btn btn-right">{{ $t('绑定设备') }}</view>
-		</view>
+		</view> -->
 		<Confirm
         v-model="showConfirm"
         :dialog-info="{

pages/index/index.vue

@@ -272,11 +272,12 @@
 				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)
-				}
+				this.loadUserCarList()
+				// if (!this.car_info.car_sn) {
+					
+				// } else {
+				// 	this.loadCarDetail(this.car_info.car_sn)
+				// }
 			},
 			retry(){
 				console.log('115555')
@@ -442,12 +443,25 @@
 				http.postApi(config.API_FLK_CAR_DEVICE_LIST, {}, (resp) => {
 					if (resp.data.code === 200) {
 						const list = resp.data.data.list
-						if (list.length > 0) {
-							me.setData({
-								car_list: list,
-								car_sn: list[0].car_sn || '',
-							})
-							me.loadCarDetail(list[0].car_sn)
+						let isCar = false
+						let itemCar = {}
+						for (let i = 0; i < list.length; i++) {
+							let item = list[i];
+							if(item.car_sn == this.car_info.car_sn){
+								isCar = true
+								itemCar = item
+							}
+						}
+						if(!isCar){
+							if (list.length > 0) {
+								me.setData({
+									car_list: list,
+									car_sn: list[0].car_sn || '',
+								})
+								me.loadCarDetail(list[0].car_sn)
+							}
+						}else{
+							me.loadCarDetail(itemCar.car_sn)
 						}
 					} else {
 						common.simpleToast(resp.data.msg);

pages/loginRegister/changePassword.vue

@@ -23,13 +23,13 @@
 		        {{ $t('确认修改') }}
 		    </view>
 		</view>
-		
 	</view>
 
 </template>
 
 
 <script>
+	var storage = require('../../common/storage.js');
 import common from '../../common/common';
 import ZxInput from './components/ZxInput.vue'
 var config = require('../../common/config_gyq.js');
@@ -43,7 +43,8 @@ export default {
         }
     },
     components: {
-        ZxInput
+        ZxInput,
+		
     },
     computed: {
         isSubmit({ form }) {
@@ -62,11 +63,11 @@ export default {
 				let {data} = await http.postApi(config.API_FLK_ACCOUNT_IMODIFY_PASSWD,this.form)
 				if(data.code == 200){
 					common.simpleToast(this.$t('修改成功'))
-					setTimeout(()=>{
-						uni.navigateBack({
-							delta:1
-						})
-					},800)
+					storage.removeUserToken()
+					uni.removeStorageSync('USER_INFO_DATA')
+					uni.redirectTo({
+						url:'/pages/loginRegister/login'
+					})
 				}else{
 					common.simpleToast(data.msg)
 				}

pages/loginRegister/forgetPassword.vue

@@ -12,7 +12,7 @@
             :title="$t('重置密码邮件已发送')"
             :btnText="$t('去登录')"
             type="forgetPassword"
-			@close='close'
+			@input='close'
             :text="noticeText"
             :email="email"
             v-model="isSendSucceed"
@@ -45,8 +45,8 @@ export default {
     },
     methods: {
 		close(){
-			uni.navigateBack({
-				delta:1
+			uni.redirectTo({
+				url:'/pages/loginRegister/login'
 			})
 		},
         resetHandle() {

pages/loginRegister/register.vue

@@ -33,7 +33,7 @@
             type="register"
 			@close='close'
             :email="form.email"
-            :text="$t(`我们向 ${this.form.email}</span> 发送了一封注册邮件，请您登录邮箱点击链接完成注册。`)"
+            :text="$t(`我们已向 <span>${this.form.email}</span> 发送注册邮件，请您登录邮箱点击链接完成注册。`)"
             v-model="isSendSucceed"
         />
     </view>
@@ -68,6 +68,7 @@ export default {
         }
     },
     methods: {
+		
 		close(){
 			uni.navigateBack({
 				delta:1
@@ -85,6 +86,10 @@ export default {
             }, 500)
             uni.showToast({ title: message, icon: 'none' })
         },
+		 validatePassword(password) {
+		    const regex = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z0-9]{8,18}$/;
+		    return regex.test(password);
+		},
         submit() {
             if (!this.isCheckAgreement) {
                 this._applyCheck('agreemen', this.$t('请勾选用户协议和隐私政策'))
@@ -94,6 +99,12 @@ export default {
                 uni.showToast({ title: this.$t('请输入有效的邮箱地址'), icon: 'none' })
                 return
             }
+			
+			if(!this.validatePassword(this.form.passwd) || !this.validatePassword(this.form.second_passwd)){
+				 uni.showToast({ title: this.$t('请输入8-18位密码，包含字母数字'), icon: 'none' })
+				return
+			}
+			
             if (this.form.passwd !== this.form.second_passwd) {
                 uni.showToast({ title: this.$t('两次输入的密码不一致'), icon: 'none' })
                 return

pages/message/deviceInfo.vue

@@ -14,7 +14,6 @@
 					}'  ></googleMap>
 					<!-- #endif -->
 				</view>
-				
                 <view class="msg-text">
                     <view class="title">{{ item.title }}</view>
                     <view class="dtl-txt">{{ item.overview }}</view>

pages/message/index.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="message-page">
-		<navBar name="设备信息"></navBar>
+		<navBar name="我的消息"></navBar>
         <view class="device-msg-wrap base-wrap" v-for="(item, index) in deviceList" :key="index"  @tap="toDeviceMsgPage(item)">
             <view class="row">
                 <view class="title">

pages/order/order.css

@@ -63,7 +63,7 @@
 	color: #2A3A5A;
 	font-size: 36rpx;
 	font-weight: bold;
-	width: 460rpx;
+	width: 380rpx;
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;

pages/order/order.vue

@@ -2,7 +2,7 @@
 	<view class="container-view">
 		<navBar name="我的订单" left="0" ></navBar>
 		<view class="order-type-view flex-row flex-between">
-			<view v-if="car_info.car_name" @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
+			<view v-if="car_info.car_sn" @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
 				<view class="car-model-text">{{car_info.car_name}}</view><img class="right-corner-icon"
 					src="https://qiniu.bms16.com/Fqs6TrEmcdT7QNEdKWs9Hir2cacO" alt="">
 			</view>
@@ -262,6 +262,10 @@
 				return getRemainingTime(start, end)
 			},
 			async bindExchangeOrderFn() {
+				if(!this.car_info.car_sn){
+					this.hireOrderList = []
+					return 
+				}
 				let {
 					data
 				} = await request.postApi(config_gyq.API_FLK_EXCHANGE_PACKAGE_ORDER_LIST, {
@@ -274,7 +278,7 @@
 					this.hireOrderList.push.apply(this.hireOrderList, data.data.list)
 					this.is_next = data.data.is_next
 				} else {
-					common.simpleToast(resp.data.msg)
+					common.simpleToast(data.msg)
 				}
 			},
 			bindHireOrderList() {

pages/orderStatus/orderStatus.css

@@ -457,8 +457,8 @@
 	padding: 0 20rpx;
 	/* padding-top: 24rpx;
 	padding-bottom: 24rpx; */
-	margin-right: 20rpx;
 	text-align: center;
+	margin-left: 20rpx;
 }
 
 .w_224{
@@ -488,6 +488,7 @@
 	/* padding-top: 24rpx;
 	padding-bottom: 24rpx; */
 	text-align: center;
+	margin-left: 10rpx;
 }
 .sesame-btn-s {
 	color: #ffffff;
@@ -578,8 +579,14 @@
 	background-color: #ffffff;
 	padding: 24rpx 32rpx 28rpx;
 	width: 100%;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	padding-bottom: env(safe-area-inset-bottom);
+}
+.inset-bottom{
+	height: calc(150rpx + env(safe-area-inset-bottom));
 }
-	
 .pay_line {
 	height: 2rpx;
 	background: #EAEAEA;

pages/orderStatus/orderStatus.vue

@@ -204,27 +204,43 @@
 				<view>逾期后及时续租不收取逾期费，逾期时长将从续租订单的用车时间中抵扣</view>
 			</view>
 		</view>
-		<!-- 考虑为空的情况 -->
+		
+		
+		
+		<view class="inset-bottom"></view>
 		<view class="payment-info flex-row flex-between">
-			<view v-if="orderInfo.order_status == 1 || orderInfo.pay_status == 5" class="flex-row"> <!-- 待取车 -->
+			<view>
+				<view v-if="(orderInfo.order_status == 1 || orderInfo.pay_status == 5) && orderInfo.order_type != 3" class="cancel" @tap="clickCancel">结束订单</view>
+			</view>
+			<view class="flex-row">
+				<view v-if="orderInfo.order_status == 1" @tap="navToScan" class="sesame-btn ">扫码绑定</view>
+				<view v-if="orderInfo.order_status == 2" @tap="navToScan" class="sesame-btn ">去上传</view>
+				<view v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5" @tap="tapReturnCar" class="deposit-btn">到店还车</view>
+				<view v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"  @tap="bindRenew" class="sesame-btn">续租</view>
+				<view @tap="callStorePhone" class="deposit-btn ">联系门店</view>
+			</view>
+		</view>
+		
+		<!-- <view class="payment-info flex-row flex-between">
+			<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 v-if="orderInfo.order_status == 1" class="flex-row"> 
 				<view @tap="callStorePhone" class="deposit-btn ">联系门店</view>
 				<view @tap="navToScan" class="sesame-btn ">扫码绑定</view>
 			</view>
 
-			<view v-if="orderInfo.order_status == 2" class="flex-row"> <!-- 待取车 -->
+			<view v-if="orderInfo.order_status == 2" class="flex-row">
 				<view @tap="callStorePhone" class="deposit-btn ">联系门店</view>
 				<view @tap="navToScan" class="sesame-btn ">去上传</view>
 			</view>
 
 			<view
 				v-else-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"
-				class="flex-row"> <!-- 使用中 -->
+				class="flex-row"> 
 				<view @tap="callStorePhone" class="cancel">联系门店</view>
 				<view @tap="tapReturnCar" class="deposit-btn">到店还车</view>
 				<view @tap="bindRenew" class="sesame-btn">续租</view>
@@ -232,13 +248,13 @@
 
 			<view v-else-if="orderInfo.order_status == 5||orderInfo.order_status == 6" @tap="callStorePhone"
 				class="pay-btn">
-				联系门店</view> <!-- 待门店确认||还车中,等待门店取车 -->
+				联系门店</view> 
 			<view v-else-if="orderInfo.order_status == 7" @tap="callStorePhone" class="pay-btn">联系门店</view>
-			<!--车辆已归还 已完成 -->
+			
 
 			<view v-if="orderInfo.order_type == 3 && (orderInfo.order_status == 3||orderInfo.order_status == 4)"
 				@tap="callStorePhone" class="pay-btn">联系门店</view>
-		</view>
+		</view> -->
 
 		<view v-if="isShowCancel" class="cancel-b">
 			<view class="cancel-box">
@@ -378,6 +394,7 @@
 							...this.car_detail,
 							price: this.price
 						}
+						resp.data.data.model_images = resp.data.data.model_images.spilt(',')[0]
 						me.setData({
 							car_detail: resp.data.data,
 							params: {
@@ -409,7 +426,7 @@
 						return false
 					}
 				} else {
-					common.simpleToast(resp.data.msg)
+					common.simpleToast('请扫描正确的二维码！')
 					return false
 				}
 				return false
@@ -423,7 +440,7 @@
 					});
 					if (res[0]) return
 					car_sn = res[1].result
-					if(!this.carDetFn(car_sn)) return
+					if(!await this.carDetFn(car_sn)) return
 				}
 				uni.navigateTo({
 					url: `/pages/activation/activation?model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${car_sn}`

pages/service/components/carRentalList/carRentalList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<block>
-			<view :class='{"active" : activeMarkersId == item.id}' class="store-card" v-if="item.admin_id"  @click.stop="navToStore(item.admin_id)" v-for="(item, index) in near_store_list" :key="index">
+			<view :class='{"active" : activeMarkersId == item.id}' class="store-card" v-if="item.admin_id"  @click="navToStore(item.admin_id)" v-for="(item, index) in near_store_list" :key="index">
 				<view>
 					<view class="card-top-style flex-row flex-between">
 						<view class="shop_name">{{item.shop_name}}</view>
@@ -18,7 +18,7 @@
 					</view>
 				</view>
 				<view v-if="item.model_list.length===1">
-					<view class="card-bottom card-first flex-row">
+					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${item.model_list[0].model_id}`)" class="card-bottom card-first flex-row">
 						<view class="second-view flex-row">
 							<view>
 								<image :src="item.model_list[0]!=''?item.model_list[0].model_images:'https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj'" mode="aspectFill"></image>