bug修改

.hbuilderx/launch.json

@@ -20,7 +20,7 @@
         },
         {
             "openVueDevtools" : false,
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         },
         {

component/allPrice/allPrice.vue

@@ -2,7 +2,7 @@
 	<view class="container flex-row">
 		<view>￥</view>
 		<view class="integer-part">{{integerPart}}</view>
-		<view>{{decimalPart}}</view>
+		<view style="font-size: 32rpx;">{{decimalPart}}</view>
 	</view>
 </template>
 

component/scanCabBtn/scanBtn.vue

@@ -246,11 +246,12 @@
 				uni.showLoading({
 					title:' 加载中...'
 				})
+				uni.hideLoading()
 				let res = await uni.scanCode({
 					onlyFromCamera: true,
 					scanType: ['qrCode'],
 				});
-				uni.hideLoading()
+				
 				var cabinet_dev_id = '';
 				if(res[0]) return
 				res = res[1]

locale/zh.json

@@ -54,7 +54,7 @@
 	"重置密码邮件已发送":"重置密码邮件已发送",
 	"我知道了":"我知道了",
 	"请输入有效的邮箱地址":"请输入有效的邮箱地址",
-	"欢迎来到智寻出行":"欢迎来到智寻出行",
+	"欢迎来到FRANCO MORINI":"欢迎来到FRANCO MORINI",
 	"请输入邮箱账号":"请输入邮箱账号",
 	"请输入密码":"请输入密码",
 	"已阅读并同意":"已阅读并同意",

pages/carList/carList.vue

@@ -5,7 +5,7 @@
 		<view v-for="(item,index) of carList" :key="index" @click="clickItem(item)"  :class="['car-list-card',  car_info.car_sn == item.car_sn?'car-list-card-i' :'']">
 		    <view class="flex-row">
 		    	<view class="car-name" :class="{ 'car-name-i' : car_info.car_sn == item.car_sn}">{{item.car_name}}</view>
-		    	<view class="car-name1">{{item.car_sn}}</view>
+		    	<!-- <view class="car-name1">{{item.car_sn}}</view> -->
 		    </view>
 			<image v-if="car_info.car_sn == item.car_sn && isNearLockCheck" class="icon" src="/static/resource/images/gyq_ly.png" mode=""></image>
 			<!-- https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX -->

pages/loginRegister/login.vue

@@ -2,7 +2,7 @@
     <view class="zx-page-linear login-page">
 		<navBar type="login" left="0" bgColor="transparent"></navBar>
       <view class="title-wrap">
-        <view class="title">{{ $t('欢迎来到智寻出行') }}</view>
+        <view class="title">{{ $t('欢迎来到FRANCO MORINI') }}</view>
         <view class="sub-title">{{ $t('邮箱密码登录') }}</view>
       </view>
       <view class="main">

pages/my/my.vue

@@ -109,7 +109,7 @@ var request = require('@/common/request.js');
 					{
 						name: `${lang('意见反馈')}`,
 						url: '/pages/feedback/index',
-						icon: 'FnSjwcN7Mcpa-WA7Cqx2cGTvX2V1'
+						icon: 'Fh1tuCqkBQ1A20WTsiizSR9w4tQ4'
 					},
 					//   { name: `${lang('关于我们')}`, url: '/pages/bluetoothUnlock/unlockSet', icon: 'Fmin1_DG6ZkENCdsI1qJZJpDNkhQ' },
 					{

pages/openCabinet/openCabinet.css

@@ -110,4 +110,5 @@
 	font-weight: 500;
 	font-size: 32rpx;
 	color: #FFFFFF;
+	width: 100%;
 }

pages/order/order.vue

@@ -191,6 +191,7 @@
 						text: '租车购车'
 					}
 				],
+				start_id:0,
 				page: 1,
 				limit: 10,
 				status: '-1',
