Merge branch 'gyq_test' into lw_test

common/config.js

@@ -54,7 +54,7 @@ var config = {
 	API_DAYHIRE_USER_SHOP_MODEL_LIST: api_web_url + '?r=dayhire/user/shop-model-list', //门店列表
 	API_DAYHIRE_USER_SHOP_INFO: api_web_url + '?r=dayhire/user/shop-info', //门店详情
 	API_DAYHIRE_REPORT_REPORT_TYPE: api_web_url + '?r=dayhire/report/report-type', //问题反馈列表
-	API_DAYHIRE_REPORT_REPORT: api_web_url + '?r=dayhire/report/report', //提交问题反馈
+	API_DAYHIRE_REPORT_REPORT: api_web_url + '?r=flk/index/report', //提交问题反馈
 	API_DAYHIRE_USER_NEAR_RETURN_SHOP: api_web_url + '?r=dayhire/user/return-shop', //附近可还车门店列表
 	API_DAYHIRE_CAR_TRACK_INFO: api_web_url + '?r=dayhire/car/track-info', //轨迹信息
 	API_DAYHIRE_CAR_LOCATION: api_web_url + '?r=dayhire/car/location', //车辆当前位置

common/constant.js

@@ -18,8 +18,8 @@ export const LEASE_TYPE_ARR = [
 	{ label: '日租', value: LEASE_TYPE.day, type: 'day', unit: '天' ,sort:3},
 	{ label: '月租', value: LEASE_TYPE.month, type: 'month', unit: '月' ,sort:5},
 	{ label: '年租', value: LEASE_TYPE.year, type: 'year', unit: '年' ,sort:7},
-	{ label: '时租', value: LEASE_TYPE.hour, type: 'hour', unit: '时',sort:2 },
-	{ label: '分租', value: LEASE_TYPE.minute, type: 'minute', unit: '分',sort:1 },
+	{ label: '时租', value: LEASE_TYPE.hour, type: 'hour', unit: '小时',sort:2 },
+	{ label: '分租', value: LEASE_TYPE.minute, type: 'minute', unit: '分钟',sort:1 },
 	{ label: '周租', value: LEASE_TYPE.week, type: 'week', unit: '周' ,sort:4},
 	{ label: '季租', value: LEASE_TYPE.quarter, type: 'quarter', unit: '季',sort:6 },
 	{ label: '购买', value: LEASE_TYPE.buy, type: 'buy', unit: '买' ,sort:8}

common/http.js

@@ -125,6 +125,7 @@ function postRequest(url, data, successCallBack, failCallBack) {
 				return
 			} else {
 				uni.showToast({ title: res.data.msg, icon: 'none' })
+				return
 			}
 			if (_checkTokenValid(res)) {
 				successCallBack(res);

common/request.js

@@ -76,6 +76,7 @@ async function getRequest(url, data) {
 	 }
 	 if(res.data.code === 503){
 	 	throw Error(res.data.msg);
+		return
 	 }
 	if (_checkTokenValid(res)) {
 		return res

common/storage.js

@@ -198,7 +198,10 @@ function setUserCurrentLocation(
 }
 
 function getUserCurrentLocation() {
-	return uni.getStorageSync(USER_CURRENT_LOCATION);
+	return uni.getStorageSync(USER_CURRENT_LOCATION) || {
+		longitude: 115.853024,
+		latitude: 28.686280
+	};
 }
 
 

component/carPlan/carPlan.vue

@@ -2,7 +2,9 @@
 	<view  class="show-more">
 		<view class="more-info">
 			<view class="flex-row model-title">
-				<view style="margin-right: 24rpx;"><img style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="params.image" alt=""></view>
+				<view style="margin-right: 24rpx;">
+					<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="image" mode="aspectFill"></image>
+					</view>
 				<view class="car-model-detail flex-row">
 					<!-- <priceTool :price="58" :font_size="40"/> -->
 					<allPrice :amount="((priceAll || 0)/100)"/>
@@ -12,20 +14,14 @@
 					</view>
 					
 					<view v-if="type!=100" class="car-model-price-view">
-						<text style="margin-right: 12rpx;">已选择{{priceAll}}</text>
+						<text>已选择</text>
 						<text>{{leaseUnitsResult}}</text>
-						<text>时长 {{count}} 
-							<text v-if="type==1">日</text>
-							<text v-if="type==2">月</text>
-							<text v-if="type==3">年</text>
-							<text v-if="type==4">时</text>
-							<text v-if="type==5">分</text>
-							<text v-if="type==6">周</text>
-							<text v-if="type==7">季</text>
+						<text style="margin-left: 12rpx;">时长 {{count}} 
+							<text>{{leaseUnits}}</text>
 						</text>
-						<text>共计{{tools.countToDay(count,type)}}天</text>
+						<!-- <text>共计{{tools.countToDay(count,type)}}天</text> -->
 					</view>
-					<view class="car-model-tip">现车 随时可到店提车</view>
+					<view style="margin-top: 10rpx;" class="car-model-tip">现车 随时可到店提车</view>
 				</view>
 				<view class="close-img">
 					<image style="width: 24rpx;height: 24rpx;" @tap="closeShowMore"
@@ -50,7 +46,7 @@
 						<view :class="(type == item.hire_duration_unit ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{item.hire_price/100}}</text></view>
 					</view>
 					
-					<view  @click="tapSelectType({hire_duration_unit:100,hire_price:params.sell_price})" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" >
+					<view v-if="params.sell_price != 0"  @click="tapSelectType({hire_duration_unit:100,hire_price:params.sell_price})" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" >
 						<view :class="(type == 100 ? 'car-plan-unit-i' : 'car-plan-unit') ">购买</view>
 						<view :class="(type == 100 ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{params.sell_price/100}}</text></view>
 					</view>
@@ -72,9 +68,9 @@
 					<view class="quantity-count flex-row flex-between">
 						<view class="total-time flex-row">
 							 共 
-							<view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,type)}}</view>
+							<view style="font-weight: 600;margin: 0 10rpx;">{{count}}</view>
 							<!-- <view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,isSelectStatus)}}</view> -->
-							<text>天</text>
+							<text>{{leaseUnits}}</text>
 						</view>
 						<!-- <view class="count-btn fbtn" @tap.stop.prevent="bindMinus">-</view> -->
 						<view @tap.stop.prevent="bindMinus"><img class="count-btn fbtn"
