Merge branch 'gyq_test' of http://git.bms16.com/liuwei/zx_flk_app into dly_test

common/common.js

@@ -841,7 +841,7 @@ function countToDay(count, unit) {
 }
 
 async function callPhone(phone) {
-	const text = i18n.t('您是否要拨打电话' + phone + '?')
+	const text = i18n.t('您是否要拨打电话') + phone + '?'
 	// const text=that.$t()+phone+'?'
 	let res = await uni.showModal({
 		content: text,

common/http.js

@@ -93,7 +93,7 @@ function getRequest(url, data, successCallBack, failCallBack) {
 	});
 }
 
-function postRequest(url, data, successCallBack, failCallBack) {
+function postRequest(url, data, successCallBack=()=>{}, failCallBack=()=>{}) {
 	const datetime = Math.floor(Date.now() / 1000)
 	data.time = datetime.toString()
 	let jsonStr = JSON.stringify(selfSort(data))

component/allPrice/allPrice.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container flex-row">
-		<view>￥</view>
+		<view>{{$t('￥')}}</view>
 		<view class="integer-part">{{integerPart}}</view>
 		<view style="font-size: 32rpx;">{{decimalPart}}</view>
 	</view>

component/carPlan/carPlan.vue

@@ -14,9 +14,9 @@
 					</view>
 					
 					<view v-if="type!=100" class="car-model-price-view">
-						<text>已选择</text>
+						<text>{{ $t('已选择') }}</text>
 						<text>{{leaseUnitsResult}}</text>
-						<text style="margin-left: 12rpx;">时长 {{count}} 
+						<text style="margin-left: 12rpx;">{{ $t('时长') }} {{count}} 
 							<text>{{leaseUnits}}</text>
 						</text>
 						<!-- <text>共计{{tools.countToDay(count,type)}}天</text> -->
@@ -29,19 +29,19 @@
 				</view>
 			</view>
 			<view class="car-plan-view">
-				<view class="car-plan-title">用车方案</view>
+				<view class="car-plan-title">{{ $t('用车方案') }}</view>
 				<view class="car-plan-list-view flex-row">
 					<view v-for="(item,index) in params.rental_setting" :key="index" @click="tapSelectType(item)" :class="['flex-row' , (type == item.hire_duration_unit ? 'car-plan-list-i' : 'car-plan-list')] " 
 					>
 					
 						<view :class="(type == item.hire_duration_unit ? 'car-plan-unit-i' : 'car-plan-unit') ">
-							<text v-if="item.hire_duration_unit==1">日租</text>
-							<text v-if="item.hire_duration_unit==2">月租</text>
-							<text v-if="item.hire_duration_unit==3">年租</text>
-							<text v-if="item.hire_duration_unit==4">时租</text>
-							<text v-if="item.hire_duration_unit==5">分租</text>
-							<text v-if="item.hire_duration_unit==6">周租</text>
-							<text v-if="item.hire_duration_unit==7">季租</text>
+							<text v-if="item.hire_duration_unit==1">{{ $t('日租') }}</text>
+							<text v-if="item.hire_duration_unit==2">{{ $t('月租') }}</text>
+							<text v-if="item.hire_duration_unit==3">{{ $t('年租') }}</text>
+							<text v-if="item.hire_duration_unit==4">{{ $t('时租') }}</text>
+							<text v-if="item.hire_duration_unit==5">{{ $t('分租') }}</text>
+							<text v-if="item.hire_duration_unit==6">{{ $t('周租') }}</text>
+							<text v-if="item.hire_duration_unit==7">{{ $t('季租') }}</text>
 						</view>
 						<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>
@@ -64,7 +64,7 @@
 					<view class="flex-row free-num-tip">自费换电：$1/次</view>
 				</view> -->
 				<view v-if="type!=100" class="plan-time flex-row flex-between">
-					<view>租车时长</view>
+					<view>{{ $t('租车时长') }}</view>
 					<view class="quantity-count flex-row flex-between">
 						<view class="total-time flex-row">
 							 共 
@@ -92,7 +92,7 @@
 				</view> -->
 			</view>
 			<view class="lift-btn-view">
-				<view @tap="checkOrder" class="lift-btn">确认</view>
+				<view @tap="checkOrder" class="lift-btn">{{ $t('确认') }}</view>
 			</view>
 		</view>
 		

component/payTypeModel/payTypeModel.vue

@@ -7,7 +7,7 @@
 					<img class="close-icon" src="https://qiniu.bms16.com/FtoTEHOJiUf_gjPCJGGHMsAtHI5M" alt="">
 				</view>
 				<view class="pay-moneu-view">
-					<view class="pay-money-text">{{$t('付款金额')}}/￥</view>
+					<view class="pay-money-text">{{$t('付款金额')}}/{{$t('￥')}}</view>
 					<view class="pay-money"><allPrice :amount="(free_price/100)"/></view>
 				</view>
 			</view>

component/returnCar/returnCar.vue

@@ -2,13 +2,13 @@
     	<view v-if="isShowReturnCar" class="return-box">
 			<view class="return-item">
 				<view class="return-title flex-row flex-between">
-					<view>还车到门店</view>
+					<view>{{ $t('还车到门店') }}</view>
 					<view @tap="closeShowReturnCar" class="close-view"><img style="width: 24rpx;height: 24rpx;" src="https://qiniu.bms16.com/FoWVlo-Nmx6wTDpsL2Rf9_BamU7L" alt=""></view>
 				</view>
-				<view class="return-text">系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。</view>
+				<view class="return-text">{{ $t('系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。') }}</view>
 				<view class="return-btn flex-row">
-					<view @tap="navStore">导航到店</view>
-					<view @tap="immediatelyReturn">我已到店</view>
+					<view @tap="navStore">{{ $t('导航到店') }}</view>
+					<view @tap="immediatelyReturn">{{ $t('我已到店') }}</view>
 				</view>
 				<view v-if="typePage=='index'" style="height: 110rpx;"></view>
 			</view>

component/scanBtn/scanBtn.vue

@@ -22,7 +22,7 @@
 						<img class="close-icon" src="https://qiniu.bms16.com/FtoTEHOJiUf_gjPCJGGHMsAtHI5M" alt="">
 					</view>
 					<view class="pay-moneu-view">
-						<view class="pay-money-text">{{$t('付款金额')}}/￥</view>
+						<view class="pay-money-text">{{$t('付款金额')}}/{{$t('￥')}}</view>
 						<view class="pay-money">{{free_price}}</view>
 					</view>
 				</view>
@@ -34,7 +34,7 @@
 							<text style="margin-left:16rpx;">{{$t('换电收费规则')}}</text>
 						</view>
 						<view class="fee-rules-money-view">
-							<text class="fee-rules-money">￥{{free_price}}</text>
+							<text class="fee-rules-money">{{$t('￥')}}{{free_price}}</text>
 							<text>/1次</text>
 						</view>
 					</view>

component/useGuidance/useGuidance.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="tip-view">
 		<view class="tip-title-view flex-row align-center">
-			<image style="width: 144rpx;height: 40rpx;" src="https://qiniu.bms16.com/FjUW1kuRvXWTEftyn9nH1AbGWuxK"
-				mode='aspectFit'></image>
+			<!-- <image style="width: 144rpx;height: 40rpx;" src="https://qiniu.bms16.com/FjUW1kuRvXWTEftyn9nH1AbGWuxK"
+				mode='aspectFit'></image> -->
+			<text class="txt-guide">{{ $t('使用指导') }}</text>
 			<image style="width: 86rpx;height: 80rpx;" src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi"
 				mode='aspectFill'></image>
 			<view class="w-bg flex-row"></view>
@@ -13,13 +14,11 @@
 			</view>
 			<view class="dashed-line"></view>
 			<view class="icon-list-view">
-				<image class="img1" src="https://qiniu.bms16.com/FqDzYwAbnSEgf3yv9SAb92Vq4ZEB"
-					mode='aspectFit'></image>
+				<image class="img1" src="https://qiniu.bms16.com/FqDzYwAbnSEgf3yv9SAb92Vq4ZEB" mode='aspectFit'></image>
 			</view>
 			<view class="dashed-line"></view>
 			<view class="icon-list-view">
-				<image class="img1" src="https://qiniu.bms16.com/FlFMHzco6j9XOpMI21tSnR9500Un"
-					mode='aspectFit'></image>
+				<image class="img1" src="https://qiniu.bms16.com/FlFMHzco6j9XOpMI21tSnR9500Un" mode='aspectFit'></image>
 			</view>
 		</view>
 		<view class="step-tip-view flex-row  align-center">
@@ -64,12 +63,22 @@
 		/* height: 80rpx; */
 	}
 
+	.txt-guide {
+		font-family: PingFangSC, PingFang SC;
+		height: 40rpx;
+		color: #FFFFFF;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
+
 	.tip-title-view {
 		padding-left: 24rpx;
 		/* border-radius: 40rpx; */
 	}
+
 	.w-bg {
-		width: 100%;
+
+		flex: 1;
 		height: 80rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 40rpx 0rpx 0rpx;

locale/en.json

@@ -64,7 +64,7 @@
 	"日租": "Daily",
 	"周租": "Weekly",
 	"租车时长": "Rent duration",
-	"天": "Day",
+	"天": " Day",
 	"优惠券": "Coupon",
 	"折": "Discount",
 	"骑行保障服务": "Riding protection",
@@ -128,7 +128,7 @@
 	"温度": "Temperature",
 	"换电套餐": "Swap Plan",
 	"适用类型": "Model",
-	"5秒换电，瞬间满电，畅享骑行新体验！": "5s swap, full power, ride on!",
+	"5秒换电，瞬间满电，畅享骑行新体验！": "5s swap,full power,ride on!",
 	"适用电池：": "Applicable battery:",
 	"当前购买为虚拟": "Virtual purchase",
 	"卡": "Card",
@@ -229,8 +229,8 @@
 	"营业中": "Open",
 	"已休息": "Resting",
 	"直线距您": " ",
-	"千米": "km",
-	"米": "m",
+	"千米": " km",
+	"米": " m",
 	"导航": "Nav",
 	"格口详情": "Box Detail",
 	"电柜编号：": "Cabinet ID:",
@@ -324,7 +324,7 @@
 	"重新签名": "Resign",
 	"上报小程序账号信息": "Report mini-program account information",
 	"您当前没有手写签名，是否要进行填写": "You do not have a handwritten signature, do you want to fill it?",
-	"续航": "Range",
+	"续航": "Range ",
 	"骑行里程": "Ride Distance",
 	"骑行时长": "Ride Time",
 	"最大速度": "Max Speed",
@@ -430,7 +430,7 @@
 	"蓝牙配对成功": "Bluetooth Pairing Successful",
 	"请先连接蓝牙": "Please Connect Bluetooth First",
 	"用车人管理": "User Management",
-	"个家庭账号": "Family Accounts",
+	"个家庭账号": " Family Accounts",
 	"设备信息": "Device Info",
 	"软件版本": "Current Version",
 	"用户车辆列表": "User Vehicle List",
@@ -540,10 +540,10 @@
 	"骑行次数": "Ride Count",
 	"累计功率": "Total Power",
 	"减少排放量": "Emissions Reduction",
-	"总": "total",
-	"年": "year",
-	"月": "month",
-	"周": "week",
+	"总": "total ",
+	"年": " year",
+	"月": " month",
+	"周": " week",
 	"请输入绑定的新手机号": "Please enter the new phone number to bind",
 	"请输入验证码": "Please enter the verification code",
 	"秒后再次获取": "Get again after seconds",
@@ -598,8 +598,8 @@
 	"还车申请中": "Return Pending",
 	"还车中": "Returning Vehicle",
 	"车辆已归还": "Vehicle Returned",
-	"订单已支付": "Order Paid",
-	"订单未支付": "Order Not Paid",
+	"订单已支付": "Paid",
+	"订单未支付": "Not Paid",
 	"已完结": "Finished",
 	"支付中": "Paying",
 	"支付成功": "Payment Success",
@@ -622,7 +622,7 @@
 	"订单金额": "Order Amount",
 	"付款金额": "Payment Amount",
 	"租车购车": "Rent/Sell",
-	"请于": "By",
+	"请于": "By ",
 	"到门店取车": "Pick up at the store",
 	"请上传车辆图片激活车辆": "Please upload vehicle picture to activate vehicle",
 	"待门店确认": "Pending Store Confirm",
@@ -636,7 +636,7 @@
 	"展开": "Expand",
 	"租借周期：购买": "Rental Period: Purchase",
 	"订单信息": "Order Information",
-	"订单编号": "Order No.",
+	"订单编号": "Order No",
 	"支付时间": "Payment Time",
 	"支付方式": "Payment Method",
 	"微信支付": "WeChat Pay",
@@ -648,7 +648,7 @@
 	"订单结束后随时退": "Return anytime after order ends",
 	"自行去门店取还": "Pickup Store",
 	"未知地址": "Unknown Address",
-	"重量": "Weight",
+	"重量": "Weight ",
 	"换电信息": "Battery Swap Information",
 	"共": "Total",
 	"本单可享": "This order includes",
@@ -711,7 +711,7 @@
 	"有保险的时候": "When insured",
 	"为免押": "For deposit-free",
 	"为总金额": "For total amount",
-	"押金": "Deposit",
+	"押金": " Deposit",
 	"时": "Hour",
 	"无保险": "No Insurance",
 	"金额": "Amount",
@@ -746,7 +746,7 @@
 	"选择取车时间": "Select Pickup Time",
 	"共计": "Total",
 	"车辆押金": "Vehicle Deposit",
-	"需要支付": "Amount to Pay",
+	"需要支付": "Amount to Pay ",
 	"元押金，诺无车损、违章及逾期，还车后可退": "Deposit, refundable upon return if no damage, violations, or overdue.",
 	"前往门店取还": "Pickup/Return Shop",
 	"门店距您": " ",
@@ -756,8 +756,8 @@
 	"支付金额": "Payment Amount",
 	"导航到店": "Navigate to Store",
 	"租车订单已提交": "Rental Order Submitted",
-	"到": "To",
-	"取车": "Pick Up",
+	"到": " To ",
+	"取车": " Pick Up",
 	"订单详情": "Order Details",
 	"选择预约订单时间": "Select Reservation Time",
 	"单价": "Unit Price",
@@ -850,5 +850,14 @@
 	"车辆已被租售！": "Vehicle Rented or Sold!",
 	"全部": "All",
 	"立即支付": "Pay Now",
+	"使用指导": "Usage Guide",
+	"本次消费门店": "Store of this purchase",
+	"已选择": "Selected",
+	"用车方案": "Vehicle Usage Plan",
+	"时长": "Rental Duration",
+	"系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。": "The system will determine whether you have arrived at the return location based on your positioning. If you have already arrived at the store, please click the 'I have arrived at the store' button. After the store confirms the return, the car return process will be successfully completed",
+	"购买时间":"Buy Time",
+	"￥": "$",
+	"当前电池存在未知型号，请联系门店处理！":"The current battery is of an unknown model. Please contact the store for assistance!",
 	"正在加载数据":"Loading"
 }

locale/zh.json

@@ -850,5 +850,14 @@
 	"车辆已被租售！": "车辆已被租售！",
 	"全部": "全部",
 	"立即支付": "立即支付",
+	"使用指导": "使用指导",
+	"本次消费门店": "本次消费门店",
+	"已选择": "已选择",
+	"用车方案": "用车方案",
+	"时长": "时长",
+	"系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。": "系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。",
+	"购买时间":"购买时间",
+	"￥": "￥",
+	"当前电池存在未知型号，请联系门店处理！":"当前电池存在未知型号，请联系门店处理！",
 	"正在加载数据":"正在加载数据"
 }

mixin/index.js

@@ -15,7 +15,8 @@ export default {
 	  popText:'',
 	  cmdType:'',
 	  myLocation:{},
-	  popupControlShow:false
+	  popupControlShow:false,
+	  car_detail:{}
     };
   },
   onLoad(){
@@ -23,6 +24,8 @@ export default {
 	 this.locationMiXin()
   },
    mounted(){
+	   console.log(this.isConnectBlueth,'isConnectBlueth');
+	   this.car_detail=uni.getStorageSync('car_info')
   	  this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
   },
   methods: {
@@ -34,7 +37,7 @@ export default {
 		   }
 	  },
 		tapOpenControl(e){
-			const _carOnline= uni.getStorageSync('car_info').online == 1 //在线
+			const _carOnline= this.car_detail.online == 1 //在线
 			console.log('_carOnline',this._carOnline);
 			const {name,type}=e
 			this.setData({
@@ -65,27 +68,14 @@ export default {
 		},
 		tapBlueToothCmd(cmd,type){
 			console.log(cmd,type,'cmd,type');
-			const car_info= uni.getStorageSync('car_info');
+			const car_info= this.car_detail;
 			const isCarLocation = (cmd=='more')?true:type
 			if(this.cmdType=='batteryInfo'){
 				uni.navigateTo({
 					url:`/pages/batteryDetail/batteryDetail`
 				})
 			}else if(this.cmdType=='navigation'){
-				const {
-					address,
-					latitude,
-					longitude,
-					car_name
-				} =car_info
-				uni.openLocation({
-					latitude: latitude - 0,
-					longitude: longitude - 0,
-					scale: 15,
-					name: car_name,
-					address: address,
-					success: function (res) {},
-				})
+				this.getCarAddressName()
 				//获取胎压
 			}else if(this.cmdType=='tirePressure'){
 				this.bluetoothCmd()
@@ -148,10 +138,10 @@ export default {
 		},
 		bluetoothCmd(isCarLocation){
 			const me=this
-			const car_info= uni.getStorageSync('car_info');
+			const car_info= this.car_detail;
 			const app = getApp();
-			console.log('test',app.globalData.connectionState[car_info.car_sn]);
 			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
+			if(Object.keys(app.globalData.connectionState).length === 0) return
 			const isBluetoothConnect = app.globalData.connectionState[car_info.car_sn].device
 			if(isBluetoothConnect){
 				//改成判断开关锁
@@ -165,7 +155,7 @@ export default {
 				};
 				common.loading();
 				const command = bluetoothCommands[this.cmdType];
-				const car_sn = uni.getStorageSync('car_info').car_sn
+				const car_sn = this.car_detail.car_sn
 				if (command) {
 					command(car_sn, () => {
 						uni.hideLoading();
@@ -176,35 +166,64 @@ export default {
 					});
 				}
 			}else{
-				uni.showModal({
-					title: '提示',
-					content: '当前车辆处于离线，是否前往开启蓝牙配对操作车辆？',
-					showCancel: true,
-					cancelText: '取消',
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							if(isCarLocation){
-								uni.switchTab({
-									url:'/pages/index/index'
-								})
-							}else{
-								me.$emit('toBluetooth')
-							}
+				// uni.showModal({
+				// 	title: '提示',
+				// 	content: '当前车辆处于离线，是否前往开启蓝牙配对操作车辆？',
+				// 	showCancel: true,
+				// 	cancelText: '取消',
+				// 	confirmText: '确定',
+				// 	success: function(res) {
+				// 		if (res.confirm) {
+				// 			if(isCarLocation){
+				// 				uni.switchTab({
+				// 					url:'/pages/index/index'
+				// 				})
+				// 			}else{
+				// 				me.$emit('toBluetooth')
+				// 			}
 							
-						}
-					},
-					fail: function(res) {},
-					complete: function(res) {},
+				// 		}
+				// 	},
+				// 	fail: function(res) {},
+				// 	complete: function(res) {},
+				// })
+			}
+		},
+		async getCarAddressName() {
+			const that = this
+			//#ifdef MP-ALIPAY
+			var _pi = "ali_index"
+			//#endif
+			//#ifdef MP-WEIXIN
+			var _pi = "wx_index"
+			//#endif
+			//#ifdef APP
+			var _pi = "APP"
+			//#endif
+			const location = {
+				lat: this.car_detail.latitude,
+				lng: this.car_detail.longitude,
+				pi: _pi
+			}
+			let {data} = await http.postApi(config.API_MAP_REGEO, location)
+			if(data.code == 200){
+				console.log(data,'data.data.data');
+				const address = data.data.data.address
+				const {
+					latitude,
+					longitude,
+					car_name
+				} =this.car_detail
+				uni.openLocation({
+					latitude: latitude - 0,
+					longitude: longitude - 0,
+					scale: 15,
+					name: car_name,
+					address: address,
+					success: function (res) {},
 				})
 			}
 		},
-		// async loadData() {
-		// 				return new Promise((resolve) => {
-		// 					// setTimeout(resolve, 1000); // 模拟 5 秒请求时间
-		// 					// this.trunOn(resolve)
-		// 				});
-		// 			},
 
 	},
 

pages/battery/battery.vue

@@ -128,21 +128,21 @@
 								:class="isSelectStatus == 0?'ptyped-item':'ptype-item'">
 								<view class="ptype-title">{{ $t('时租') }}</view>
 								<view :class="isSelectStatus == 0?'ptyped-text':'ptype-text'">
-									￥<text>8</text>
+									{{$t('￥')}}<text>8</text>
 								</view>
 							</view>
 							<view @tap="bindChangeStatus" data-status="1"
 								:class="isSelectStatus == 1?'ptyped-item':'ptype-item'">
 								<view class="ptype-title">{{ $t('日租') }}</view>
 								<view :class="isSelectStatus == 1?'ptyped-text':'ptype-text'">
-									￥<text>48</text>
+									{{$t('￥')}}<text>48</text>
 								</view>
 							</view>
 							<view @tap="bindChangeStatus" data-status="2"
 								:class="isSelectStatus == 2?'ptyped-item':'ptype-item'">
 								<view class="ptype-title">{{ $t('周租') }}</view>
 								<view :class="isSelectStatus == 2?'ptyped-text':'ptype-text'">
-									￥<text>208</text>
+									{{$t('￥')}}<text>208</text>
 								</view>
 							</view>
 						</view>
@@ -215,7 +215,7 @@
 						</view>
 						<view class="payment-bottom flex-row flex-between">
 							<view class="bottom-left flex-row">
-								<view>￥92.23</view>
+								<view>{{$(￥)}}92.23</view>
 								<view>{{ $t('明细') }}<img src="https://qiniu.bms16.com/FmEDQp82D5k9lkHMEcCoCeLO8ZQL" /></view>
 							</view>
 							<view @tap="navToPage" data-url="/pages/orderStatus/orderStatus">{{ $t('支付') }}·{{ $t('授权免押') }}</view>

pages/carDetail/carDetail.css

@@ -163,7 +163,7 @@
 	text-align: center;
 }
 .w-bg{
-	width: 100%;
+	flex: 1;
 	height: 80rpx;
 	background: #FFFFFF;
 	border-radius: 0rpx 40rpx 0rpx 0rpx;

pages/carDetail/carDetail.vue

@@ -1,41 +1,45 @@
 <template>
 	<view>
-	<view class="car-detail-main">
-		<Navigation :scroll='scrollTop'></Navigation>
-		<view class="store-img-view">
-			<swiper v-if="car_detail.model_images && car_detail.model_images.length!=0" class="swiper" :indicator-dots="true" :autoplay="true" :interval="2000"
-				indicator-color="rgba(0, 0, 0, 0.3)" indicator-active-color="#000000" :duration="1000" circular>
-				<swiper-item class="swiper-item" v-for="(item,index) in car_detail.model_images" :key="index">
-					<image style="width: 100%;height: 100%;" class="swiper-item-img" :src="item" mode="aspectFit"></image>
-				</swiper-item>
-			</swiper>
-			<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" mode="aspectFit">
-			</image>
-		</view>
-		
-		<view class="car-detail-model">
-			<view class="car-detail-name">{{car_detail.car_model_name}}</view>
-			<view class="car-detail-price">
-				<allPrice :amount="Number(price)" />
+		<view class="car-detail-main">
+			<Navigation :scroll='scrollTop'></Navigation>
+			<view class="store-img-view">
+				<swiper v-if="car_detail.model_images && car_detail.model_images.length!=0" class="swiper"
+					:indicator-dots="true" :autoplay="true" :interval="2000" indicator-color="rgba(0, 0, 0, 0.3)"
+					indicator-active-color="#000000" :duration="1000" circular>
+					<swiper-item class="swiper-item" v-for="(item,index) in car_detail.model_images" :key="index">
+						<image style="width: 100%;height: 100%;" class="swiper-item-img" :src="item" mode="aspectFit">
+						</image>
+					</swiper-item>
+				</swiper>
+				<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt"
+					mode="aspectFit">
+				</image>
 			</view>
-			<view style="flex-wrap: wrap;justify-content: flex-start;" class="flex-row car-detail-time">
-				<view v-for="(item,index) in car_detail.rental_setting" :key="index" @click="tapSelectType(item)"
-					:class="['time-unit',selectType==item.hire_duration_unit? 'time-unit-i':'']">
-					<text v-if="item.hire_duration_unit==1">{{ $t('日租') }}</text>
-					<text v-if="item.hire_duration_unit==2">{{ $t('月租') }}</text>
-					<text v-if="item.hire_duration_unit==3">{{ $t('年租') }}</text>
-					<text v-if="item.hire_duration_unit==4">{{ $t('时租') }}</text>
-					<text v-if="item.hire_duration_unit==5">{{ $t('分租') }}</text>
-					<text v-if="item.hire_duration_unit==6">{{ $t('周租') }}</text>
-					<text v-if="item.hire_duration_unit==7">{{ $t('季租') }}</text>
+
+			<view class="car-detail-model">
+				<view class="car-detail-name">{{car_detail.car_model_name}}</view>
+				<view class="car-detail-price">
+					<allPrice :amount="Number(price)" />
 				</view>
+				<view style="flex-wrap: wrap;justify-content: flex-start;" class="flex-row car-detail-time">
+					<view v-for="(item,index) in car_detail.rental_setting" :key="index" @click="tapSelectType(item)"
+						:class="['time-unit',selectType==item.hire_duration_unit? 'time-unit-i':'']">
+						<text v-if="item.hire_duration_unit==1">{{ $t('日租') }}</text>
+						<text v-if="item.hire_duration_unit==2">{{ $t('月租') }}</text>
+						<text v-if="item.hire_duration_unit==3">{{ $t('年租') }}</text>
+						<text v-if="item.hire_duration_unit==4">{{ $t('时租') }}</text>
+						<text v-if="item.hire_duration_unit==5">{{ $t('分租') }}</text>
+						<text v-if="item.hire_duration_unit==6">{{ $t('周租') }}</text>
+						<text v-if="item.hire_duration_unit==7">{{ $t('季租') }}</text>
+					</view>
 
-				<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':'']">{{ $t('购买') }}</view>
+					<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':'']">{{ $t('购买') }}</view>
+				</view>
 			</view>
-		</view>
-		<!-- <view class="free-num-model">
+			<!-- <view class="free-num-model">
 			<view class="flex-row flex-between">
 				<view class="free-num-view">
 					<img style="width: 40rpx;height: 40rpx;" src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx" alt="">
@@ -45,54 +49,53 @@
 			</view>
 			<view class="free-num-tip">{{ $t('日租享') }}1{{ $t('次免费换电数，超出后需要单独支付换电费用；') }}</view>
 		</view> -->
-		<useGuidance />
-		<view class="card-car-detail">
-			<view class="step-title-view flex-row align-center">
-				<img style="width: 208rpx;height: 40rpx;" src="https://qiniu.bms16.com/Fms8V0l4bNwGUgWwkdRku4dIx_tt"
-					alt="">
-				<img style="width: 86rpx;height: 80rpx;" src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi"
-					alt="">
-				<view class="w-bg flex-row"></view>
-			</view>
-			<view class="step-car-view">
-				<view class="step-img-view"></view>
-				<view class="flex-row flex-between" style="margin-bottom: 24rpx;">
-					<view class="store-name-view">
-						<view>{{car_detail.shop_name}}</view>
-						<view class="address-txt">{{car_detail.address}}</view>
-					</view>
-					<view class="distance-num">{{car_detail.distance}}m</view>
+			<useGuidance />
+			<view class="card-car-detail">
+				<view class="step-title-view flex-row align-center">
+					<text class="txt-guide">{{ $t('本次消费门店') }}</text>
+					<img style="width: 86rpx;height: 80rpx;" src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi"
+						alt="">
+					<view class="w-bg flex-row"></view>
 				</view>
-				<view class="flex-row flex-between align-center">
-					<view class="time-view flex-row alert-center">
-						<img class="time-icon" src="https://qiniu.bms16.com/FlGVpR2fdrD1GfeHfDgt-dUMgkOq" alt="">
-						<text>{{car_detail.work_begin_time + '-' + car_detail.work_end_time}}</text>
-					</view>
-					<view class="phone-or-nav flex-row">
-						<view @tap="tapCallPhone">
-							<img style="width: 84rpx;height: 64rpx;margin-right: 20rpx;"
-								src="https://qiniu.bms16.com/FkZYljvsgGtXUGnQaA0wk_sbjlUC" alt="">
+				<view class="step-car-view">
+					<view class="step-img-view"></view>
+					<view class="flex-row flex-between" style="margin-bottom: 24rpx;">
+						<view class="store-name-view">
+							<view>{{car_detail.shop_name}}</view>
+							<view class="address-txt">{{car_detail.address}}</view>
 						</view>
-						<view @tap="navAddress">
-							<img style="width: 112rpx;height: 64rpx;"
-								src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
+						<view class="distance-num">{{car_detail.distance}}m</view>
+					</view>
+					<view class="flex-row flex-between align-center">
+						<view class="time-view flex-row alert-center">
+							<img class="time-icon" src="https://qiniu.bms16.com/FlGVpR2fdrD1GfeHfDgt-dUMgkOq" alt="">
+							<text>{{car_detail.work_begin_time + '-' + car_detail.work_end_time}}</text>
 						</view>
+						<view class="phone-or-nav flex-row">
+							<view @tap="tapCallPhone">
+								<img style="width: 84rpx;height: 64rpx;margin-right: 20rpx;"
+									src="https://qiniu.bms16.com/FkZYljvsgGtXUGnQaA0wk_sbjlUC" alt="">
+							</view>
+							<view @tap="navAddress">
+								<img style="width: 112rpx;height: 64rpx;"
+									src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
+							</view>
 
+						</view>
 					</view>
 				</view>
 			</view>
+			<view class="nodes">
+				<rich-text v-if="car_detail.model_desc" :nodes="car_detail.model_desc"></rich-text>
+			</view>
+			<view style="height: 150rpx;"></view>
+			<view class="use-car-view flex-row">
+				<view @tap="useCarBtn" class="use-car-btn">{{ $t('我要用车') }}</view>
+			</view>
+			<carPlan v-if="showCarPlan" @changeSelectType="changeSelectType" @closeShowMore="closeShowMore"
+				:params="params" :selectType="selectType" />
 		</view>
-		<view class="nodes">
-			<rich-text v-if="car_detail.model_desc" :nodes="car_detail.model_desc"></rich-text>
-		</view>
-		<view style="height: 150rpx;"></view>
-		<view class="use-car-view flex-row">
-			<view @tap="useCarBtn" class="use-car-btn">{{ $t('我要用车') }}</view>
-		</view>
-		<carPlan v-if="showCarPlan" @changeSelectType="changeSelectType" @closeShowMore="closeShowMore" :params="params"
-			:selectType="selectType" />
 	</view>
-</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
 <script module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>
@@ -110,7 +113,7 @@
 	export default {
 		data() {
 			return {
-				shop_type:0,
+				shop_type: 0,
 				recommend_id: '',
 				car_detail: {},
 				showCarPlan: false,
@@ -133,8 +136,8 @@
 			if (options.shop_type) {
 				this.shop_type = options.shop_type
 				const d = {
-					hire_duration_unit:options.shop_type,
-					hire_price:Number(options.hire_price)
+					hire_duration_unit: options.shop_type,
+					hire_price: Number(options.hire_price)
 				}
 				this.tapSelectType(d)
 			}
@@ -157,39 +160,49 @@
 				}, (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))
-						
-						
+
+
 						const imgRegex = /<img([^>]*)>/gi;
-						
+
 						// 替换函数，设置 width="100%" 和 height="auto"
 						const updatedRichText = resp.data.data.model_desc.replace(imgRegex, (match) => {
-						  // 使用正则表达式移除已有的 width 和 height 属性
-						  const cleanedMatch = match.replace(/(width|height)="[^"]*"/gi, '');
-						  
-						  // 添加新的 width="100%" 和 height="auto"
-						  return cleanedMatch.replace('<img', '<img width="100%" height="auto"');
+							// 使用正则表达式移除已有的 width 和 height 属性
+							const cleanedMatch = match.replace(/(width|height)="[^"]*"/gi, '');
+
+							// 添加新的 width="100%" 和 height="auto"
+							return cleanedMatch.replace('<img', '<img width="100%" height="auto"');
 						});
-						
-						
+
+
 						resp.data.data.model_desc = updatedRichText
-						
+
 						me.setData({
 							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){
+						let rental_setting = []
+						resp.data.data.rental_setting.map((item, index) => {
+							if (index === 0) {
+								if (!me.shop_type) {
 									me.tapSelectType({
-										hire_duration_unit:item.hire_duration_unit,
-										hire_price:Number(item.hire_price),
+										hire_duration_unit: item.hire_duration_unit,
+										hire_price: Number(item.hire_price),
 									})
 								}
+							}
+							LEASE_TYPE_ARR.map(items => {
+								if (items.value == item.hire_duration_unit) {
+									item.sort = items.sort
+									rental_setting.push(item)
+								}
 							})
-						}
+						})
+						resp.data.data.rental_setting = rental_setting.sort((x, y) => {
+							return x.sort - y.sort
+						})
 					} else {
 						common.simpleToast(resp.data.msg);
 					}
@@ -200,9 +213,6 @@
 					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)
@@ -277,9 +287,18 @@
 </script>
 <style>
 	@import './carDetail.css';
-	.nodes{
+
+	.nodes {
 		color: #333;
 		font-size: 28rpx;
 		padding: 34rpx 32rpx 32rpx;
 	}
+
+	.txt-guide {
+		font-family: PingFangSC, PingFang SC;
+		height: 40rpx;
+		color: #FFFFFF;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
 </style>

pages/index/components/control/control.css

@@ -16,6 +16,11 @@
 	/* box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */
 	margin: 20rpx;
 }
+.contril-item-e,
+.more-item-e{
+	margin: 20rpx 10rpx;
+}
+
 .contril-item-img{
 	width: 112rpx;
 	height: 112rpx;

pages/index/components/control/control.vue

@@ -84,7 +84,7 @@
 	import CustomSwitch from '@/component/customSwitch.vue'; // 引入组件
 	
 	import controlMixin from '@/mixin/index';
-	import i18n from '@/locale/index.js'
+	import {Language} from '@/utils/util.js'
 	import {
 			getFunctionTag,
 			setFunctionTag
@@ -104,6 +104,10 @@ export default {
 		isOverdueShow: {
 			type: Boolean,
 			default: false
+		},
+		isConnectBlueth: {
+			type: Boolean,
+			default: false
 		}
 	},
 
@@ -115,7 +119,8 @@ export default {
 			switchValue: {state:false,time:0},
 			isShowMore:false,
 			car_line:false,
-			authority_list:[]
+			authority_list:[],
+			Language,
 			// startX: 0, // 滑块开始滑动的初始位置
 			// moveX: 0, // 滑块滑动的距离
 			// unlocked: false, // 是否解锁成功的标志

pages/index/components/mapCard/mapCard.vue

@@ -2,7 +2,7 @@
 	<view class="container-view-car" @tap="navCarLocation">
 		<!-- #ifdef APP -->
 		<view :style="{width:'100%',height: height?'258rpx':'140rpx'}" class="map">
-			<cover-view  class="top-car-location">
+			<cover-view v-if="!isShowReturnCar"  class="top-car-location">
 				<cover-image class='img' style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FrKY7Ex5za22plr39ddIsJcjFVpi" ></cover-image>
 				<cover-view class="text">{{ $t('车辆位置') }}</cover-view>
 			</cover-view>
@@ -16,7 +16,7 @@
 		<!-- #ifndef APP -->
 		<map class="map"  :longitude="car_info.longitude"
 			:latitude="car_info.latitude" scale="16" show-location :style="{width:'100%',height: height?'258rpx':'140rpx'}" :markers="carLocation">
-			<view class="top-car-location flex-row">
+			<view  class="top-car-location flex-row">
 				<img style="width: 36rpx;height: 36rpx;" src="https://qiniu.bms16.com/FrKY7Ex5za22plr39ddIsJcjFVpi" alt="">
 				<text>{{ $t('车辆位置') }}</text>
 			</view>
@@ -45,6 +45,7 @@
 		 * 组件的属性列表
 		 */
 		props: {
+			
 			car_info: {
 				type: Object,
 				default: {}
@@ -53,6 +54,10 @@
 				type: Boolean,
 				default: true
 			},
+			isShowReturnCar: {
+				type: Boolean,
+				default: true
+			},
 		},
 		
 		mounted() {

pages/index/components/unleasedPages/unleasedPages.vue

@@ -9,7 +9,7 @@
 		<!-- #endif -->
 
 
-		<view v-if="!isShow">
+		<view v-if="isShow">
 			<view style="margin: 0 50rpx 0rpx;height: 420rpx;">
 				<u-swiper v-if="img_list.length!=0" :list="img_list" @change="tapSwiper" :autoplay="false" mode="none"
 					:height="420" bgColor="transparent" class="custom-swiper">

pages/index/index.vue

@@ -66,8 +66,8 @@
 							<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;">{{car_info.remain_mail}}<text style="font-size: 30rpx;">km</text></view>
+								<view style="font-weight:400;font-size: 22rpx;">{{$t("续航")}}</view>
+								<view style="font-size: 36rpx;">{{formatDistance(car_info.remain_mail) }}<text style="font-size: 30rpx;">{{car_info.remain_mail ? car_info.remain_mail>1000?'km':'m' :'km'}}</text></view>
 							</view>
 						</view>
 						<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
@@ -87,11 +87,11 @@
 								:style="{width: '24rpx',height: '32rpx'}" alt="">
 						</view>
 					</view>
-					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail" :isOverdueShow="isOverdueShow"/>
+					<Control :contrilList="contrilList" :isConnectBlueth="isConnectBlueth" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail" :isOverdueShow="isOverdueShow"/>
 					
 			
 					<view :class="['flex-row', 'flex-between', 'map-card-view',car_info.exchange_package_info && car_info.exchange_package_info.activity_time?'height_362':'height_260']">
-						<MapCard :car_info="car_info" :height="!!(car_info.exchange_package_info && car_info.exchange_package_info.activity_time)"/>
+						<MapCard :isShowReturnCar='isShowReturnCar' :car_info="car_info" :height="!!(car_info.exchange_package_info && car_info.exchange_package_info.activity_time)"/>
 			
 						<view class="card-right">
 							<view class="card-bg" @tap="navTravelingTrack">
@@ -178,7 +178,7 @@
 		</view>
 		
 		
-		<returnCar :isShowReturnCar="isShowReturnCar" typePage="index" @closeShowReturnCarBtn="()=>isShowReturnCar=false"
+		<returnCar :isShowReturnCar='isShowReturnCar' typePage="index" @closeShowReturnCarBtn="isShowReturnCar=false"
 			@navStoreBtn="navStoreBtn" @immediatelyReturnBtn="immediatelyReturnBtn" />
 	</view>
 </template>
@@ -340,11 +340,12 @@
 				this.newsNumFn()
 				this.isLogin = true
 				this.loadUserCarList()
-				// if(!this.time){
-				// 	this.time = setInterval(()=>{
-				// 		this.loadUserCarList()
-				// 	},5000)
-				// }
+				//蓝牙是否连接
+				if('car_sn' in this.car_info && Object.keys(app.globalData.connectionState).length != 0){
+					
+					this.isConnectBlueth=app.globalData.connectionState[this.car_info.car_sn].connect
+					
+				}
 				// #ifdef APP
 					//蓝牙配对所需权限  运行小程序需要隐藏
 					// const permissionArr = permision.requestAndroidPermissions(this.platform)
@@ -403,7 +404,9 @@
 				});
 			},
 			inductiveUnlockHandle() {
-				uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+				
+				// uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+				
 				// console.log(!this.isOpenAllPermission,this.isBluethConnect,'this.isBluethConnect');
 				// if(this.isBluethConnect){
 				// 	uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
@@ -516,11 +519,10 @@
 						if(me.car_info.online==0){
 							me.loadBluetooth()
 						}
-						// this.isConnectBlueth=app.globalData.connectionState[this.car_info.car_sn]
+						
 						//判断逾期
 						if (resp.data.data.sold_time) return
 						let time = Math.ceil(resp.data.data.hire_end_time - Math.floor(new Date()) / 1000) / 60
-						console.log(time,resp.data.data.hire_end_time,Math.floor(new Date()) / 1000);
 						if (time <= 0) {
 							this.isOverdueShow = true
 							app.globalData.isOverdueShow=true
@@ -578,9 +580,8 @@
 			},
 			tapReturnCar() {
 				this.overdueMoneyFn(this.car_info.car_sn)
-				this.setData({
-					isShowReturnCar: true
-				})
+				this.isShowReturnCar = true
+				console.log(this.isShowReturnCar)
 			},
 			//逾期费用计算
 			async overdueMoneyFn(car_sn) {

pages/loginRegister/register.vue

@@ -118,7 +118,7 @@ export default {
             http.postApi(config.API_REGISTER_EMAIL, {
                 ...this.form
             }, res => {
-                const { msg: title } = res.body
+                const { msg: title } = res.data
                 if (res.succeed) {
                     uni.showToast({ title:this.$t('注册邮件发送成功'), icon: 'none' })
                     this.isSendSucceed = true

pages/my/my.vue

@@ -177,13 +177,12 @@ var request = require('@/common/request.js');
 				}
 			},
 			checkHandle_combo() {
-				
 				if(!this.car_info.sold_time){
 					this.$msg(this.$t('您还未购买车辆，购买车辆才可享受换电套餐'))
 					return
 				}
 				if(!this.car_info.battery_tag_info.tag_code){
-					this.$msg(this.$t('当前没有可更换的电池，购买车辆绑定电池后才可享受换电套餐'))
+					this.$msg(this.$t('当前电池存在未知型号，请联系门店处理！'))
 					return
 				}
 				if(!this.car_info.car_sn){

pages/orderStatus/orderStatus.vue

@@ -3,7 +3,7 @@
 	
 	<view class="container-view">
 		<view class="time-info">
-			<navBar bgColor="transparent" left="0"></navBar>
+			<navigation :scroll='scrollTop' type></navigation>
 			<view>
 				<view v-if="orderInfo.pay_status!=2">
 					<view class="get-time-view flex-row" v-if="orderInfo.pay_status == 0">{{ $t('待支付') }}</view>
@@ -24,8 +24,8 @@
 					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 7">{{ $t('已完成') }}</view>
 					<view class="get-time-view flex-row"
 						v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">{{ $t('已取消') }}</view>
-					<view class="get-time-view flex-row" v-if="orderInfo.order_status == 1 "><text>{{ $t('请于') }}</text><text
-							class="get-car-time">{{tools.formatTimeSecond( orderInfo.pick_up_time)}}</text><text>{{ $t('到门店取车') }}</text>
+					<view class="get-time-view " v-if="orderInfo.order_status == 1 "><text>{{ $t('请于') }}</text><text
+							class="get-car-time">{{tools.formatTimeSecond( orderInfo.pick_up_time)}} </text><text>{{ $t('到门店取车') }}</text>
 					</view>
 					<view v-if="orderInfo.order_status == 10">{{ $t('已完结') }}</view>
 				</block>
@@ -186,7 +186,7 @@
 			<!-- </view> -->
 		</view>
 
-		<view v-if="(orderInfo.hire_begin_time!=0&&orderInfo.hire_end_time!=0)||orderInfo.order_type!=3" class="return-info">
+		<view v-if="(orderInfo.hire_begin_time!=0&&orderInfo.hire_end_time!=0 && orderInfo.order_type!=3) && orderInfo.order_status!=5 && orderInfo.order_status!=6 " class="return-info">
 			<view class="return-top flex-row flex-between">
 				<view>{{ $t('取还时间') }}</view>
 				<view>
@@ -206,6 +206,15 @@
 				<view>{{tools.formatTimeDate(orderInfo.hire_end_time)}}</view> -->
 			</view>
 		</view>
+		
+		<view v-if="orderInfo.order_type == 3" class="return-info">
+			<view class="return-top flex-row flex-between">
+				<view>{{ $t('购买时间') }}</view>
+			</view>
+			<view class="return-bottom flex-row">
+				<view>{{dayjsFn(orderInfo.pay_time)}}</view>
+			</view>
+		</view>
 
 
 		<view v-if="orderInfo.order_status==2||orderInfo.order_status==3||orderInfo.order_status==4"
@@ -254,6 +263,9 @@
 					<view class="grow_1" v-if="(orderInfo.order_status == 5||orderInfo.order_status == 6||orderInfo.order_status == 7||orderInfo.order_status == 8||orderInfo.order_status == 9)">
 						<view  @tap="callStorePhone" class="link-phone-btn">{{$t('联系门店')}}</view>
 					</view>	
+					<view class="grow_1" v-if="orderInfo.order_type == 3">
+						<view  @tap="callStorePhone" class="link-phone-btn">{{$t('联系门店')}}</view>
+					</view>	
 			</view>
 		</block>
 		<!-- <view class="payment-info flex-row flex-between">
@@ -358,6 +370,9 @@
 			PayTypeModel,
 			carPlan
 		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
+		},
 		data() {
 			return {
 				overdueData: {},
@@ -407,6 +422,9 @@
 		computed: {},
 
 		methods: {
+			dayjsFn(time){
+				return dayjs(time * 1000).format('YYYY-MM-DD HH:mm:ss')
+			},
 			getAddressName(latitude, longitude) {
 				const pData = {
 					lng: longitude,
@@ -602,7 +620,10 @@
 					if (resp.data.code === 200) {
 						me.orderInfo = resp.data.data.order_info
 						me.orderInfo.model_images = me.orderInfo.model_images.split(',')[0]
-						me.getAddressName(this.orderInfo.latitude,this.orderInfo.longitude)
+						if(!me.orderInfo.address){
+							me.getAddressName(me.orderInfo.latitude,me.orderInfo.longitude)
+						}
+						
 						// 
 						if (resp.data.data.order_info.model_id) {
 							me.loadCarInfo(resp.data.data.order_info.model_id)

pages/powerSetting/powerSetting.vue

@@ -2,7 +2,7 @@
 		<view class="power-setting-main">
 			<navBar :name="$t('权限设置')" bgColor="transparent"></navBar>
 			<view class="flex-row power-setting-head">
-				<image class="head-img" :src="form.headimg"></image>
+				<image class="head-img" :src="form.headimg || defaultHeadImg"></image>
 				<view class="head-name">{{form.nickname}}</view>
 				<text class="head-email">{{form.email}}</text>
 			</view>
@@ -53,12 +53,16 @@
 <script>
 	var config = require('../../common/config_gyq.js');
 	var http = require('../../common/request.js');
+	import {
+		defaultHeadImg
+	} from '@/common/constant'
 	import {
 		msg
 	} from '../../utils/util.js';
 	export default {
 		data() {
 			return {
+				defaultHeadImg,
 				isSet:"",
 				target_user_id:0,
 				form: {

pages/purchaseOrder/purchaseOrder.vue

@@ -90,13 +90,13 @@
 						<view>{{ $t('车辆租金') }}</view>
 						<view>
 							<!-- ￥{{(leaseTime * price_list[0].hire_price) /100}} -->
-							￥{{price+'x'+modelInfo.count}}
+							{{$t('￥')}}{{price+'x'+modelInfo.count}}
 							<text>{{leaseUnits}}</text>
 						</view>
 					</view>
 					<view class="flex-row flex-between" style="margin-bottom: 44rpx;">
 						<view>{{ $t('车辆押金') }}</view>
-						<view>￥{{modelInfo.deposit /100}}</view>
+						<view>{{$t('￥')}}{{modelInfo.deposit /100}}</view>
 					</view>
 
 					<view class="detail-money flex-row" style="padding-bottom: 44rpx;">

pages/service/components/carRentalList/carRentalList.vue

@@ -36,7 +36,7 @@
 								<view class="flex-row flex-between">
 									<view class="bottom-text">
 										{{ leaseUnitsResult }} <text
-											style="margin-left: 10rpx;">￥</text><text>{{(item.model_list[0].hire_price / 100).toFixed(2)}}</text>
+											style="margin-left: 10rpx;">{{$t('￥')}}</text><text>{{(item.model_list[0].hire_price / 100).toFixed(2)}}</text>
 									</view>
 								</view>
 							</view>
@@ -63,11 +63,11 @@
 								<view class="flex-row flex-between">
 									<view class="bottom-text">
 										{{ leaseUnitsResult }}<text
-											style="margin-left: 10rpx;">￥</text><text>{{(items.hire_price /100).toFixed(2)}}</text>
+											style="margin-left: 10rpx;">{{$t('￥')}}</text><text>{{(items.hire_price /100).toFixed(2)}}</text>
 									</view>
 									<view v-if="items.sell_price && isBuy" class="bottom-text">
 										{{ $t('购买') }}<text
-											style="margin-left: 10rpx;">￥</text><text>{{(items.sell_price /100).toFixed(2)}}</text>
+											style="margin-left: 10rpx;">{{$t('￥')}}</text><text>{{(items.sell_price /100).toFixed(2)}}</text>
 									</view>
 								</view>
 							</view>

pages/userManagement/userManagement.vue

@@ -9,7 +9,7 @@
 			<view class="user-card-text">{{ $t('家人、朋友长期共用车辆，授权账户可以使用感应解锁，寻车定位，查看设置等功能；') }}</view>
 			<!-- <view v-for="(item,index) in userList" :key="index"> -->
 			<view @click="srcFn(`/pages/powerSetting/powerSetting?id=${item.target_user_id}`)" v-for="(item,index) of list" :key="index" class="user-list flex-row align-center">
-				<image class="user-heard-img" :src="item.headimg" mode="aspectFill"></image>
+				<image class="user-heard-img" :src="item.headimg || defaultHeadImg" mode="aspectFill"></image>
 				<view class="user-name-view">
 					<view class="user-name">{{item.nickname}}</view>
 					<view class="user-email">{{item.email}}</view>
@@ -27,9 +27,13 @@
 <script>
 	var config = require('../../common/config_gyq.js');
 	var http = require('../../common/request.js');
+	import {
+		defaultHeadImg
+	} from '@/common/constant'
 	export default {
 		data() {
 			return {
+				defaultHeadImg,
 				list:[],
 				car_info:{}
 			};

utils/util.js

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