样式修改

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(){

manifest.json

@@ -2,8 +2,8 @@
     "name" : "弗兰克",
     "appid" : "__UNI__111A022",
     "description" : "",
-    "versionName" : "1.3.2",
-    "versionCode" : 131,
+    "versionName" : "1.3.3",
+    "versionCode" : 132,
     "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

@@ -6,9 +6,11 @@
 		</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-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)" 
+				<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>
@@ -18,8 +20,9 @@
 					<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"
+
+				<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>
@@ -58,12 +61,14 @@
 					</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="">
+							<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="">
+							<img style="width: 112rpx;height: 64rpx;"
+								src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
 						</view>
-						
+
 					</view>
 				</view>
 			</view>
@@ -72,7 +77,8 @@
 		<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>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -101,8 +107,8 @@
 					longitude: 113.324004,
 				},
 				destance: 0,
-				price:0,
-				params:{}
+				price: 0,
+				params: {}
 			};
 		},
 		components: {
@@ -111,35 +117,35 @@
 			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);
@@ -147,13 +153,16 @@
 				})
 			},
 			tapSelectType(e) {
-				const {hire_duration_unit,hire_price} = e
+				const {
+					hire_duration_unit,
+					hire_price
+				} = e
 				this.setData({
 					selectType: hire_duration_unit,
-					price:(hire_price/100).toFixed(2)
+					price: (hire_price / 100).toFixed(2)
 				})
 			},
-			tapCallPhone(){
+			tapCallPhone() {
 				const me = this
 				const phone = this.car_detail.link_phone
 				// const phone = 18170410707
@@ -173,7 +182,7 @@
 					fail: (res) => {}
 				})
 			},
-			navAddress(){
+			navAddress() {
 				const {
 					address,
 					latitude,
@@ -186,28 +195,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
 				})
 			}
 		}
@@ -215,4 +224,4 @@
 </script>
 <style>
 	@import './carDetail.css';
-</style>
+</style>

pages/index/index.vue

@@ -9,7 +9,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>
@@ -97,7 +97,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>
@@ -503,10 +503,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

@@ -58,8 +58,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/my/my.vue

@@ -9,7 +9,7 @@
 		
 		<view class="user-switch-row">
 			<view 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="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"
 					@tap="routerLink({ url: '/pages/message/index' })" />
 			</view>
@@ -201,12 +201,18 @@ 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%;
 		}

pages/orderStatus/orderStatus.vue

@@ -12,7 +12,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

@@ -43,7 +43,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">
@@ -67,12 +67,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">
@@ -97,16 +99,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>
@@ -144,7 +147,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

@@ -14,11 +14,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{
 	color: #0A59F7;
 }
-
 .card-top-style>view:nth-of-type(2) {
 	font-family: DIN, DIN;
 	color: #0074FF;

pages/service/components/carRentalList/carRentalList.vue

@@ -4,7 +4,7 @@
 			<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">