@@ -118,6 +114,7 @@
 	export default {
 		data() {
 			return {
+				image:'',
 				orderInfo:{},
 				isShowToBuy:false,
 				priceAll:0,
@@ -129,8 +126,12 @@
 		},
 		computed: {
 			leaseUnitsResult() {
-				const result = LEASE_TYPE_ARR.find(v => v.value == this.params.rentalType);
+				const result = LEASE_TYPE_ARR.find(v => v.value == this.type);
       			return result ? result.label : '';
+			},
+			leaseUnits(){
+				const result = LEASE_TYPE_ARR.find(v => v.value == this.type);
+				return result ? result.unit : '';
 			}
 		},
 		/**
@@ -151,6 +152,8 @@
 			PayTypeModel,
 		},
 		mounted() {
+			this.params.image =  this.params.model_images[0]
+			this.image = this.params.image ? this.params.image : this.params?.model_images[0] ? this.params.model_images[0] : "" 
 			this.type = this.selectType
 			this.tapSelectType({hire_duration_unit:this.selectType,hire_price:this.params.price*100})
 		},

component/customTabbar/index.vue

@@ -1,14 +1,14 @@
 <template>
-	<view class="" >
+	<view class="">
 		<view style="height: 148rpx;"></view>
-		<view class="tabbar-wrap"  >
+		<view class="tabbar-wrap">
 			<view class="tabbar">
 				<view v-for="(item, index) in tabs" :key="index" class="tab-item" @tap="routerPush(item.url)">
 					<image :src="curtTab === item.name ? item.activeIcon : item.icon" class="tab-icon"></image>
 					<text :class="['base-text', curtTab === item.name && 'checked']">{{ item.label }}</text>
 				</view>
 				<view v-if="!isScanCondeRentalCar" class="center-entrance" @tap="navToInputPages">
-		
+
 					<image src="https://qiniu.bms16.com/Fm_kDVr1TIeIbbBW6-5bz0r-cECO"
 						style="width: 122rpx; height: 122rpx;"></image>
 					<!-- <img src="https://qiniu.bms16.com/FhCHLz8rQJ5mpJ6nUA4RbKiVkUOo" style="width: 120rpx; height: 24rpx;"/> -->
@@ -109,45 +109,55 @@
 				})
 			},
 			loadGeneralQRData(options) {
-				if (('q' in options) || ('result' in options) && (options.result.indexOf(
-							"https://zx.uwenya.cc/xcx/s") != -
-						1)) {
-					var url = ''
-					if ('q' in options) {
-						url = decodeURIComponent(options.q);
-					}
-					if ('result' in options) {
-						url = options.result
-					}
-					var obj = this.getUrlParams(url)
-					if (('t' in obj) && ('d' in obj)) {
-						if (obj.t == 1 || obj.t == 2 || obj.t == 5 || obj.t == 4) {
-							uni.navigateTo({
-								url: '/pages/cabinetDetail/cabinetDetail?dev_id=' + obj.d + '&type=' +
-									obj.t,
-							})
-							return 101
-						}
-						if (obj.t == 10) {
-							this.navToInputPage(obj.d)
-							return 106
-						}
-					}
-
+				let objOpt = this.$paramsObj(options)
+				if (objOpt.d) {
+					console.log('扫码的是机柜')
+					uni.navigateTo({
+						url: `/pages/cabinetDetail/cabinetDetail?dev_id=${objOpt.d}`,
+					})
+					return
+				} else {
+					console.log('扫码的是车辆')
+					this.navToInputPage(options)
+					return
 				}
+				// if (options.indexOf("https://zx.uwenya.cc/xcx/s") != -1) {
+				// 			console.log('跑进来了')
+				// 	var url = ''
+				// 	if ('q' in options) {
+				// 		url = decodeURIComponent(options.q);
+				// 	}
+				// 	if ('result' in options) {
+				// 		url = options.result
+				// 	}
+				// 	var obj = this.getUrlParams(url)
+				// 	if (('t' in obj) && ('d' in obj)) {
+				// 		if (obj.t == 1 || obj.t == 2 || obj.t == 5 || obj.t == 4) {
+				// 			uni.navigateTo({
+				// 				url: '/pages/cabinetDetail/cabinetDetail?dev_id=' + obj.d + '&type=' +
+				// 					obj.t,
+				// 			})
+				// 			return 101
+				// 		}
+				// 		if (obj.t == 10) {
+
+				// 			return 106
+				// 		}
+				// 	}
+
+				// }else{
+
+				// }
 			},
 			async navToInputPage(car_sn) {
 				const me = this
-				const {
-					userInfo = ''
-				} = storage.getUserInfoData()
+				const userInfo = storage.getUserInfoData()
+				console.log(userInfo)
+				console.log(car_sn)
 				if (userInfo.status - 0 == 2) {
+					var location = uni.getStorageSync('user_current_location')
 					const params = await this._getParams()
-					// var plate_number = params.carList.length != 0 && params.carList[0].license_plate_number ? params
-					// 	.carList[0].license_plate_number : me.plate_number
-					
 					if (params.carList.length == 0) {
-						var location = uni.getStorageSync('user_current_location')
 						me.loadScanCode(location, car_sn)
 					} else {
 						if (params.order_status) {
@@ -161,38 +171,40 @@
 										uni.navigateTo({
 											url: '/pages/orderStatus/orderStatus'
 										});
+									} else {
+										me.loadScanCode(location, car_sn)
 									}
 								}
 							})
-							
+
 						}
 					}
+				} else {
+					this.$msg('用户异常')
 				}
 			},
 
-			loadScanCode(location, battery_sn) {
-				const pData = {
-					longitude: location.longitude,
-					latitude: location.latitude,
-					battery_sn: battery_sn
-				}
+			loadScanCode(location, car_sn) {
 				const me = this
-				http.postApi(config.API_FLK_CAR_DETAIL, pData, (resp) => {
+				http.postApi(config.API_FLK_CAR_DETAIL, {car_sn}, (resp) => {
 					uni.hideLoading()
 					if (resp.data.code === 200) {
-						if (resp.data.data.online === 0 || isOffline) {
-							common.simpleToast('此车辆已离线，请选择其他车辆')
-						} else {
-							if (resp.data.data.is_mine) {
-								//直接切换当前扫码的车辆
-								uni.setStorageSync('car_info', resp.data.data);
-								me.$emit('changCar',resp.data.data)
-								return
-							} else {
-								common.simpleToast('此车辆正在被使用！')
-								return
-							}
+						console.log(resp.data.data)
+						// if (resp.data.data.online === 0) {
+						// 	common.simpleToast('此车辆已离线，请选择其他车辆')
+						// 	return
+						// }
+						if (resp.data.data.is_mine) {
+							//直接切换当前扫码的车辆
+							uni.setStorageSync('car_info', resp.data.data);
+							me.$emit('changCar', resp.data.data)
+							common.simpleToast('已切换当前车辆！')
+							return
 						}
+						uni.navigateTo({
+							url: `/pages/carDetail/carDetail?model_id=${resp.data.data.model_id}`
+						});
+						return
 					} else {
 						common.simpleToast(resp.data.msg)
 					}
@@ -255,7 +267,7 @@
 <style scoped>
 	.tabbar-wrap {
 		position: fixed;
-		bottom:0rpx;
+		bottom: 0rpx;
 		left: 0;
 		right: 0;
 		/* border-bottom: env(safe-area-inset-bottom) solid #fff; */

component/scanCabBtn/scanBtn.css

@@ -451,15 +451,15 @@
 }
 
 .refund-btn{
-	width: 334rpx;
+	width:680rpx;
 	height: 80rpx;
-	background: #E5F1FF;
+	margin: auto;
+	background: #060809;
 	text-align: center;
 	border-radius: 40rpx;
 	font-weight: 500;
 	font-size: 32rpx;
-	color: #0074FF;
+	color: #fff;
 	text-align: center;
 	line-height: 80rpx;
-	margin-right: 18rpx;
 }

component/scanCabBtn/scanBtn.vue

@@ -22,7 +22,7 @@
 	var common = require('../../common/common.js');
 	var storage = require('../../common/storage.js')
 	var user = require('../../common/user.js');
-	var bluetooth = require('../../common/bluetooth.js');
+	// var bluetooth = require('../../common/bluetooth.js');
 	// var IndexImpl = require('../../pages/index/model/indexImpl.js');
 	const DF_CAB_INFO_DONE = 10000; //机柜信息传输完成
 	var subscribeTimer = null;
@@ -127,8 +127,8 @@
 			//#ifdef MP-WEIXIN
 			this.payType = 0
 			//#endif
-			bluetooth.initBluetooth()
-			this.bluetoothClose()
+			// bluetooth.initBluetooth()
+			// this.bluetoothClose()
 			// this.loadBatteryInfo()
 			//this.loadExchangeInfo()
 		},
