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

pages/carDetail/carDetail.vue

@@ -130,6 +130,13 @@
 				this.model_id = options.model_id
 				this.locationFn()
 			}
+			if (options.shop_type) {
+				const d = {
+					hire_duration_unit:options.shop_type,
+					hire_price:Number(options.hire_price)
+				}
+				this.tapSelectType(d)
+			}
 			// this.loadCarInfo()
 			// getFlatternDistance 获取直线距离
 		},
@@ -149,12 +156,13 @@
 				}, (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])
+						
+						// me.tapSelectType(resp.data.data.rental_setting[0])
 						resp.data.data.distance = common.formatDistance(Number(resp.data.data.distance))
 						resp.data.data.desc = this.$htmlData(resp.data.data.desc)
 						me.setData({
 							car_detail: resp.data.data,
-							price: ((resp.data.data.rental_setting[0]?.hire_price || 0) / 100).toFixed(2)
+							// price: ((resp.data.data.rental_setting[0]?.hire_price || 0) / 100).toFixed(2)
 						})
 					} else {
 						common.simpleToast(resp.data.msg);

pages/order/order.vue

@@ -122,7 +122,8 @@
 						</view>
 						<view v-if="item.package_type == 1" class="item-label-view flex-row">
 							<view class="item-label">免费换电数</view>
-							<view class="item-value">{{item.last_num}}次</view>
+							<!-- <view class="item-value">{{item.last_num}}次</view> -->
+							<view class="item-value">不限次数</view>
 						</view>
 						<view v-if="item.package_type == 2" class="item-label-view flex-row">
 							<view class="item-label">免费换电数</view>

pages/service/components/carRentalList/carRentalList.vue

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