Merge branch 'gyq_test' into lw_test

common/config.js

@@ -172,5 +172,8 @@ var config = {
 	API_FLK_REMOVE_SHARE_USER: api_web_url + '?r=flk/car/remove-share-user',
 	//中控
 	API_FLK_CAR_REMOTE_CONTROL: api_web_url + '?r=flk/car/remote-control',
+	//
+	//消息换成已读
+	API_MESSAGE_READ_MESSAGE: api_web_url + '?r=flk/message/read-message',
 };
 module.exports = config;

common/constant.js

@@ -18,10 +18,10 @@ export const LEASE_TYPE_ARR = [
 	{ label: '日租', value: LEASE_TYPE.day, type: 'day', unit: '天' },
 	{ label: '月租', value: LEASE_TYPE.month, type: 'month', unit: '月' },
 	{ label: '年租', value: LEASE_TYPE.year, type: 'year', unit: '年' },
-	{ label: '年租', value: LEASE_TYPE.hour, type: 'hour', unit: '时' },
-	{ label: '年租', value: LEASE_TYPE.minute, type: 'minute', unit: '分' },
-	{ label: '年租', value: LEASE_TYPE.week, type: 'week', unit: '周' },
-	{ label: '年租', value: LEASE_TYPE.quarter, type: 'quarter', unit: '季' },
+	{ label: '时租', value: LEASE_TYPE.hour, type: 'hour', unit: '时' },
+	{ label: '分租', value: LEASE_TYPE.minute, type: 'minute', unit: '分' },
+	{ label: '周租', value: LEASE_TYPE.week, type: 'week', unit: '周' },
+	{ label: '季租', value: LEASE_TYPE.quarter, type: 'quarter', unit: '季' },
 	{ label: '购买', value: LEASE_TYPE.buy, type: 'buy', unit: '买' }
 ]
 export const MAX_LIMITS = {

common/http.js

@@ -1,5 +1,6 @@
 // import common = require("./common");
-const appid = 'wxefa2810018787a41'
+// const appid = 'wxefa2810018787a41'
+const appid = '487987498'
 
 const language = 'zh'
 

common/request.js

@@ -1,6 +1,6 @@
 // import common = require("./common");
-const appid = 'wxefa2810018787a41'
-
+// const appid = 'wxefa2810018787a41'
+const appid = '487987498'
 const language = 'zh'
 
 var common = require('./common.js');

component/allPrice/allPrice.css

@@ -1,10 +1,10 @@
 .container {
 	color: #F95151;
-	font-size: 36rpx;
+	font-size: 32rpx;
 	font-weight: bold;
 	align-items: baseline;
 }
 
 .integer-part {
-	font-size: 60rpx;
+	font-size: 40rpx;
 }

component/carPlan/carPlan.vue

@@ -35,9 +35,8 @@
 			<view class="car-plan-view">
 				<view class="car-plan-title">用车方案</view>
 				<view class="car-plan-list-view flex-row">
-					<view v-for="(item,index) in params.rental_setting" :key="index" @tap="tapSelectType" :class="['flex-row' , (type == item.hire_duration_unit ? 'car-plan-list-i' : 'car-plan-list')] " 
-					:data-price="item.hire_price"
-					:data-select_type="item.hire_duration_unit">
+					<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>
@@ -51,9 +50,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  @tap="tapSelectType" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" 
-					:data-price="params.sell_price"
-					:data-select_type="100">
+					<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 :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>
@@ -155,13 +152,14 @@
 		},
 		mounted() {
 			this.type = this.selectType
+			this.tapSelectType({hire_duration_unit:this.selectType,hire_price:this.params.price*100})
 		},
-		created: function () {
-			console.log(this.params,'this.params');
-			this.setData({
-				price:this.params.price*100,
-			})
-		},
+		// created: function () {
+		// 	console.log(this.params,'this.params');
+		// 	this.setData({
+		// 		price:this.params.price*100,
+		// 	})
+		// },
 		/**
 		 * 组件的方法列表
 		 */
