bug

pages/activation/activation.vue

@@ -265,8 +265,9 @@
 				})
 				if (data.code == 200) {
 					this.shopList = data.data
-					if(this.shopList.flk_hire_return_car_img.length < this.shopList.share_car_max_user_num){
-						let num = this.shopList.share_car_max_user_num - this.shopList.flk_hire_return_car_img.length
+					data.data.flk_hire_car_img_num = Number(data.data.flk_hire_car_img_num)
+					if(this.shopList.flk_hire_return_car_img.length < this.shopList.flk_hire_car_img_num){
+						let num = this.shopList.flk_hire_car_img_num - this.shopList.flk_hire_return_car_img.length
 						for (let i = 0; i < num; i++) {
 							this.shopList.flk_hire_return_car_img.push({
 								url:"",
@@ -276,9 +277,9 @@
 							
 						}
 					}
-					if(this.shopList.flk_hire_return_car_img.length > this.shopList.share_car_max_user_num){
+					if(this.shopList.flk_hire_return_car_img.length > this.shopList.flk_hire_car_img_num){
 						let flk_hire_return_car_img = []
-						for (let i = 0; i < this.shopList.share_car_max_user_num; i++) {
+						for (let i = 0; i < this.shopList.flk_hire_car_img_num; i++) {
 							let item = this.shopList.flk_hire_return_car_img[i]
 							this.shopList.flk_hire_return_car_img.push(item)
 						}

pages/carDetail/carDetail.vue

@@ -110,6 +110,7 @@
 	export default {
 		data() {
 			return {
+				shop_type:0,
 				recommend_id: '',
 				car_detail: {},
 				showCarPlan: false,
@@ -130,6 +131,8 @@
 				this.locationFn()
 			}
 			if (options.shop_type) {
+				console.log(options.shop_type,99999999)
+				this.shop_type = options.shop_type
 				const d = {
 					hire_duration_unit:options.shop_type,
 					hire_price:Number(options.hire_price)
@@ -163,6 +166,16 @@
 							car_detail: resp.data.data,
 							// price: ((resp.data.data.rental_setting[0]?.hire_price || 0) / 100).toFixed(2)
 						})
+						if(!me.shop_type){
+							resp.data.data.rental_setting.map((item,index)=>{
+								if(index === 0){
+									me.tapSelectType({
+										hire_duration_unit:item.hire_duration_unit,
+										hire_price:Number(item.hire_price),
+									})
+								}
+							})
+						}
 					} else {
 						common.simpleToast(resp.data.msg);
 					}
@@ -173,6 +186,9 @@
 					hire_duration_unit,
 					hire_price
 				} = e
+				console.log(66666666)
+				console.log(hire_price)
+				console.log(hire_duration_unit)
 				this.setData({
 					selectType: hire_duration_unit,
 					price: (hire_price / 100).toFixed(2)

pages/index/index.css

@@ -163,7 +163,7 @@
 	border-image: linear-gradient(90deg, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0.1)) 3 3;
 	height: 100rpx;
 	align-items: center;
-	margin: 40rpx rpx;
+	margin: 40rpx 20rpx;
 	padding: 0 24rpx;
 }
 .overdue-view-text{

pages/index/index.vue

@@ -197,6 +197,11 @@
 	let bluetooth = require('@/common/bluetooth.js');
 
 	export default {
+		watch: {
+			'car_info.sar_sn'(newValue, oldValue) {
+				
+			}
+		},
 		data() {
 			return {
 				orderInfo:{},
@@ -293,6 +298,10 @@
 			// #endif
 
 		},
+		
+		onHide(){
+			this.clearIntervalTimer()
+		},
 
 		// 分享给好友
 		onShareAppMessage: function(res) { //发送给朋友
@@ -321,6 +330,11 @@
 				this.newsNumFn()
 				this.isLogin = true
 				this.loadUserCarList()
+				// if(!this.time){
+				// 	this.time = setInterval(()=>{
+				// 		this.loadUserCarList()
+				// 	},5000)
+				// }
 				// #ifdef APP
 					//蓝牙配对所需权限  运行小程序需要隐藏
 					// const permissionArr = permision.requestAndroidPermissions(this.platform)
@@ -503,12 +517,7 @@
 							this.isOverdueShow = false
 						}
 						console.log('this.time',this.time);
-						if(!this.time){
-							console.log(1111);
-							this.time = setInterval(()=>{
-								this.loadCarDetail(car_sn)
-							},5000)
-						}
+						
 					} else {
 						// common.simpleToast(resp.data.msg);
 					}

pages/message/index.vue

@@ -113,7 +113,6 @@
 					car_id: item.car_id,
 					msg_id: item.id
 				})
-
 				uni.navigateTo({
 					url: `/pages/message/detail?id=${item.car_id}`
 				})

pages/orderStatus/orderStatus.vue

@@ -973,7 +973,7 @@
 							tradeNO: resp.data.data.trade_no,
 							success: function(res) {
 								if (res.resultCode == 9000) {
-									common.simpleToast(this.$t('支付成功'));
+									common.simpleToast(me.$t('支付成功'));
 								}
 								setTimeout(function() {
 									me.bindOrderInfo()

pages/purchaseOrder/purchaseOrder.vue

@@ -341,7 +341,7 @@
 					uni.hideLoading();
 					if (resp.data.code === 200) {
 						if (!resp.data.data.need_pay) {
-							common.simpleToast(this.$t('支付成功'));
+							common.simpleToast(me.$t('支付成功'));
 							me.order_sn = resp.data.data.order_sn;
 							me.sub_sn = resp.data.data.sub_sn;
 							me.setData({

pages/service/service.vue

@@ -305,7 +305,6 @@
 					common.simpleToast(data.msg);
 				}
 			},
-
 			getLocationPostion(centerLocation, markers) {
 				const locationData = {
 					longitude: centerLocation.longitude,

utils/gyq_utils.js

@@ -26,7 +26,7 @@ async function location() {
 }
 
 function htmlData(str){
-	return str.replace(/\<img/gi, '<img style="width:100%;height:auto;display:block" ')
+	return str.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
 }
 
 

utils/util.js

@@ -2,10 +2,7 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration);
 const systemInfo = uni.getSystemInfoSync();
-console.log(systemInfo.language)
-
- // const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
- const Language ='zh' // 'zh' | 'en'
+ const Language = (systemInfo.language == 'zh-CN' || systemInfo.language == 'zh_CN') ? 'zh' : 'en' // 'zh' | 'en'
 const formatTime = (date) => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;