@@ -264,7 +264,7 @@
 					this.scan_dev_id = cabinet_dev_id
 					this.loadNowCabinetDetail(cabinet_dev_id)
 				} else {
-					//common.simpleToast("未找到相应的机柜")
+					common.simpleToast("未找到相应的机柜")
 				}
 				
 			},

main.js

@@ -7,6 +7,7 @@ Polyfill.init();
 
 // 全局mixins，用于实现setData等功能，请勿删除！';
 import Mixin from './polyfill/mixins';
+import mixins from './mixin/index.js';
 import i18n from './locale/index'
 import uView from "uview-ui";
 Vue.use(uView)
@@ -20,11 +21,9 @@ uni.addInterceptor('request', {
 		return false; // 阻止默认弹窗
 	}
 });
-
-// #ifndef VUE3
 import Vue from 'vue';
-
 Vue.mixin(Mixin);
+Vue.mixin(mixins);
 Vue.config.productionTip = false;
 App.mpType = 'app';
 const app = new Vue({
@@ -32,7 +31,6 @@ const app = new Vue({
 	...App
 });
 app.$mount();
-// #endif
 
 // // #ifdef VUE3
 // import { createSSRApp } from 'vue';

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "FRANCO MORINI",
-    "appid" : "__UNI__E67DD80",
+    "appid" : "__UNI__111A022",
     "description" : "",
     "versionName" : "1.3.7",
     "versionCode" : 137,
@@ -27,7 +27,8 @@
             "Barcode" : {},
             "Camera" : {},
             "OAuth" : {},
-            "Contacts" : {}
+            "Contacts" : {},
+            "iBeacon" : {}
         },
         "distribute" : {
             "android" : {

mixin/index.js

@@ -1,116 +1,154 @@
 // mixins/countdownMixin.js
 var bluetooth = require('@/common/bluetooth.js');
-import {getFunctionTag,setFunctionTag} from '@/common/storage.js';
+import {
+	getFunctionTag,
+	setFunctionTag,
+	getUserCurrentLocation
+} from '@/common/storage.js';
 var app = getApp();
 var config = require('@/common/config.js');
 var common = require('@/common/common.js');
 var http = require('@/common/http.js');
 import i18n from '@/locale/index.js'
 export default {
-  data() {
-    return {
-      carOnline: false, 
-	  statusBarHeight:0,
-	  popText:'',
-	  cmdType:'',
-	  popupControlShow:false
-    };
-  },
-   mounted(){
-  	  this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
-  },
-  methods: {
-		tapOpenControl(e){
-			console.log(111);
-			const _carOnline=uni.getStorageSync('car_info').online!=0 //在线
+	data() {
+		return {
+			myLocation:{},
+			carOnline: false,
+			statusBarHeight: 0,
+			popText: '',
+			cmdType: '',
+			popupControlShow: false
+		};
+	},
+	onLoad(){
+		this.myLocation = getUserCurrentLocation()
+		this.locationMixin()
+		this.checkLocationPermission()
+	},
+	mounted() {
+		this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
+	},
+	methods: {
+		async locationMixin(){
+			let data = await this.$location()
+			this.myLocation = {
+				longitude: data.longitude,
+				latitude: data.latitude
+			}
+		},
+		async checkLocationPermission() {
+			let data = await this.$checkLocationPermission()
+			console.log('权限获取')
+			console.log(data)
+		},
+		tapOpenControl(e) {
+			const _carOnline = uni.getStorageSync('car_info').online != 0 //在线
 			console.log(this.popupControlShow);
-			const {name,type}=e
+			const {
+				name,
+				type
+			} = e
 			this.setData({
-				carOnline:_carOnline,
-				popText:name,
-				cmdType:type,
-				popupControlShow:true
+				carOnline: _carOnline,
+				popText: name,
+				cmdType: type,
+				popupControlShow: true
 			})
 			console.log(this.popupControlShow);
 		},
-		changClick(tab){
-			const typeArr=['tirePressure','batteryInfo','navigation']
-			const isOther=typeArr.findIndex(t => t === tab.type)!==-1
-			console.log('isOther',isOther);
-			if(isOther){
-				const {name,type}=tab
+		changClick(tab) {
+			const typeArr = ['tirePressure', 'batteryInfo', 'navigation']
+			const isOther = typeArr.findIndex(t => t === tab.type) !== -1
+			console.log('isOther', isOther);
+			if (isOther) {
+				const {
+					name,
+					type
+				} = tab
 				this.setData({
-					popText:name,
-					cmdType:type,
+					popText: name,
+					cmdType: type,
 				})
 				this.tapBlueToothCmd()
-			}else{
+			} else {
 				this.tapOpenControl(tab)
 			}
 		},
-		closePopup(){
-			this.popupControlShow=false
+		closePopup() {
+			this.popupControlShow = false
 		},
 		tapBlueToothCmd(_,type){
 			const car_info= uni.getStorageSync('car_info');
 			const isCarLocation = type
 			if(this.cmdType=='batteryInfo'){
 				uni.navigateTo({
-					url:`/pages/batteryDetail/batteryDetail`
+					url: `/pages/batteryDetail/batteryDetail`
 				})
-			}else if(this.cmdType=='navigation'){
+			} else if (this.cmdType == 'navigation') {
 				const {
 					address,
 					latitude,
 					longitude,
 					car_name
-				} =car_info
+				} = car_info
 				uni.openLocation({
 					latitude: latitude - 0,
 					longitude: longitude - 0,
 					scale: 15,
 					name: car_name,
 					address: address,
-					success: function (res) {},
+					success: function(res) {},
 				})
 				//获取胎压
-			}else if(this.cmdType=='tirePressure'){
+			} else if (this.cmdType == 'tirePressure') {
 				this.bluetoothCmd()
-			}else{
+			} else {
 				// 判断车辆是否在线状态 true 在线调用接口 不在线提示连接蓝牙
 				if (this.carOnline) {
-					if(this.cmdType=='turnOnOrOff'){
-						const switchType=this.contrilList.find(item => item.isTurnOn)
-						const pData={
-							car_sn:car_info.car_sn,
-							switch:switchType
+					if (this.cmdType == 'turnOnOrOff') {
+						const switchType = this.contrilList.find(item => item.isTurnOn)
+						const pData = {
+							car_sn: car_info.car_sn,
+							switch: switchType
 						}
-						const me=this
+						const me = this
 						common.loading();
 						http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
 							uni.hideLoading();
 							if (resp.data.code === 200) {
 								common.simpleToast(me.popText + '成功');
-								const activeTag=me.contrilList.map(item=>{
-									item.isTurnOn=(item.isTurnOn==1)?0:1
-									item.name=i18n.t((item.isTurnOn==1)?'关机':'开机')
+								const activeTag = me.contrilList.map(item => {
+									item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
+									item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
 									return item
 								})
-								const tag=getFunctionTag().tag
-								setFunctionTag({activeTag,tag})
-								
+								const tag = getFunctionTag().tag
+								setFunctionTag({
+									activeTag,
+									tag
+								})
+
 							} else {
 								common.simpleToast(resp.data.msg);
 							}
 						});
-					}else{
-						const testArr=[
-							{type:'findCar',opt_type:1},
-							{type:'openSeatBag',opt_type:0},
-							{type:'openTailBox',opt_type:2},
-							]
-						const pData = testArr.find(i=>i.type===this.cmdType)
-						const me=this
+					} else {
+						const testArr = [{
+								type: 'findCar',
+								opt_type: 1
+							},
+							{
+								type: 'openSeatBag',
+								opt_type: 0
+							},
+							{
+								type: 'openTailBox',
+								opt_type: 2
+							},
+						]
+						const pData = testArr.find(i => i.type === this.cmdType)
+						const me = this
 						common.loading();
 						http.postApi(config.API_FLK_CAR_REMOTE_CONTROL, pData, (resp) => {
 							uni.hideLoading();
@@ -125,18 +163,18 @@ export default {
 					this.bluetoothCmd(isCarLocation)
 				}
 			}
-			this.popupControlShow=false
+			this.popupControlShow = false
 		},
-		bluetoothCmd(isCarLocation){
-			const me=this
-			const car_info= uni.getStorageSync('car_info');
+		bluetoothCmd(isCarLocation) {
+			const me = this
+			const car_info = uni.getStorageSync('car_info');
 			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
 			const isBluetoothConnect = app.globalData.nearLockCheck
 			if(isBluetoothConnect){
 				const isTurnOn=this.contrilList.find(item => item.isTurnOn).isTurnOn==1
 				console.log(isTurnOn,this.cmdType,this.contrilList);
 				const bluetoothCommands = {
-					'turnOnOrOff': isTurnOn?bluetooth.turnOnCar:bluetooth.turnOffCar,
+					'turnOnOrOff': isTurnOn ? bluetooth.turnOnCar : bluetooth.turnOffCar,
 					'findCar': bluetooth.findCarCmd,
 					'openSeatBag': bluetooth.openCarSeat,
 					'openTailBox': bluetooth.openCarTrunk,
@@ -148,13 +186,13 @@ export default {
 				if (command) {
 					command(car_sn, () => {
 						uni.hideLoading();
-						if(this.cmdType=='openSeatBag'||this.cmdType=='openTailBox'){
+						if (this.cmdType == 'openSeatBag' || this.cmdType == 'openTailBox') {
 							common.simpleToast('操作成功');
 						}
 						console.log(`发送${this.popText}指令结束`);
 					});
 				}
-			}else{
+			} else {
 				uni.showModal({
 					title: '提示',
 					content: '当前车辆处于离线，是否前往开启蓝牙配对操作车辆？',
@@ -166,12 +204,12 @@ export default {
 							console.log(isCarLocation,'test111');
 							if(isCarLocation){
 								uni.switchTab({
-									url:'/pages/index/index'
+									url: '/pages/index/index'
 								})
-							}else{
+							} else {
 								me.$emit('toBluetooth')
 							}
-							
+
 						}
 					},
 					fail: function(res) {},
@@ -180,8 +218,5 @@ export default {
 			}
 		}
 	},
-
- 
-  beforeDestroy() {
-  },
-};
+	beforeDestroy() {},
+};

pages/cabinetDetail/cabinetDetail.vue

@@ -94,8 +94,8 @@
 										:class="(item.fault_reason&&item.fault_reason.length>0)?'namber namber-s':'namber namber-g'">
 										{{item.box_sn}}
 									</view>
-									<view v-if="item.tag_info && item.tag_info.length !== 0" class="tag_type_n">
-										{{item.tag_info[0].main_tag_name ? (item.tag_info[0].main_tag_name) : ''}}{{item.tag_info[0].child_tag_name ? '/' + item.tag_info[0].child_tag_name : ''}}
+									<view v-if="item.tag_info" class="tag_type_n">
+										{{item.tag_info.main_tag_name ? (item.tag_info.main_tag_name) : ''}}{{item.tag_info.child_tag_name ? '/' + item.tag_info.child_tag_name : ''}}
 									</view>
 								</view>
 	
@@ -118,8 +118,8 @@
 								<view class="namber-view flex-row flex-between">
 									<view :class="(item.is_full_soc==1)?'namber namber-b':'namber namber-o'">{{item.box_sn}}
 									</view>
-									<view v-if="item.tag_info && item.tag_info.length !== 0" class="tag_type">
-										{{item.tag_info[0].main_tag_name ? (item.tag_info[0].main_tag_name) : ''}}{{item.tag_info[0].child_tag_name ? '/' + item.tag_info[0].child_tag_name : ''}}
+									<view v-if="item.tag_info" class="tag_type">
+										{{item.tag_info.main_tag_name ? (item.tag_info.main_tag_name) : ''}}{{item.tag_info.child_tag_name ? '/' + item.tag_info.child_tag_name : ''}}
 									</view>
 								</view>
 								<view class="status-img-view flex-row">
@@ -137,9 +137,10 @@
 						<!-- </block> -->
 					</view>
 				</view>
+				<scanBtn :dev_id="dev_id" :listData='listData' :cab_info="cabinetInfo" @refreshCabinet="refreshCabinet"
+					@popPackageModel="clickPopPackageModel" ref="scanRef"></scanBtn>
 			</view>
-			<scanBtn :dev_id="dev_id" :listData='listData' :cab_info="cabinetInfo" @refreshCabinet="refreshCabinet"
-				@popPackageModel="clickPopPackageModel" ref="scanRef"></scanBtn>
+		
 		</view>
 </template>
 
@@ -216,9 +217,9 @@ import progressView from '@/component/progressView/progressView';
 					this.loadCabinetDetail();
 				}
 			} else {
-				this.getLocationAndSave();
+				// this.getLocationAndSave();
 			}
-			bluetooth.initBluetooth()
+			// bluetooth.initBluetooth()
 			
 		},
 		/**

pages/carDetail/carDetail.vue

@@ -34,7 +34,7 @@
 					<text v-if="item.hire_duration_unit==7">季租</text>
 				</view>
 
-				<view @click="tapSelectType({hire_duration_unit:100,hire_price:car_detail.sell_price})"
+				<view v-if="car_detail.sell_price != 0" @click="tapSelectType({hire_duration_unit:100,hire_price:car_detail.sell_price})"
 					:data-select_type="100" :data-price="car_detail.sell_price"
 					:class="['time-unit',selectType==100? 'time-unit-i':'']">购买</view>
 			</view>
@@ -119,10 +119,6 @@
 				car_detail: {},
 				showCarPlan: false,
 				selectType: 1,
-				myLocation: {
-					latitude: 23.099994,
-					longitude: 113.324004,
-				},
 				destance: 0,
 				price: 0,
 				params: {}
@@ -143,12 +139,7 @@
 		},
 		methods: {
 			locationFn() {
-				let _this = this
-				uni.getLocation({
-					success(res) {
-						_this.loadCarInfo(res.longitude, res.latitude)
-					}
-				})
+				this.loadCarInfo(this.myLocation.longitude, this.myLocation.latitude)
 			},
 			loadCarInfo(latitude, longitude) {
 				const me = this
@@ -158,6 +149,7 @@
 					longitude: longitude,
 				}, (resp) => {
 					if (resp.data.code === 200) {
+						// resp.data.data.desc = resp.data.data.desc.replaceAll('/<img\b/gi, '$& style="1"'')
 						me.tapSelectType(resp.data.data.rental_setting[0])
 						resp.data.data.distance = common.formatDistance(Number(resp.data.data.distance))
 						me.setData({

pages/carList/carList.vue

@@ -111,6 +111,9 @@
 					uni.hideLoading();
 					if (resp.data.code === 200) {
 						const carList=resp.data.data.list
+						resp.data.data.list.map(item=>{
+							item.model_images = item.model_images.split(',')[0]
+						})
 						me.setData({
 							carList,
 						})

pages/feedback/index.vue

@@ -166,11 +166,10 @@
 				const imgList = this.imgList.map(item=>{
 					return item.url
 				})
-				const imgs = this.imgList.join(',')
 				const pData = {
 					content: this.content,
-					imgs: imgs,
-					type_id: this.typeId
+					image_list: imgList,
+					type: this.typeId
 				}
 				const that = this
 				http.postApi(config.API_DAYHIRE_REPORT_REPORT, pData, (resp) => {

pages/index/components/unleasedPages/unleasedPages.vue

@@ -46,15 +46,14 @@
 		</view>
 		<view v-else>
 			<view style="margin: 0 50rpx 0rpx;height: 420rpx;">
-				<u-swiper  :list="['https://qiniu.bms16.com/FszIhdxNKutDOxBcfcWP_GWmjyFV']" :autoplay="false" mode="none"
+				<u-swiper  :list="['https://qiniu.bms16.com/Fqf6jeV9PQGeHXkXMHOi_jlPsTme']" :autoplay="false" mode="none"
 					:height="420" bgColor="transparent" class="custom-swiper">
 				</u-swiper>
 			</view>
-		
 			<view class="car-model-step">
 				<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="recommend-car-name w_100 text-center">全新车型，即将发布！</view>
+					<view class="recommend-car-tip w_100 text-center line2">更智能、更高效，全新车型即将亮相，敬请期待！</view>
 					<!-- <view class="car-speed-view">
 						<view class="car-speed">72 <text class="company">km</text></view>
 						<text>全速续航</text>
@@ -64,12 +63,12 @@
 						<text>极速可达</text>
 					</view> -->
 				</view>
-				<!-- <view class="flex-row" @tap="navCarDetail" style="justify-content: center;">
+				<view class="flex-row" @tap="navCarDetail" style="justify-content: center;">
 					<view class="more-btn flex-row">
 						<view class="more-btn-text">了解更多</view>
 						<img class="more-btn-img" src="https://qiniu.bms16.com/Fi2Lg800Mc1MhCnvHT1DkvOEdJB1" alt="">
 					</view>
-				</view> -->
+				</view>
 				<view class="flex-row flex-around">
 					<view @tap="navCarDetail" class="lease-btn">租赁设备</view>
 					<view class="binding-btn">绑定设备</view>

pages/index/index.vue

@@ -1,18 +1,18 @@
 <template>
 	<view>
 		<!-- #ifdef APP -->
-		<u-no-network  zIndex='9999' @retry='retry'></u-no-network>
+		<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="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>
@@ -20,7 +20,9 @@
 								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>
+							<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>
@@ -45,11 +47,12 @@
 						<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>
+							<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 style="font-size: 36rpx;">{{formatDistance(car_info.endurance) }}<text
+										style="font-size: 30rpx;">{{car_info.endurance>1000?'km':'m'}}</text></view>
 							</view>
 						</view>
 						<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
@@ -76,10 +79,12 @@
 											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;"
+									<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 class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text>
+								</view>
 							</view>
 			
 							<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time" class="card-bg">
@@ -95,7 +100,8 @@
 								<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>
+									{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text
+										class="font_24">{{$t("次")}}</text>
 								</view>
 							</view>
 						</view>
@@ -106,9 +112,11 @@
 									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="flex-row tip-text-config">{{isBluethConnect?$t("蓝牙配对成功"):$t("请先连接蓝牙")}}
+								</view>
 							</view>
-							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
+							<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">
@@ -118,7 +126,8 @@
 								<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="">
+							<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"
@@ -127,7 +136,8 @@
 								<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="">
+							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm"
+								alt="">
 						</view>
 					</view>
 					<view style="height: 264rpx;"></view>
@@ -137,9 +147,11 @@
 				<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')" />
+			<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>
@@ -169,9 +181,9 @@
 	export default {
 		data() {
 			return {
-				isModel:false,
-				isConnected:false,
-				statusBarHeight:0,
+				isModel: false,
+				isConnected: false,
+				statusBarHeight: 0,
 				newsList: {},
 				img_list: [],
 				isLogin: false,
@@ -187,11 +199,11 @@
 						activity_time: 0
 					}
 				},
-				platform:'android',//手机型号
-				isShowPermission:false,//是否打开权限弹窗
-				statusBarHeight:0,
-				isBluethConnect:false, //当前是否蓝牙连接或者配对
-				isOpenAllPermission:false,//所有蓝牙配对所需权限是否已开启
+				platform: 'android', //手机型号
+				isShowPermission: false, //是否打开权限弹窗
+				statusBarHeight: 0,
+				isBluethConnect: false, //当前是否蓝牙连接或者配对
+				isOpenAllPermission: false, //所有蓝牙配对所需权限是否已开启
 			};
 		},
 		computed: {},
@@ -204,7 +216,7 @@
 			AndroidUnlockAuth,
 			IosUnlockAuth
 		},
-		
+
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
@@ -224,17 +236,17 @@
 			});
 			uni.onNetworkStatusChange((res) => {
 				_this.isConnected = res.isConnected
-				if(res.isConnected){
+				if (res.isConnected) {
 					_this.init()
 				}
 			});
 			// #endif
-			
+
 			// #ifndef APP
 			this.isConnected = true
-				_this.init()
+			_this.init()
 			// #endif
-			
+
 		},
 		/**
 		 * 生命周期函数--监听页面显示
@@ -252,9 +264,9 @@
 			// #ifndef APP
 			this.init()
 			// #endif
-		
+
 		},
-		
+
 		// 分享给好友
 		onShareAppMessage: function(res) { //发送给朋友
 			return {
@@ -263,34 +275,36 @@
 			}
 		},
 		methods: {
-			init(){
+			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 && app.globalData.nearLockCheck
-				if(!user_token) return
+				this.isBluethConnect = app.globalData.connectionState[this.car_sn] && app.globalData.connectionState[this
+					.car_sn].connected && app.globalData.nearLockCheck
+				if (!user_token) return
 				this.newsNumFn()
 				this.isLogin = true
 				this.loadUserCarList()
-				
-				//蓝牙配对所需权限  运行小程序需要隐藏
-				// const permissionArr=permision.requestAndroidPermissions(this.platform)
-				// console.log(permissionArr,'permissionArr');
-				// this.setData({
-				// 	authStepList:permissionArr
-				// })
-				// permissionArr.map(item=>{
-				// 	if(!item.state) this.isOpenAllPermission=true
-				// })
-				
+				// #ifdef APP
+					//蓝牙配对所需权限  运行小程序需要隐藏
+					// const permissionArr = permision.requestAndroidPermissions(this.platform)
+					// console.log(permissionArr, 'permissionArr');
+					// this.setData({
+					// 	authStepList: permissionArr
+					// })
+					// permissionArr.map(item => {
+					// 	if (!item.state) this.isOpenAllPermission = true
+					// })
+				// #endif
+
 				// if (!this.car_info.car_sn) {
-					
+
 				// } else {
 				// 	this.loadCarDetail(this.car_info.car_sn)
 				// }
 			},
-			retry(){
+			retry() {
 				console.log('115555')
 			},
 			async newsNumFn() {
@@ -356,17 +370,17 @@
 				// }
 
 			},
-			closePermission(){
+			closePermission() {
 				this.setData({
-					isShowPermission:false
+					isShowPermission: false
 				})
 			},
 			showInduction() {
 				this.isHideInduction = true
 			},
 			loadModelList() {
-				if(this.isModel){
-					 return
+				if (this.isModel) {
+					return
 				}
 				this.isModel = true
 				const me = this
@@ -450,20 +464,25 @@
 						let itemCar = {}
 						for (let i = 0; i < list.length; i++) {
 							let item = list[i];
-							if(item.car_sn == this.car_info.car_sn){
+							if (item.car_sn == this.car_info.car_sn) {
 								isCar = true
 								itemCar = item
 							}
 						}
-						if(!isCar){
+						if (!isCar) {
+
 							if (list.length > 0) {
+								uni.removeStorageSync('car_info')
 								me.setData({
 									car_list: list,
 									car_sn: list[0].car_sn || '',
 								})
 								me.loadCarDetail(list[0].car_sn)
+							} else {
+								uni.removeStorageSync('car_info')
+								this.car_info = {}
 							}
-						}else{
+						} else {
 							me.loadCarDetail(itemCar.car_sn)
 						}
 					} else {
@@ -483,9 +502,9 @@
 							car_info: resp.data.data,
 						})
 						uni.setStorageSync('car_info', this.car_info);
-						console.log(this.car_info,'this.car_info------------------');
+						console.log(this.car_info, 'this.car_info------------------');
 						//判断逾期
-						if(!resp.data.data.sold_time) return 
+						if (!resp.data.data.sold_time) return
 						let time = Math.ceil(resp.data.data.hire_end_time - Math.floor(new Date()) / 1000) / 60
 						if (time > 0) {
 							this.isOverdueShow = true

pages/my/my.vue

@@ -70,6 +70,7 @@ var request = require('@/common/request.js');
 				newsList:{},
 				statusBarHeight:0,
 				car_info: {},
+				shopInfo:{},
 				QINIU_URL,
 				defaultAvatarUrl: defaultHeadImg,
 				comboDialoginfo: {
@@ -138,8 +139,17 @@ var request = require('@/common/request.js');
 		},
 		onLoad() {
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
+			this.serviceFn()
 		},
 		methods: {
+			async serviceFn(){
+				let {data} = await request.postApi(config.API_FLK_INDEX_SHOP_SETTING,{})
+				console.log(data)
+				if(data.code == 200){
+					this.shopInfo = data.data
+				}
+				
+			},
 			async newsNumFn(){
 				let {data} = await request.postApi(config.API_FLK_MESSAGE_UNREAD_COUNT,{})
 				if(data.code == 200){
@@ -202,6 +212,22 @@ var request = require('@/common/request.js');
 					return
 				}
 				if(statues){
+					let _this = this
+					if(!_this.shopInfo.link_phone){
+						this.$msg("未获取到手机号码")
+						return
+					}
+					uni.showModal({
+						content: `您是否要拨打电话${_this.shopInfo.link_phone}？`,
+						confirmText: '确定',
+						success: (res) => {
+							if (res.confirm) {
+								uni.makePhoneCall({
+									phoneNumber: _this.shopInfo.link_phone,
+								})
+							}
+						},
+					})
 					return
 				}
 				if (jumpCheck) {

pages/orderStatus/orderStatus.css

@@ -132,9 +132,15 @@
 
 .top-flex > view:nth-of-type(1) {
 	color: #060809;
-	font-size: 36rpx;
+	font-size: 34rpx;
 	font-weight: 400;
 	margin-bottom: 20rpx;
+	width: 450rpx;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	-webkit-box-orient: vertical;
 }
 
 .top-flex > view:nth-of-type(2) {
@@ -143,7 +149,7 @@
 	color: #9EA9BB;
 }
 
-.car-info img {
+.car-info image {
 	width: 125rpx;
 	height: 125rpx;
 	border-radius: 16rpx;
@@ -915,8 +921,11 @@
 }
 .store-name{
 	font-weight: 600;
-	font-size: 36rpx;
+	font-size: 34rpx;
 	color: #060809;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 }
 .time-style{
 	font-weight: 400;
@@ -943,4 +952,27 @@
 .get-time-view{
 	font-weight: 400;
 	align-items: center;
+}
+.serviceList{
+	display: flex;
+	align-items: center;
+	margin-top: 20rpx;
+	flex-wrap: wrap;
+}
+.serviceList .tag{
+	min-width: 106rpx;
+	height: 40rpx;
+	background: #F3F8FF;
+	border-radius: 24rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	font-size: 22rpx;
+	color: #2A3A5A;
+	line-height: 24rpx;
+	text-align: center;
+	font-style: normal;
+	margin-right: 10rpx;
 }

pages/orderStatus/orderStatus.vue

@@ -116,9 +116,9 @@
 			</view>
 			<view class="flex-row store-img-view">
 				<img src="https://qiniu.bms16.com/FrwDlFZdSMiBgqnqDjB19PiDUmuu" alt="">
-				<view style="width: 100%;margin-left: 24rpx;">
+				<view style="width: calc(100% - 180rpx);margin-left: 24rpx;">
 					<view class="store-name">{{orderInfo.shop_name}}</view>
-					<view class="store-name-address">{{orderInfo.address}}</view>
+					<view class="store-name-address">{{orderInfo.address || '未知地址'}}</view>
 					<view class="flex-row flex-between align-center">
 						<view class="flex-row time-style align-center">
 							<img v-if="orderInfo.work_begin_time && orderInfo.work_end_time"
@@ -136,16 +136,20 @@
 		<view class="car-info">
 			<view>车辆信息</view>
 			<view class="car-top flex-row flex-between">
-				<view class="top-flex">
-					<view>{{orderInfo.model_name}}</view>
-					<view>续航{{orderInfo.endurance /100}}km｜重量{{orderInfo.weight}}kg</view>
-				</view>
-				<!-- //配套服务 -->
-				<view class="">
-					asd
+				<view>
+					<view class="top-flex">
+						<view>{{orderInfo.model_name}}</view>
+						<view>续航{{(orderInfo.endurance /100).toFixed(0)}}km｜重量{{(orderInfo.weight / 1000).toFixed(0)}}kg</view>
+					</view>
+					<!-- //配套服务 -->
+					<view class="serviceList">
+						<view v-for="(item,index) of orderInfo.service_list" :key="index" class="tag">
+							{{item}}
+						</view>
+					</view>
 				</view>
-				<img v-if="orderInfo.model_images" :src="orderInfo.model_images" alt=""></img>
-				<img v-else src="https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj" alt="">
+				<image mode="aspectFill" v-if="orderInfo.model_images" :src="orderInfo.model_images"></image>
+				<image v-else src="https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj" mode=""></image>
 			</view>
 			<!-- <view class="exchange-info">
 				<view class="flex-row flex-between">
@@ -204,9 +208,6 @@
 				<view>逾期后及时续租不收取逾期费，逾期时长将从续租订单的用车时间中抵扣</view>
 			</view>
 		</view>
-		
-		
-		
 		<view class="inset-bottom"></view>
 		<view class="payment-info flex-row flex-between">
 			<view>
@@ -394,7 +395,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: {
@@ -442,9 +443,17 @@
 					car_sn = res[1].result
 					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}`
+				uni.showLoading({
+					title: '识别中....',
+					mask: true
 				})
+				setTimeout(()=> {
+					uni.hideLoading();
+					uni.navigateTo({
+						url: `/pages/activation/activation?model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${car_sn}`
+					})
+				}, 1000);
+				
 			},
 
 			navToCabinet() {
@@ -514,7 +523,7 @@
 				}, (resp) => {
 					if (resp.data.code === 200) {
 						me.orderInfo = resp.data.data.order_info
-				
+				me.orderInfo.model_images = me.orderInfo.model_images.split(',')[0]
 						// 
 						if (resp.data.data.order_info.model_id) {
 							me.loadCarInfo(resp.data.data.order_info.model_id)

pages/purchaseOrder/purchaseOrder.vue

@@ -11,7 +11,7 @@
 		</view>
 		<view class="car-info-view">
 			<view class="flex-row align-center">
-				<img style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="modelInfo.image" alt="">
+				<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="modelInfo.model_images" mode="aspectFill"></image>
 				<view class="flex-row car-info-grow">
 					<view class="flex-row align-center">
 						<view class="car-name">{{modelInfo.car_model_name}}</view>
@@ -199,13 +199,14 @@
 			if (options && options.params) {
 				const model_info = JSON.parse(decodeURIComponent(options.params)) || {}
 				console.log(model_info, 'model_info');
+				model_info.model_images = model_info.model_images ? model_info.model_images[0] : ''
 				this.setData({
 					modelInfo: model_info,
 					unitPrice: model_info.rental_setting.find(v => v.hire_duration_unit == model_info
 						.selectType)?.hire_price,
 					service_list: model_info.service_list || [],
 					price: model_info.totalPrice / 100,
-					totalPrice: model_info.select_type != 100 ? ((model_info.totalPrice + model_info.deposit) / 100).toFixed(2) : ((model_info.sell_price) / 100).toFixed(2)
+					totalPrice: model_info.selectType != 100 ? ((model_info.totalPrice + model_info.deposit) / 100).toFixed(2) : ((model_info.sell_price) / 100).toFixed(2)
 				})
 			}
 			this.pick_up_time = Math.floor(new Date().getTime() / 1000)

pages/service/components/cabinetList/cabinetList.vue

@@ -6,8 +6,8 @@
 				<view class="cabinet-distance">{{item.distance}}m</view>
 			</view>
 			<view class="battery-list-view">
-				<view class="battery-view" v-for="(items, index) in item.tag_code" :key="index">
-					<text class="battery-voltage">{{items.main_tag_name}}</text>
+				<view style="margin-bottom: 10rpx;" class="battery-view" v-for="(items, index) in item.tag_code" :key="index">
+					<text class="battery-voltage">{{items.main_tag_name ? items.main_tag_name : ''}}{{items.child_tag_name ? '/' + items.child_tag_name : ''}}</text>
 					<text class="battery-num">{{'*'+items.num}}</text>
 				</view>
 			</view>

pages/service/components/carRentalList/carRentalList.vue

@@ -40,7 +40,7 @@
 				
 				<scroll-view v-if="item.model_list.length>1" :scroll-into-view="'into'+into" scroll-x="true" enable-flex class="scrollview-box"
 					scroll-with-animation @scroll="onScroll">
-					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}`)" v-for="(items,index) in item.model_list" :key="index"
+					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${items.model_id}`)" v-for="(items,index) in item.model_list" :key="index"
 						:style="{ marginLeft: index > 0 ? '32rpx' : '0' }" class="form-item" :data-item="items"
 						>
 						<view class="second-view flex-row">

pages/service/service.css

@@ -110,6 +110,7 @@
 	border-radius: 24rpx;
 	text-align: left;
 	font-weight: 500;
+	padding-left: 10rpx;
 	font-size: 32rpx;
 	color: #060809;
 }

pages/service/service.vue

@@ -20,17 +20,14 @@
 		<!-- #endif -->
 
 		<!-- 地图控件 -->
-		<cover-view @click="isSearch = false" :class="[
+	<!-- 	<cover-view @click="isSearch = false" :class="[
         'control-icon-view',
         'flex-row',
         isSearch ? 'flex-between' : 'flex-end',
       ]">
 			<cover-view v-if="isSearch" class="seach-return-view flex-row"><cover-image class="seach-return-img"
 					src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG"></cover-image></cover-view>
-			<!-- <cover-view @tap="moveToLocation" class="current-location-view flex-row"><cover-image
-					class="current-location-icon"
-					src="https://qiniu.bms16.com/FgLe8FKDOzgt3wxi2lZt-yQGmbP3"></cover-image></cover-view> -->
-		</cover-view>
+		</cover-view> -->
 		
 		<view class="store-cabinet-block">
 			<view class="block-p"></view>
@@ -101,10 +98,6 @@
 		data() {
 			return {
 				activeMarkersId: 0,
-				myLocation: {
-					latitude: 0,
-					longitude: 0,
-				},
 				selectType: "store",
 				type: 1,
 				nearStoreList: [],
@@ -188,17 +181,13 @@
 			},
 
 
-			locationFn() {
+			async locationFn() {
 				let _this = this
-				uni.getLocation({
-					success(res) {
-						_this.myLocation = {
-							latitude: res.latitude,
-							longitude: res.longitude,
-						}
-						_this.loadCarRentalList();
-					}
-				})
+				if (this.selectType === "store") {
+					this.loadCarRentalList();
+				} else {
+					this.loadNearCabinetList();
+				}
 			},
 
 			tapSelectType(e) {
@@ -206,11 +195,9 @@
 					type
 				} = e.currentTarget.dataset;
 				this.nearCabinetList = []
-				console.log(type)
 				this.setData({
 					selectType: type,
 				});
-				console.log(type == 'store' ? 1 : 2)
 				this.type = type == 'store' ? 1 : 2
 				if (type === "store") {
 					this.loadCarRentalList();
@@ -348,7 +335,7 @@
 				});
 			},
 			openSearch() {
-				this.isSearch = true;
+				this.isSearch = !this.isSearch;
 				this.isFocused = true;
 			},
 			openSelectType() {

pages/storeDetails/storeDetails.vue

@@ -197,7 +197,7 @@
 				let obj = []
 				for (let index = 0; index < this.storeInfo.model_list.length; index++) {
 					let item = this.storeInfo.model_list[index];
-					if (this.tagId == 100 && item.sell_price) {
+					if (this.tagId == 100 && item.sell_price && item.sell_price != 0) {
 						obj.push({
 							...item,
 							money: (item.sell_price / 100).toFixed(2)
@@ -225,12 +225,7 @@
 			},
 			locationFn() {
 				let _this = this
-				uni.getLocation({
-					success(res) {
-						_this.loadStoreDetail(_this.shop_id, res.longitude, res.latitude)
-
-					}
-				})
+				_this.loadStoreDetail(_this.shop_id, this.myLocation.longitude, this.myLocation.latitude)
 			},
 			srcFn(url) {
 				uni.navigateTo({

utils/gyq_utils.js

@@ -1,8 +1,9 @@
 var storage = require('../common/storage.js');
-function srcFn(url,isLogin){
-	if(isLogin && !storage.getUserToken()){
+
+function srcFn(url, isLogin) {
+	if (isLogin && !storage.getUserToken()) {
 		uni.navigateTo({
-			url:'/pages/loginRegister/login'
+			url: '/pages/loginRegister/login'
 		})
 		return
 	}
@@ -10,16 +11,118 @@ function srcFn(url,isLogin){
 		url,
 	})
 }
+async function location() {
+	const storedLocation = storage.getUserCurrentLocation()
+	try {
+		let data = await locationAsync()
+		storage.setUserCurrentLocation({
+			longitude: data.longitude,
+			latitude: data.latitude
+		})
+		return data
+	} catch (error) {
+		return storedLocation
+	}
+}
 
-function msg(str){
+function locationAsync() {
+	return new Promise((resolve, reject) => {
+		uni.getLocation({
+			success(res) {
+				resolve(res)
+			},
+			fail(err) {
+				reject(err)
+			}
+		})
+	})
+}
+
+function msg(str) {
 	uni.showToast({
-		title:str,
-		icon:'none'
+		title: str,
+		icon: 'none'
 	})
 }
+function checkLocationPermissionH5() {
+  return new Promise((resolve) => {
+    if (navigator.permissions) {
+      navigator.permissions.query({ name: 'geolocation' }).then((result) => {
+        resolve(result.state === 'granted'); // granted 表示已授权
+      });
+    } else {
+      // 兼容旧版本浏览器：直接尝试获取位置，通过错误判断
+      navigator.geolocation.getCurrentPosition(
+        () => resolve(true),
+        (error) => resolve(error.code === error.PERMISSION_DENIED ? false : true)
+      );
+    }
+  });
+}
+
+function checkLocationPermissionMP() {
+  return new Promise((resolve) => {
+    uni.getSetting({
+      success: (res) => {
+        // 微信小程序的权限字段为 'scope.userLocation'
+        const hasPermission = res.authSetting['scope.userLocation'] === true;
+        resolve(hasPermission);
+      },
+      fail: () => resolve(false)
+    });
+  });
+}
+function checkLocationPermissionApp() {
+  return new Promise((resolve) => {
+    uni.getSetting({
+      success: (res) => {
+        // Android/iOS 的权限字段可能不同，需实测确认
+        const hasPermission = res.authSetting['scope.userLocation'] === true;
+        resolve(hasPermission);
+      },
+      fail: () => resolve(false)
+    });
+  });
+}
+
+function checkLocationPermission() {
+	return new Promise((resolve) => {
+		// #ifdef H5
+		checkLocationPermissionH5().then(resolve);
+		// #endif
+
+		// #ifdef MP-WEIXIN
+		checkLocationPermissionMP().then(resolve);
+		// #endif
+
+		// #ifdef APP-PLUS
+		checkLocationPermissionApp().then(resolve);
+		// #endif
+	});
+}
+function paramsObj(url){
+	if(url.indexOf("https://zx.uwenya.cc/xcx/s") == -1){
+		return {}
+	}
+	// 1. 提取参数部分
+	const queryString = url.split('?')[1] || '';
+	
+	// 2. 解析为对象
+	const params = {};
+	queryString.split('&').forEach(pair => {
+	  const [key, value] = pair.split('=');
+	  if (key) {
+	    params[key] = decodeURIComponent(value || '');
+	  }
+	});
+	return params
+}
 export default {
-  install: function (vm) {
-    vm.prototype.$srcFn = srcFn;
-    vm.prototype.$msg = msg;
-  },
+	install: function(vm) {
+		vm.prototype.$paramsObj = paramsObj;
+		vm.prototype.$srcFn = srcFn;
+		vm.prototype.$msg = msg;
+		vm.prototype.$location = location;
+		vm.prototype.$checkLocationPermission = checkLocationPermission;
+	},
 };