@@ -193,10 +191,10 @@
 				}
 			},
 			tapSelectType(e){
-				const {select_type,price} = e.currentTarget.dataset
-				this.type = select_type
-				this.priceAll = price
-				this.price = price
+				const {hire_duration_unit,hire_price} = e
+				this.type = hire_duration_unit
+				this.priceAll = hire_price
+				this.price = hire_price
 				this.count = 1
 			},
 			closeShowMore(){

component/uploader/uploader.css

@@ -60,7 +60,7 @@
     font-family: PingFangSC, PingFang SC;
     font-weight: 500;
     font-size: 28rpx;
-    color: #FFFFFF;
+    color: #333;
     line-height: 28rpx;
     /* text-align: center; */
     font-style: normal;

manifest.json

@@ -2,8 +2,8 @@
     "name" : "弗兰克",
     "appid" : "__UNI__111A022",
     "description" : "",
-    "versionName" : "1.3.2",
-    "versionCode" : 131,
+    "versionName" : "1.3.4",
+    "versionCode" : 134,
     "transformPx" : false,
     "loadnativePlugins" : false,
     "sassImplementationName" : "node-sass",

pages/activation/activation.vue

@@ -2,11 +2,13 @@
 	<view class="container-view">
 		<view class="return-info">
 			<view class="h5">车辆信息</view>
-			
+
 			<view v-if="overdueMoney" class="return-top  flex-row flex-between">
-				<view style="align-items: baseline;" class="flex-row">逾期费用：<allPrice  :amount="(overdueMoney/100)"/></view>
+				<view style="align-items: baseline;" class="flex-row">逾期费用：
+					<allPrice :amount="(overdueMoney/100)" />
+				</view>
 			</view>
-			
+
 			<view class="return-top  flex-row flex-between">
 				<view>车辆编号：{{car_sn}}</view>
 			</view>
@@ -39,11 +41,12 @@
 		<view class="pictures-info">
 			<view>车辆照片</view>
 			<!-- <view>这里是关于激活车辆照片的文案描述，这里是关于激活车辆照片的文案描述</view> -->
-			<uploaders :max="shopList.flk_hire_car_img_num" :car_info="car_imgs" @update-car-images="handleCarImagesUpdate"></uploaders>
+			<uploaders :max="shopList.flk_hire_car_img_num" :car_info="car_imgs"
+				@update-car-images="handleCarImagesUpdate"></uploaders>
 			<view v-if="isReturnCar" @tap="submitReturn" class="pictures-btn">归还车辆</view>
 			<view v-else @tap="submitEnabled" class="pictures-btn">激活车辆</view>
 		</view>
-		
+
 		<PayTypeModel @closeShow="()=>isShowToBuy=false" @payToOrder="payToOrder" :free_price="totalPrice"
 			:isShowToBuy="isShowToBuy" />
 	</view>
@@ -66,135 +69,160 @@
 		},
 		data() {
 			return {
-				totalPrice:0,
-				isShowToBuy:false,
-				myLocation:{},
-				shopInfo:{},
-				isReturnCar:"",
-				overdueTimes:'',
-				model_id:"",
-				car_sn:"",
-				shopList:{},
-				carInfoData:{},
+				totalPrice: 0,
+				isShowToBuy: false,
+				myLocation: {},
+				shopInfo: {},
+				isReturnCar: "",
+				overdueTimes: '',
+				model_id: "",
+				car_sn: "",
+				shopList: {},
+				carInfoData: {},
 				carInfo: {},
-				overdueMoney:0,
-				overdueTime:0,
+				overdueMoney: 0,
+				overdueTime: 0,
 				sub_sn: '',
 				model_image: '3',
 				car_model: '',
 				return_imgs: [],
 				car_imgs: [],
 				model_image_list: '',
-				_image_list:[]
+				_image_list: []
 			};
 		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
-			console.log(options,'options');
+			this.locationFn()
+			console.log(options, 'options');
 			this.isReturnCar = options.isReturnCar
-			if(options.isReturnCar){
+			if (options.isReturnCar) {
 				uni.setNavigationBarTitle({
-					title:'归还车辆'
+					title: '归还车辆'
 				})
 				this.shopInfoFn()
 			}
-			this.sub_sn =  options.sub_sn || ''
-			this.model_id =  options.model_id || ''
-			this.car_sn =  options.car_sn || ''
-			this.overdueMoney =  options.overdueMoney || ''
-			this.overdueTime =  options.overdueTime || ''
-				
-				this.totalPrice = Number(this.overdueMoney) || 0
+			this.sub_sn = options.sub_sn || ''
+			this.model_id = options.model_id || ''
+			this.car_sn = options.car_sn || ''
+			if (options.overdueMoney == 'undefined' || !options.overdueMoney) {
+				this.overdueMoney = 0
+			} else {
+				this.overdueTime = Number(options.overdueMoney)
+			}
+			if (options.overdueTime == 'undefined' || !options.overdueTime == 'undefined') {
+				this.overdueTime = ''
+			} else {
+				this.overdueTime = options.overdueTime
+			}
+
+			this.totalPrice = Number(this.overdueMoney) || 0
 			this.carDetFn()
 			this.shopSettingFn()
-			
-			
+
+
 		},
 		// API_FLK_CAR_DETAIL
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
-		onShow: function() {
-		},
-		onUnload: function () {
-		},
+		onShow: function() {},
+		onUnload: function() {},
 		methods: {
-			async payToOrder(pay_type){
+			async payToOrder(pay_type) {
 				let milliseconds = new Date().getTime();
 				const current_time = this.overdueTime ? this.overdueTime : parseInt(milliseconds / 1000);
-				
-				let {data} = await request.postApi(config_gyq.API_FLK_CAR_RETURN_CAR,{
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_CAR_RETURN_CAR, {
 					latitude: this.myLocation.latitude,
 					longitude: this.myLocation.longitude,
-					shop_id:this.shopInfo.id,
-					car_sn:this.car_sn,
-					image_list:this._image_list.join(','),
+					shop_id: this.shopInfo.id,
+					car_sn: this.car_sn,
+					image_list: this._image_list.join(','),
 					pay_type,
-					price:this.totalPrice,
+					price: this.totalPrice,
 					current_time
 				})
-				if(data.code == 200){
+				if (data.code == 200) {
 					common.simpleToast('还车成功！')
-					setTimeout(()=> {
+					setTimeout(() => {
 						uni.switchTab({
 							url: `/pages/index/index?plate_number=${this.car_sn}`,
 						});
 					}, 800)
-				}else{
+				} else {
 					common.simpleToast(data.msg)
 				}
 			},
 			async locationFn() {
-				let res = await uni.getLocation()
-				if (res[1]) {
-					this.myLocation = {
-						latitude: res[1].latitude,
-						longitude: res[1].longitude,
+				let _this = this
+				uni.getLocation({
+					success(res) {
+						_this.myLocation = {
+							latitude: res.latitude,
+							longitude: res.longitude,
+						}
+
 					}
-					this.shopInfoFn()
-				}
+				})
 			},
 			//还车
-			async submitReturn(){
-				this._image_list = this.car_imgs.map(item => item.img_url)
+			async submitReturn() {
+				this._image_list = this.car_imgs.map(item => {
+					return item.url
+				})
 				if (this._image_list.length < 1) return common.simpleToast('请上传车辆照片')
-				this.isShowToBuy = true
-				
+				if (this.totalPrice > 0) {
+					this.isShowToBuy = true
+				} else {
+					this.payToOrder(1)
+				}
+
+
 			},
-			async shopInfoFn(){
+			async shopInfoFn() {
 				let res = await uni.getLocation()
-				let {data} = await request.postApi(config.API_NEAR_SHOP_LIST,
-				{
-					limit:1,
+				let {
+					data
+				} = await request.postApi(config.API_NEAR_SHOP_LIST, {
+					limit: 1,
 					latitude: this.myLocation.latitude,
 					longitude: this.myLocation.longitude,
-				}
-				)
-				if(data.code == 200){
-					if(data.data.list.length > 0){
+				})
+				if (data.code == 200) {
+					if (data.data.list.length > 0) {
 						this.shopInfo = data.data.list[0]
-					}else{
+					} else {
 						common.simpleToast('未获取到门店位置！')
 					}
-				}else{
+				} else {
 					common.simpleToast(data.msg)
 				}
 			},
-			async shopSettingFn(){
-				let {data} = await request.postApi(config_gyq.API_FLK_INDEX_SHOP_SETTING,{model_id:this.model_id})
-				if(data.code == 200){
+			async shopSettingFn() {
+				let {
+					data
+				} = await request.postApi(config_gyq.API_FLK_INDEX_SHOP_SETTING, {
+					model_id: this.model_id
+				})
+				if (data.code == 200) {
 					this.shopList = data.data
-				}else{
+				} else {
 					common.simpleToast(data.msg)
 				}
 			},
-			async carDetFn(){
-				let {data} = await request.postApi(config.API_FLK_CAR_DETAIL,{car_sn:this.car_sn})
-				if(data.code == 200){
+			async carDetFn() {
+				let {
+					data
+				} = await request.postApi(config.API_FLK_CAR_DETAIL, {
+					car_sn: this.car_sn
+				})
+				if (data.code == 200) {
 					this.carInfoData = data.data
-				}else{
+				} else {
 					common.simpleToast(data.msg)
 				}
 			},
@@ -202,7 +230,7 @@
 				// 这里会接收到子组件传来的更新后的图片URL数组
 				this.car_imgs = updatedImages
 			},
-			
+
 			submitEnabled() {
 				const me = this
 				const _image_list = this.car_imgs.map(item => item.img_url)

pages/carDetail/carDetail.vue

@@ -1,84 +1,88 @@
 <template>
-	<view class="">
+	<view>
+	<view class="car-detail-main">
 		<navBar type="carDetail"/>
-		<view class="car-detail-main">
-			<view v-if="car_detail.image" class="flex-row">
-				<img style="width: 600rpx;height: 406rpx; margin: auto; margin-bottom: 20rpx;" :src="car_detail.image"
-					alt="">
+		<view v-if="car_detail.image" class="flex-row">
+			<img style="width: 600rpx;height: 406rpx; margin: auto; margin-bottom: 20rpx;" :src="car_detail.image"
+				alt="">
+		</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>
-			<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" @tap="tapSelectType" :data-price="item.hire_price"
-						:data-select_type="item.hire_duration_unit"
-						:class="['time-unit',selectType==item.hire_duration_unit? 'time-unit-i':'']">
-						<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>
-					</view>
-					
-					<view @tap="tapSelectType" :data-select_type="100" :data-price="car_detail.sell_price"
-						:class="['time-unit',selectType==100? 'time-unit-i':'']">购买</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">日租</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>
 				</view>
+
+				<view @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>
-			<!-- <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="">
-						<text class="free-num-text">免费换电次数</text>
-					</view>
-					<view class="free-num-time">1 次/日</view>
+		</view>
+		<!-- <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="">
+					<text class="free-num-text">免费换电次数</text>
 				</view>
-				<view class="free-num-tip">日租享1次免费换电数，超出后需要单独支付换电费用；</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 class="free-num-time">1 次/日</view>
+			</view>
+			<view class="free-num-tip">日租享1次免费换电数，超出后需要单独支付换电费用；</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>
 				</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>
+				<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="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 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 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="">
-								<img style="width: 112rpx;height: 64rpx;" src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
-							</view>
-							
+						<view @tap="">
+							<img style="width: 112rpx;height: 64rpx;"
+								src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
 						</view>
+
 					</view>
 				</view>
 			</view>
 		</view>
-		<rich-text v-if="car_detail.desc" class="rich_text" :nodes="car_detail.desc"></rich-text>
-		<view v-else style="height: 150rpx;"></view>
+		<view style="height: 150rpx;"></view>
 		<view class="use-car-view flex-row">
 			<view @tap="useCarBtn" class="use-car-btn">我要用车</view>
 		</view>
-		<carPlan v-if="showCarPlan" @changeSelectType="changeSelectType" @closeShowMore="closeShowMore" :params="params" :selectType="selectType"/>
+		<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>
@@ -106,8 +110,8 @@
 					longitude: 113.324004,
 				},
 				destance: 0,
-				price:0,
-				params:{}
+				price: 0,
+				params: {}
 			};
 		},
 		components: {
@@ -116,51 +120,52 @@
 			allPrice
 		},
 		onLoad: function(options) {
-			if(options.model_id){
-				this.model_id= options.model_id
+			if (options.model_id) {
+				this.model_id = options.model_id
 				this.locationFn()
 			}
 			// this.loadCarInfo()
 			// getFlatternDistance 获取直线距离
 		},
 		methods: {
-			 locationFn() {
-				 let _this = this
-					 uni.getLocation({
-						 success(res) {
-						 	_this.loadCarInfo(res.longitude, res.latitude)
-						 	
-						 }
-					 })
-				},
-			 loadCarInfo(latitude,longitude) {
+			locationFn() {
+				let _this = this
+				uni.getLocation({
+					success(res) {
+						_this.loadCarInfo(res.longitude, res.latitude)
+					}
+				})
+			},
+			loadCarInfo(latitude, longitude) {
 				const me = this
 				http.postApi(config.API_FLK_INDEX_CAR_MODEL_DETAIL, {
-					model_id:me.model_id,
+					model_id: me.model_id,
 					latitude: latitude,
 					longitude: longitude,
 				}, (resp) => {
 					if (resp.data.code === 200) {
+						me.tapSelectType(resp.data.data.rental_setting[0])
+						resp.data.data.distance = common.formatDistance(Number(resp.data.data.distance))
 						me.setData({
-							car_detail:resp.data.data,
-							price:((resp.data.data.rental_setting[0]?.hire_price || 0)/100).toFixed(2)
+							car_detail: resp.data.data,
+							price: ((resp.data.data.rental_setting[0]?.hire_price || 0) / 100).toFixed(2)
 						})
 					} else {
 						common.simpleToast(resp.data.msg);
 					}
 				})
 			},
-			
-			
 			tapSelectType(e) {
-				const {select_type,price} = e.currentTarget.dataset
-				console.log(select_type,price,'select_type,price');
+				const {
+					hire_duration_unit,
+					hire_price
+				} = e
 				this.setData({
-					selectType: select_type,
-					price:(price/100).toFixed(2)
+					selectType: hire_duration_unit,
+					price: (hire_price / 100).toFixed(2)
 				})
 			},
-			tapCallPhone(){
+			tapCallPhone() {
 				const me = this
 				const phone = this.car_detail.link_phone
 				// const phone = 18170410707
@@ -180,7 +185,7 @@
 					fail: (res) => {}
 				})
 			},
-			navAddress(){
+			navAddress() {
 				const {
 					address,
 					latitude,
@@ -193,28 +198,28 @@
 					scale: 15,
 					name: shop_name,
 					address: address,
-					success: function (res) {},
+					success: function(res) {},
 				})
 			},
-			useCarBtn(){
-				const pData={
+			useCarBtn() {
+				const pData = {
 					...this.car_detail,
-					price:this.price
+					price: this.price
 				}
 				this.setData({
-					showCarPlan:true,
-					params:pData
+					showCarPlan: true,
+					params: pData
 				})
 			},
-			changeSelectType(select_type,price){
+			changeSelectType(select_type, price) {
 				this.setData({
 					selectType: select_type,
-					price:(price/100).toFixed(2)
+					price: (price / 100).toFixed(2)
 				})
 			},
-			closeShowMore(){
+			closeShowMore() {
 				this.setData({
-					showCarPlan:false
+					showCarPlan: false
 				})
 			}
 		}
@@ -222,4 +227,4 @@
 </script>
 <style>
 	@import './carDetail.css';
-</style>
+</style>

pages/index/index.vue

@@ -10,7 +10,7 @@
 							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"></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>
@@ -98,7 +98,7 @@
 								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">{{$t("请先链接蓝牙")}}</view>
+							<view class="flex-row tip-text-config">{{$t("请先连接蓝牙")}}</view>
 						</view>
 						<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 					</view>
@@ -506,10 +506,16 @@
 
 		.num {
 			position: absolute;
-			right: 0;
-			top: 0;
-			width: 15rpx;
-			height: 15rpx;
+			right: -6rpx;
+			top: -6rpx;
+			min-width: 28rpx;
+			height: 28rpx;
+			font-size: 18rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			line-height: 1;
 			background-color: #FA2918;
 			border-radius: 50%;
 		}

pages/loginRegister/register.vue

@@ -59,8 +59,8 @@ export default {
         }
     },
     computed: {
-        noticeText({ email }) {
-            return `我们向 <span style="color: #0A59F7;">${email}</span> 发送了一封注册邮件，请您登录邮箱点击链接完成注册。`
+        noticeText({ form }) {
+            return `我们向 <span style="color: #0A59F7;">${form.email}</span> 发送了一封注册邮件，请您登录邮箱点击链接完成注册。`
         },
         isSubmt({ form }) {
             return form.email && form.passwd && form.second_passwd

pages/message/index.vue

@@ -5,7 +5,7 @@
             <view class="row">
                 <view class="title">
                     <view>{{ $t('设备消息') }}</view>
-                    <view class="bage">{{ item.unread }}</view>
+                    <view v-if="item.unread > 0" class="bage">{{ item.unread }}</view>
                 </view>
                 <view class="time">{{item.message_date}}</view>
             </view>
@@ -18,7 +18,7 @@
             </view>
         </view>
         
-        <view class="sys-msg-wrap base-wrap">
+        <view style="margin-top: 20rpx;" class="sys-msg-wrap base-wrap">
             <view class="title">{{ $t('系统消息') }}</view>
             <view class="msg-item" v-for="(item, index) in sysMsgList" :key="index">
                 <view class="msg">
@@ -35,6 +35,7 @@
 <script>
 const config = require('@/common/config.js');
 const http = require('@/common/http.js');
+const request = require('@/common/request.js');
 const common = require('@/common/common.js');
 export default {
     data() {
@@ -48,10 +49,12 @@ export default {
     created() {
         this.querySysMsgList()
         this.queryDeviceMsg()
-        // http.postApi(config.API_MESSAGE_DTL, { id: '7' }, res => {
-        // })
+		this.readMessage()
     },
     methods: {
+		async readMessage(){
+			await request.postApi(config.API_MESSAGE_READ_MESSAGE,{msg_type:2,car_id:0})
+		},
         toDeviceMsgPage(itemData) {
             const { car_id } = itemData
             uni.navigateTo({ url: `/pages/message/deviceInfo?car_id=${car_id}` })

pages/my/my.scss

@@ -3,12 +3,12 @@
 .container-view {
     padding: 36rpx 32rpx 264rpx;
     box-sizing: border-box;
-
     .user-switch-row {
         display: flex;
         align-items: center;
         justify-content: flex-end;
-
+		padding: 20rpx;
+		margin-top: 20rpx;
         .name-wrap {
             font-family: DIN, DIN;
             font-weight: 500;
@@ -16,11 +16,9 @@
             color: #060809;
             display: flex;
             align-items: center;
-
             &:active {
                 opacity: .8;
             }
-
             &::before {
                 content: "";
                 width: 48rpx;
@@ -29,7 +27,6 @@
                 background: url('https://qiniu.bms16.com/FghCVNMWDBKJpqbIrqoxT-de9Has');
                 background-size: 100%;
             }
-
             &::after {
                 content: "";
                 width: 28rpx;
@@ -39,7 +36,6 @@
                 background-size: 100%;
             }
         }
-
         .message {
             width: 48rpx;
             height: 48rpx;

pages/my/my.vue

@@ -7,11 +7,11 @@
 		<view :style="{height: `${statusBarHeight}px`}"></view>
 		<!-- #endif -->
 		
-		<view class="user-switch-row">
-			<view class="news">
-				<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num"></view>
+		<view  class="user-switch-row">
+			<view  @click="routerLink({ url: '/pages/message/index' })" class="news">
+				<view v-if="(newsList.plate_count + newsList.device_count) > 0" class="num">{{newsList.plate_count + newsList.device_count}}</view>
 				<image :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"
-					@tap="routerLink({ url: '/pages/message/index' })" />
+					 />
 			</view>
 		</view>
 		<view class="user-info-wrap" @tap="loginHandle">
@@ -181,6 +181,7 @@ var request = require('@/common/request.js');
 				jumpCheck,
 				statues
 			}) {
+				console.log(url)
 				if(statues){
 					return
 				}
@@ -188,7 +189,7 @@ var request = require('@/common/request.js');
 					this[`checkHandle_${jumpCheck}`]()
 					return
 				}
-				console.log(url)
+				
 				uni.navigateTo({
 					url
 				})
@@ -201,14 +202,21 @@ var request = require('@/common/request.js');
 	@import './my.scss';
 	.news{
 		position: relative;
-		.num{
+		.num {
 			position: absolute;
-			right: 0;
-			top: 0;
-			width: 15rpx;
-			height: 15rpx;
+			right: -6rpx;
+			top: -6rpx;
+			min-width: 28rpx;
+			height: 28rpx;
+			font-size: 18rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			line-height: 1;
 			background-color: #FA2918;
 			border-radius: 50%;
+			z-index: 9999;
 		}
 	}
 </style>

pages/orderStatus/orderStatus.vue

@@ -14,7 +14,6 @@
 				</view>
 				<view v-if="orderInfo.order_status == 1 && orderInfo.hire_begin_time">
 					{{('请于'+orderInfo.hire_begin_times+'到门店取车')}}
-
 				</view>
 				<view v-if="orderInfo.order_status == 1 && !orderInfo.hire_begin_time">
 					待取车

pages/purchaseOrder/purchaseOrder.css

@@ -224,6 +224,9 @@
 	border-radius: 50%;
 	text-align: center;
 }
+.second{
+	padding: 28rpx 32rpx 32rpx;
+}
 .payment-info {
 	position: fixed;
 	bottom: 0;
@@ -273,9 +276,11 @@
 	font-size: 28rpx;
 	font-weight: bold;
 	margin-left: 16rpx;
+	display: flex;
+	align-items: center;
 }
 
-.bottom-left img {
+.bottom-left .img {
 	width: 49rpx;
 	height: 49rpx;
 	vertical-align: middle;
@@ -323,15 +328,15 @@
 
 .pay-money>view {
 	color: #2A3A5A;
-	font-size: 36rpx;
+	font-size: 30rpx;
 	font-weight: bold;
 }
 
 .pay-money>view:nth-of-type(1) {
 	color: #2A3A5A;
-	font-size: 40rpx !important;
+	font-size: 34rpx;
 	font-weight: bold;
-	line-height: 40rpx;
+	line-height: 34rpx;
 }
 
 .detail-money {
@@ -342,7 +347,7 @@
 
 .detail-money>view:nth-of-type(1) {
 	color: #2A3A5A;
-	font-size: 36rpx;
+	font-size: 32rpx;
 }
 
 .detail-money>view:nth-of-type(2) {

pages/purchaseOrder/purchaseOrder.vue

@@ -44,7 +44,7 @@
 		<view class="method-info">
 			<view class="flex-row flex-between" style="margin-bottom: 40rpx;">
 				<view class="font_32">前往门店取还</view>
-				<view class="font_32">门店距您 <text class="distance-num">{{modelInfo.distance}}m</text></view>
+				<view class="font_32">门店距您 <text class="distance-num">{{modelInfo.distance}}</text></view>
 			</view>
 			<view @tap="navAddress" class="shop-bg flex-row flex-between">
 				<view class="shop-name-view">
@@ -68,12 +68,14 @@
 			<view class="payment-bottom flex-row flex-between">
 				<view style="margin-right: 20rpx;" class="bottom-left flex-row">
 					<allPrice :amount="totalPrice"></allPrice>
-					<view v-if="modelInfo.selectType != 100" @tap="bindDetail" class="all-money">明细<img
-							src="https://qiniu.bms16.com/Fvl1d-AWRvwY_ehNrw7bMZOK6LBZ" /></view>
+					<view v-if="modelInfo.selectType != 100" @tap="bindDetail" class="all-money">明细
+							<image class="img" src="https://qiniu.bms16.com/Fvl1d-AWRvwY_ehNrw7bMZOK6LBZ" mode=""></image>
+							</view>
 				</view>
 				<view @tap="navToPage">确认下单</view>
 			</view>
 		</view>
+		
 		<view v-else class="show-detail">
 			<view class="detail-info">
 				<view class="pay-money">
@@ -98,16 +100,17 @@
 					</view>
 
 					<view class="detail-money flex-row" style="padding-bottom: 44rpx;">
-						<view>支付金额</view>
+						<view style="margin-right: 20rpx;">支付金额</view>
 						<allPrice :amount="totalPrice"></allPrice>
 					</view>
 				</view>
 				<view class="second">
 					<view class="payment-bottom flex-row flex-between">
-						<view class="bottom-left flex-row">
+						<view style="margin-right: 20rpx;" class="bottom-left flex-row">
 							<allPrice :amount="totalPrice"></allPrice>
-							<view @tap="isShowDetail = false" class="all-money">明细<img
-									src="https://qiniu.bms16.com/FkzZI0r5jO-c2JRahNkZW2pHb9dR" /></view>
+							<view @tap="isShowDetail = false" class="all-money">明细
+									<image class="img"  src="https://qiniu.bms16.com/FkzZI0r5jO-c2JRahNkZW2pHb9dR" mode=""></image>
+									</view>
 						</view>
 						<view @tap="navToPage">确认下单</view>
 					</view>
@@ -145,7 +148,7 @@
 				</view>
 			</view>
 		</view>
-		<PayTypeModel @closeShow="closeShow" @payToOrder="payToOrder" :free_price="Number(totalPrice)"
+		<PayTypeModel @closeShow="closeShow" @payToOrder="payToOrder" :free_price="Number(totalPrice) * 100"
 			:isShowToBuy="isShowToBuy" />
 	</view>
 </template>

pages/service/components/carRentalList/carRentalList.css

@@ -4,9 +4,10 @@
 	padding: 32rpx;
 	margin-bottom: 20rpx;
 }
-.store-card.active{
+
+.store-card.active {
 	border: 4rpx solid #0A59F7;
-	background: linear-gradient( 180deg, #EEFDFF 0%, rgba(255,255,255,0) 100%), #FFFFFF;
+	background: linear-gradient(180deg, #EEFDFF 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF;
 }
 
 .card-top-style>view:nth-of-type(1) {
@@ -14,20 +15,15 @@
 	font-size: 36rpx;
 	font-weight: bold;
 	margin-bottom: 20rpx;
+	width: 460rpx;
+	text-align: left;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 }
-.card-center-ren .store-type{
-	border-radius: 8rpx;
-	border: 2rpx solid #0A59F7;
-	text-align: center;
-	font-weight: 600;
-	padding: 12rpx 20rpx;
-	line-height: 20rpx;
-	font-size: 24rpx;
+
+.card-center-ren .store-type {
 	color: #0A59F7;
-	margin-right: 12rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
 }
 
 .card-top-style>view:nth-of-type(2) {
@@ -45,6 +41,7 @@
 	padding-left: 18rpx;
 	padding-right: 18rpx;
 }
+
 .align-c {
 	display: flex;
 	align-items: center;
@@ -53,7 +50,7 @@
 	color: #060809;
 }
 
-.card-center-ren view {
+.card-center-ren .tag {
 	margin-right: 12rpx;
 	font-size: 22rpx;
 	color: #2A3A5A;
@@ -75,9 +72,11 @@
 	font-style: normal;
 	margin-right: 4rpx;
 }
-.card-bottom{
+
+.card-bottom {
 	margin-bottom: 36rpx;
 }
+
 .card-bottom img,
 .second-view image {
 	width: 160rpx;
@@ -96,6 +95,10 @@
 	font-size: 32rpx;
 	font-weight: bold;
 	margin-bottom: 16rpx;
+	width: 310rpx;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
 }
 
 .bottom-item>view:nth-of-type(2) {
@@ -168,7 +171,8 @@
 	text-align: center;
 	margin-top: 40rpx;
 }
-.time-style-view{
+
+.time-style-view {
 	font-weight: 400;
 	font-size: 26rpx;
 	color: #828DA2;

pages/service/components/carRentalList/carRentalList.vue

@@ -1,23 +1,22 @@
 <template>
 	<view>
-		<block v-if="near_store_list.length>=2">
+		<block>
 			<view :class='{"active" : activeMarkersId == item.id}' class="store-card" v-if="item.admin_id"  @click="navToStore(item.admin_id)" v-for="(item, index) in near_store_list" :key="index">
 				<view>
 					<view class="card-top-style flex-row flex-between">
-						<view>{{item.shop_name}}</view>
+						<view class="shop_name">{{item.shop_name}}</view>
 						<view>{{item.distance}}</view>
 					</view>
 					<view class="card-center-ren flex-row">
-						<view v-for="(items,indexs) of item.business_list" :key="indexs" class="store-type">
+						<view style="color: #0A59F7;border-color: #0A59F7;" v-for="(items,indexs) of item.business_list" :key="indexs" class=" tag align-c">
 							{{items.title}}
 						</view>
-						<view class="align-c">
+						<view class="align-c tag">
 							<text class="card-center-num">{{item.model_list.length}}</text>
 							款车型
 						</view>
 					</view>
 				</view>
-				
 				<view v-if="item.model_list.length===1">
 					<view class="card-bottom card-first flex-row">
 						<view class="second-view flex-row">
@@ -74,7 +73,7 @@
 								src="https://qiniu.bms16.com/Ft0YA1JYmq66hdoeEN-PgBHy5vLa"  mode=""></image>
 						</view>
 						<view style="margin-left: 20rpx;">
-							<image style="width: 112rpx;height: 64rpx;"
+							<image @click="bindToNav(item)" style="width: 112rpx;height: 64rpx;"
 								src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" mode=""></image>
 								
 						</view>
@@ -154,7 +153,33 @@
 			// }
 		},
 		methods: {
-			callFn(tel){
+			bindToNav(item) {
+				const {
+					latitude,
+					longitude,
+					shop_name
+				} = item
+				uni.openLocation({
+					latitude: latitude - 0,
+					longitude: longitude - 0,
+					scale: 15,
+					name: shop_name,
+				})
+			},
+			callFn(){
+				uni.showModal({
+					content: `您是否要拨打电话${tel}？`,
+					confirmText: '确定',
+					success: (res) => {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: tel,
+								success() {},
+								fail() {}
+							})
+						}
+					},
+				})
 				uni.makePhoneCall({
 					phoneNumber: tel 
 				});

pages/service/components/leaseType/leaseType.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="container-view-contril">
-		<u-popup v-model="showLeaseType" :closeable="false" mode="bottom" border-radius="32">
+		<u-popup v-model="showLeaseType" :mask-close-able='false' :closeable="false" mode="bottom" border-radius="32">
 		    <view class="bottom-popup">
 		        <view class="title">{{ selectType == 'cabinet' ? '车辆类型' : '用车方案' }}</view>
 		        <view class="item-wrap">

pages/service/service.css

@@ -126,7 +126,7 @@
 	align-items: center;
 }
 .control-icon-view{
-	position: fixed;
+	position: absolute;
 	top:43vh ;
 	padding: 0 24rpx;
 	width: 95%;

pages/service/service.vue

@@ -20,7 +20,7 @@
 		<!-- #endif -->
 
 		<!-- 地图控件 -->
-		<cover-view :class="[
+		<cover-view @click="isSearch = false" :class="[
         'control-icon-view',
         'flex-row',
         isSearch ? 'flex-between' : 'flex-end',
@@ -31,6 +31,7 @@
 					class="current-location-icon"
 					src="https://qiniu.bms16.com/FgLe8FKDOzgt3wxi2lZt-yQGmbP3"></cover-image></cover-view> -->
 		</cover-view>
+		
 		<view class="store-cabinet-block">
 			<view class="block-p"></view>
 			<view v-if="isSearch" class="search-view flex-row">
@@ -69,6 +70,7 @@
 		</view>
 		<leaseType :showLeaseType="showLeaseType" :selectType="selectType" :modelTypeList="modelTypeList"
 			@closeSelectType="closeSelectType" @checkCabinetType="checkCabinetType" />
+			
 		<CustomTabbar curt-tab="service" />
 	</view>
 </template>
@@ -111,7 +113,7 @@
 				polylines: [],
 				mapContext: null, // map上下文
 				isSearch: false, //是否处于搜索状态
-				inputSearchValue: "123",
+				inputSearchValue: "",
 				isFocused: false,
 				showLeaseType: false,
 				modelTypeList: [],

pages/storeDetails/storeDetails.css

@@ -214,6 +214,11 @@
 	font-size: 32rpx;
 	color: #060809;
 	margin-bottom:16rpx;
+	width: 410rpx;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+	display: block;
 }
 .car-model-info{
 	font-weight: 400;

pages/storeDetails/storeDetails.vue

@@ -14,7 +14,7 @@
 			<image v-else class="bg-img" src="https://qiniu.bms16.com/FhRnr7rADHHsOFfpWO4duD15SgIt" mode="aspectFill">
 			</image>
 		</view>
-		
+
 		<view class="p-bg">
 			<view class="store-info-view">
 				<view class="store-name">{{storeInfo.shop_name}}</view>
@@ -38,7 +38,7 @@
 							</view>
 						</view>
 						<view v-if="storeInfo.work_begin_time" class="grid_text_2">
-							{{storeInfo.work_begin_time[0]}}:{{storeInfo.work_begin_time[1]}}-{{storeInfo.work_end_time[0]}}:{{storeInfo.work_end_time[1]}}
+							{{storeInfo.work_begin_time.split(':')[0]}}:{{storeInfo.work_begin_time.split(':')[1]}}-{{storeInfo.work_end_time.split(':')[0]}}:{{storeInfo.work_end_time.split(':')[1]}}
 						</view>
 					</view>
 					<view @tap="bindToNav" class="right_grid flex-between">
@@ -55,58 +55,67 @@
 					</view>
 				</view>
 			</view>
-			
-			
+
+
 			<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: 86rpx;height: 80rpx;" src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi"
-						mode='aspectFill'></image>
+					<image style="width: 144rpx;height: 40rpx;"
+						src="https://qiniu.bms16.com/FjUW1kuRvXWTEftyn9nH1AbGWuxK" mode='aspectFit'></image>
+					<image style="width: 86rpx;height: 80rpx;"
+						src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi" mode='aspectFill'></image>
 					<view class="w-bg flex-row"></view>
 				</view>
 				<view class="step-view flex-row  align-center">
 					<view class="icon-list-view">
-						<image class="img1" src="https://qiniu.bms16.com/Fp0BE27Q0VTD8qUJRHUVhWO6VEbO" mode='aspectFit'></image>
+						<image class="img1" src="https://qiniu.bms16.com/Fp0BE27Q0VTD8qUJRHUVhWO6VEbO" mode='aspectFit'>
+						</image>
 					</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">
 					<view class="step-tip-text">
-						<image class="step-num-1" src="https://qiniu.bms16.com/Fm4gMRmW6UOwLcU-eW8LDLNfiUJe" mode='aspectFill'>
+						<image class="step-num-1" src="https://qiniu.bms16.com/Fm4gMRmW6UOwLcU-eW8LDLNfiUJe"
+							mode='aspectFill'>
 						</image>线上选择用车方案生成待支付订单
 					</view>
 					<view class="step-tip-text">
-						<image class="step-num-2" src="https://qiniu.bms16.com/FvYN7SxOYIhXEqSAJZrQIBQuTx79" mode='aspectFill'>
+						<image class="step-num-2" src="https://qiniu.bms16.com/FvYN7SxOYIhXEqSAJZrQIBQuTx79"
+							mode='aspectFill'>
 						</image>导航到店向商家支付订单金额
 					</view>
 					<view class="step-tip-text">
-						<image class="step-num-3" src="https://qiniu.bms16.com/FhZ7w0X8iVuxFPdetEF9C3YYkJ7Z" mode='aspectFill'>
+						<image class="step-num-3" src="https://qiniu.bms16.com/FhZ7w0X8iVuxFPdetEF9C3YYkJ7Z"
+							mode='aspectFill'>
 						</image>支付完成后直接现场取车
 					</view>
 				</view>
 			</view>
-			
-			
-			
-			<view class="unit-type-view">
+
+
+
+			<!-- 	<view class="unit-type-view">
 				<view @click="status = 0;modelListsFn()" class="unit-type " :class="{'unit-type-i' : status == 0}">短租
 				</view>
 				<view @click="status = 1;modelListsFn()" class="unit-type" :class="{'unit-type-i' : status == 1}">长租
 				</view>
 				<view @click="status = 2;modelListsFn()" class="unit-type " :class="{'unit-type-i' : status == 2}">出售
 				</view>
+			</view> -->
+
+			<view class="unit-type-view">
+				<view v-for="(item,index) of tagList" :key="index" @click="tagId = item;modelListsFn()"
+					class="unit-type " :class="{'unit-type-i' : item == tagId}">{{typeArrFn(item)}}
+				</view>
 			</view>
-			
 			<view class="car-info-list-view">
 				<view v-for="(item,index) of modelListsFn()" :key="index" class="car-info-view align-center flex-row">
 					<!-- <img class="car-img" src="https://qiniu.bms16.com/FsxOysJT2V3KNYev2YWadvjyKn2j" alt=""> -->
@@ -116,9 +125,7 @@
 						<view class="car-model-info">续航{{item.endurance}}km｜重量{{item.weight}}kg</view>
 						<view class="flex-row flex-between">
 							<view class="unit-type-price flex-row">
-								<text v-if="status == 0" style="margin-right: 8rpx;">短租</text>
-								<text v-if="status == 1" style="margin-right: 8rpx;">长租</text>
-								<text v-if="status == 2" style="margin-right: 8rpx;">出售</text>
+								<text style="margin-right: 8rpx;">{{typeArrFn(tagId)}}</text>
 								<priceTool :price="Number(item.money)" :font_size="40" />
 							</view>
 							<view @click="srcFn(`/pages/carDetail/carDetail?model_id=${item.model_id}`)"
@@ -139,6 +146,11 @@
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
 	import priceTool from '@/component/priceTool/priceTool';
+	import {
+		MAX_LIMITS,
+		LEASE_TYPE_ARR
+	} from '@/common/constant.js';
+	import aaaa from './aaaa.vue';
 	// import UseGuidance from '@/component/useGuidance/useGuidance';
 	export default {
 		components: {
@@ -147,7 +159,9 @@
 		},
 		data() {
 			return {
-				shop_id:0,
+				tagId: 0,
+				tagList: [],
+				shop_id: 0,
 				status: 0,
 				shop_image: [],
 				storeInfo: {
@@ -160,11 +174,11 @@
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
-		onLoad:  function(options) {
+		onLoad: function(options) {
 			console.log(options, 'options');
 			this.shop_id = options.admin_id || ''
 			this.locationFn()
-			
+
 		},
 		/**
 		 * 生命周期函数--监听页面显示
@@ -177,133 +191,128 @@
 				let obj = []
 				for (let index = 0; index < this.storeInfo.model_list.length; index++) {
 					let item = this.storeInfo.model_list[index];
-					if(item.sell_price){
+					if (this.tagId == 100 && item.sell_price) {
 						obj.push({
 							...item,
-							money:(item.sell_price / 100).toFixed(2)
+							money: (item.sell_price / 100).toFixed(2)
 						})
-					}
-					for (var i = 0; i < item.price_setting.length; i++) {
-						var items = item.price_setting[i];
-						let money = (items.hire_price / 100).toFixed(2)
-						if (!item.sell_price && this.status == 0 && (items.hire_duration_unit == 1 || items.hire_duration_unit == 4 || items
-								.hire_duration_unit == 5 || items.hire_duration_unit == 6)) {
-							obj.push({
-								...item,
-								money
-							})
-							break
-						}
-						if (!item.sell_price && this.status == 1 && (items.hire_duration_unit == 2 || items.hire_duration_unit == 3 || items
-								.hire_duration_unit == 4)) {
-							obj.push({
-								...item,
-								money
-							})
-							break
+					} else if (this.tagId != 100) {
+						for (let i = 0; i < item.price_setting.length; i++) {
+							var items = item.price_setting[i];
+							let money = (items.hire_price / 100).toFixed(2)
+							if (items.hire_duration_unit == this.tagId) {
+								obj.push({
+									...item,
+									money
+								})
+							}
 						}
+					}
 				}
-			}
-			return obj
-	},
-	 locationFn() {
-			let _this = this
-			uni.getLocation({
-				success(res) {
-					_this.loadStoreDetail(_this.shop_id, res.longitude, res.latitude)
-					
-				}
-			})
-		},
-		srcFn(url) {
-			uni.navigateTo({
-				url
-			})
-		},
-		isWorkTimerFn() {
-			this.storeInfo.work_end_time = ''
-			this.storeInfo.work_end_time = ''
-		},
-		loadStoreDetail(shop_id, longitude, latitude) {
-			const me = this
-			console.log(shop_id)
-			console.log(longitude)
-			console.log(latitude)
-			http.postApi(config.API_NEAR_SHOP_INFO, {
-				shop_id,
-				longitude,
-				latitude,
-			}, (resp) => {
-				if (resp.data.code === 200) {
-					me.setData({
-						storeInfo: resp.data.data.info
-					})
-					this.storeInfo.distance = common.formatDistance(Number(this.storeInfo.distance))
-					this.shop_image = JSON.parse(resp.data.data.info.shop_image) || []
-					var cabinetInfo = resp.data.data.info
-					this.storeInfo.work_begin_time = (cabinetInfo.work_begin_time == null ? '00:00:00' :
-						cabinetInfo
-						.work_begin_time).split(':')
-					this.storeInfo.work_end_time = (cabinetInfo.work_end_time == null ? '00:00:00' :
-						cabinetInfo
-						.work_end_time).split(':')
-					this.isWorkTimer = this.isWithinTimeRange(cabinetInfo.work_begin_time,
-						cabinetInfo.work_end_time)
-				} else {
-					common.simpleToast(resp.data.msg)
-				}
-			})
-		},
-		isWithinTimeRange(startTime, endTime) {
-			// 获取当前时间
-			const now = new Date();
-			const currentMinutes = now.getHours() * 60 + now.getMinutes();
+				return obj
+			},
 
-			// 将传入的时间转换为分钟
-			const [startHour, startMinute] = startTime.map(Number);
-			const [endHour, endMinute] = endTime.map(Number);
+			typeArrFn(type) {
+				if (!type) return ''
+				const result = LEASE_TYPE_ARR.find(v => v.value == type);
+				return result.label
+			},
+			locationFn() {
+				let _this = this
+				uni.getLocation({
+					success(res) {
+						_this.loadStoreDetail(_this.shop_id, res.longitude, res.latitude)
 
-			const startMinutes = startHour * 60 + startMinute;
-			const endMinutes = endHour * 60 + endMinute;
+					}
+				})
+			},
+			srcFn(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+			isWorkTimerFn() {
+				this.storeInfo.work_end_time = ''
+				this.storeInfo.work_end_time = ''
+			},
 
-			// 判断当前时间是否在指定范围内
-			return currentMinutes >= startMinutes && currentMinutes <= endMinutes;
-		},
-		tapPhone() {
-			const me = this
-			uni.showModal({
-				content: `您是否要拨打电话${me.storeInfo.link_phone}？`,
-				confirmText: '确定',
-				success: (res) => {
-					if (res.confirm) {
-						me.clearTimer()
-						uni.makePhoneCall({
-							phoneNumber: me.storeInfo.link_phone,
-							success() {},
-							fail() {}
+			loadStoreDetail(shop_id, longitude, latitude) {
+				const me = this
+				http.postApi(config.API_NEAR_SHOP_INFO, {
+					shop_id,
+					longitude,
+					latitude,
+				}, (resp) => {
+					if (resp.data.code === 200) {
+						me.setData({
+							storeInfo: resp.data.data.info
 						})
+						let arr = []
+						resp.data.data.info.model_list.map(item => {
+							if (item.sell_price) {
+								arr.push(100)
+							}
+							item.price_setting.map(item => {
+								arr.push(item.hire_duration_unit)
+							})
+
+						})
+
+						this.tagList = Array.from(new Set(arr));
+						this.tagId = this.tagList[0] || 0
+						this.storeInfo.distance = common.formatDistance(Number(this.storeInfo.distance))
+
+						this.shop_image = resp.data.data.info.shop_image || []
+						var cabinetInfo = resp.data.data.info
+						this.storeInfo.work_begin_time = (cabinetInfo.work_begin_time == null ? '00:00:00' :
+							cabinetInfo
+							.work_begin_time)
+						this.storeInfo.work_end_time = (cabinetInfo.work_end_time == null ? '00:00:00' :
+							cabinetInfo
+							.work_end_time)
+						this.isWorkTimer = common.isWithinTimeRange(cabinetInfo.work_begin_time,
+							cabinetInfo.work_end_time)
+					} else {
+						common.simpleToast(resp.data.msg)
 					}
-				},
-				fail: (res) => {}
-			})
-		},
-		bindToNav() {
-			const {
-				address,
-				latitude,
-				longitude,
-				shop_name
-			} = this.storeInfo
-			uni.openLocation({
-				latitude: latitude - 0,
-				longitude: longitude - 0,
-				scale: 15,
-				name: shop_name,
-				address: address,
-				success: function(res) {},
-			})
-		},
-	}
+				})
+			},
+
+			tapPhone() {
+				const me = this
+				uni.showModal({
+					content: `您是否要拨打电话${me.storeInfo.link_phone}？`,
+					confirmText: '确定',
+					success: (res) => {
+						if (res.confirm) {
+							me.clearTimer()
+							uni.makePhoneCall({
+								phoneNumber: me.storeInfo.link_phone,
+								success() {},
+								fail() {}
+							})
+						}
+					},
+					fail: (res) => {}
+				})
+			},
+			bindToNav() {
+				const {
+					address,
+					latitude,
+					longitude,
+					shop_name
+				} = this.storeInfo
+				uni.openLocation({
+					latitude: latitude - 0,
+					longitude: longitude - 0,
+					scale: 15,
+					name: shop_name,
+					address: address,
+					success: function(res) {},
+				})
+			},
+		}
 
 	};
 </script>