@@ -257,7 +258,7 @@
 		 * 页面下拉触底事件的处理函数
 		 */
 		onPullDownRefresh() {
-			this.page = 1
+			this.start_id
 			if (this.selectOrderType == 0) {
 				this.bindExchangeOrderFn()
 			} else if (this.selectOrderType == 1) {
@@ -284,15 +285,18 @@
 				return getRemainingTime(start, end)
 			},
 			async bindExchangeOrderFn() {
+				let me = this
 				let {
 					data
 				} = await request.postApi(config_gyq.API_FLK_EXCHANGE_PACKAGE_ORDER_LIST, {
 					pay_status: -1,
 					car_sn: '',
+					start_id:me.start_id,
 					page: this.page,
 					limit: this.limit,
 				})
 				if (data.code == 200) {
+					me.start_id = data.data.start_id
 					this.hireOrderList.push.apply(this.hireOrderList, data.data.list)
 					this.is_next = data.data.is_next
 				} else {
@@ -304,11 +308,13 @@
 				http.postApi(config.API_FLK_ORDER_LIST, {
 					page: me.page,
 					limit: me.limit,
+					start_id:me.start_id,
 					// status: me.status,
 					// sort_time: me.sort_time,
 					// sort_num: me.sort_num
 				}, (resp) => {
 					if (resp.data.code === 200) {
+						me.start_id = resp.data.data.start_id
 						me.hireOrderList.push.apply(me.hireOrderList, resp.data.data.list)
 						me.is_next = resp.data.data.is_next
 						if (me.hireOrderList.length > 0) {

pages/orderStatus/orderStatus.css

@@ -588,7 +588,7 @@
 	position: fixed;
 	left: 0;
 	bottom: 0;
-	padding-bottom: env(safe-area-inset-bottom);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
 }
 .inset-bottom{
 	height: calc(150rpx + env(safe-area-inset-bottom));

pages/service/service.vue

@@ -199,7 +199,7 @@
 			},
 
 
-			async locationFn() {
+			 locationFn() {
 				let _this = this
 				if (this.selectType === "store") {
 					this.loadCarRentalList();
@@ -248,6 +248,7 @@
 									.longitude, this
 									.myLocation.latitude, element.longitude, element.latitude))
 								let model_list = []
+								
 								for (let y = 0; y < element.model_list.length; y++) {
 									let item = element.model_list[y];
 										item.model_images = item.model_images.split(',')[0] || ''
@@ -442,8 +443,6 @@
 			loadModelType() {
 				const me = this
 				http.postApi(config.API_NEAR_BATTERY_TYPE_LIST, {}, (resp) => {
-					console.log(99999)
-					console.log(resp.data.data.list)
 					if (resp.data.code === 200) {
 						me.setData({
 							modelTypeList: resp.data.data.list

pages/travelingTrack/travelingTrack.vue

@@ -114,22 +114,21 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad(options) {
-			console.log(uni.getStorageSync('car_info'))
 			this.carInfo = uni.getStorageSync('car_info')
 			this.plate_number = options.plate_number
 			const me = this
 			// common.loading();
-			const storedLocation = uni.getStorageSync('user_current_location');
-			if (storedLocation.longitude && storedLocation.latitude) {
-				// 如果本地有存储的定位信息，则直接使用
-				this.setData({
-					myLocation: storedLocation
-				})
-				// this.loadTrackInfo()
-			} else {
-				this.getLocationAndSave();
-			}
-			// this.init()
+			// const storedLocation = uni.getStorageSync('user_current_location');
+			// if (storedLocation.longitude && storedLocation.latitude) {
+			// 	// 如果本地有存储的定位信息，则直接使用
+			// 	this.setData({
+			// 		myLocation: storedLocation
+			// 	})
+			// 	// this.loadTrackInfo()
+			// } else {
+			// 	this.getLocationAndSave();
+			// }
+			this.init()
 		},
 		/**
 		 * 生命周期函数--监听页面显示