bug修改

common/config.js

@@ -49,7 +49,7 @@ var config = {
 	API_DAYHIRE_HIRE_HIRE: api_web_url + '?r=dayhire/hire/hire', // 扫码下单租车
 	API_DAYHIRE_HIRE_ORDER_LIST: api_web_url + '?r=dayhire/hire/order-list', // 订单列表
 	API_DAYHIRE_HIRE_ORDER_INFO: api_web_url + '?r=dayhire/hire/order-info', //订单详情
-	API_DAYHIRE_HIRE_CANCEL_ORDER: api_web_url + '?r=dayhire/hire/cancel-order', //取消订单
+	API_DAYHIRE_HIRE_CANCEL_ORDER: api_web_url + '?r=flk/order/cancel-pay', //取消订单
 	API_DAYHIRE_HIRE_CONTINUE_PAY: api_web_url + '?r=dayhire/hire/continue-pay', //重新调起支付
 	API_DAYHIRE_USER_SHOP_MODEL_LIST: api_web_url + '?r=dayhire/user/shop-model-list', //门店列表
 	API_DAYHIRE_USER_SHOP_INFO: api_web_url + '?r=dayhire/user/shop-info', //门店详情

component/carPlan/carPlan.css

@@ -67,8 +67,10 @@
 	background: #F3F8FF;
 	border-radius: 16rpx;
 	min-width: 158rpx;
+	padding: 0 20rpx;
 	border: 4rpx solid transparent;
 	margin-right: 18rpx;
+	box-sizing: border-box;
 }
 .car-plan-list-i{
 	height: 158rpx;
@@ -77,8 +79,10 @@
 	background: #FFF;
 	border-radius: 16rpx;
 	min-width: 158rpx;
+	padding: 0 20rpx;
 	border: 4rpx solid #0A59F7;
 	margin-right: 18rpx;
+	box-sizing: border-box;
 }
 .car-plan-unit{
 	font-weight: 400;

component/customTabbar/index.vue

@@ -103,13 +103,19 @@
 				const me = this
 				if (!this.loadIsLogin()) return
 				uni.scanCode({
+					scanType:['qrCode'],
 					success(res) {
 						me.loadGeneralQRData(res.result)
+					},
+					fail() {
+						me.$msg('扫码失败，请重新扫码')
 					}
 				})
 			},
 			loadGeneralQRData(options) {
+				console.log(options)
 				let objOpt = this.$paramsObj(options)
+				
 				if (objOpt.d) {
 					console.log('扫码的是机柜')
 					uni.navigateTo({

pages/order/order.vue

@@ -35,7 +35,8 @@
 					</view>
 				</block>
 
-				<view v-if="item.pay_status==2 && selectOrderType == 1">
+				<view v-if="item.finally == 1 && selectOrderType == 1">
+					<view class="card card-k" v-if="item.order_status == 0">待支付</view>
 					<view class="card card-k" v-if="item.order_status == 1">待取车</view>
 					<view class="card card-k" v-else-if="item.order_status == 2">待激活</view>
 					<view class="card card-b" v-else-if="item.order_status == 3">使用中</view>
@@ -45,11 +46,13 @@
 					<view class="card card-k" v-else-if="item.order_status == 7">车辆已归还</view>
 					<view class="card card-k" v-else-if="item.order_status == 8 ">订单已支付,已取消</view>
 					<view class="card card-k" v-else-if=" item.order_status == 9">订单未支付,已取消</view>
+					<view class="card card-k" v-else-if=" item.order_status == 10">已完结</view>
 				</view>
 
-				<view v-if="item.pay_status!=2 && selectOrderType == 1">
+				<view v-if="item.finally != 1 && selectOrderType == 1">
 					<view class="card card-k" v-if="item.pay_status == 0">待支付</view>
 					<view class="card card-k" v-else-if="item.pay_status == 1">支付中</view>
+					<view class="card card-k" v-else-if="item.pay_status == 2">支付成功</view>
 					<view class="card card-r" v-else-if="item.pay_status == 3">支付失败</view>
 					<view class="card card-k" v-else-if="item.pay_status == 4">支付取消</view>
 					<view class="card card-b" v-else-if="item.pay_status == 5">线下待审核</view>

pages/orderStatus/orderStatus.vue

@@ -20,6 +20,7 @@
 					<view v-if="orderInfo.order_status == 5">待门店确认</view>
 					<view v-if="orderInfo.order_status == 6">还车中,等待门店取车</view>
 					<view v-if="orderInfo.order_status == 7">已完成</view>
+					<view v-if="orderInfo.order_status == 10">已完结</view>
 				</block>
 				<view v-if="orderInfo.order_status == 8||orderInfo.order_status == 9">已取消</view>
 			</view>
@@ -437,7 +438,7 @@
 				if (!car_sn) {
 					let res = await uni.scanCode({
 						onlyFromCamera: true,
-						scanType: [],
+						scanType: ['qrCode'],
 					});
 					if (res[0]) return
 					car_sn = res[1].result

pages/service/components/carRentalList/carRentalList.css

@@ -117,11 +117,12 @@
 .bottom-text>text:nth-of-type(1) {
 	color: #F95151;
 	font-weight: bold;
+	font-size: 22rpx;
 }
 
 .bottom-text>text:nth-of-type(2) {
 	color: #F95151;
-	font-size: 40rpx;
+	font-size: 28rpx;
 	font-weight: bold;
 }
 

pages/service/components/carRentalList/carRentalList.vue

@@ -1,14 +1,16 @@
 <template>
 	<view>
 		<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 :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 class="shop_name">{{item.shop_name}}</view>
 						<view>{{item.distance}}</view>
 					</view>
 					<view class="card-center-ren flex-row">
-						<view style="color: #0A59F7;border-color: #0A59F7;" v-for="(items,indexs) of item.business_list" :key="indexs" class=" tag align-c">
+						<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 tag">
@@ -18,11 +20,14 @@
 					</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}`)" class="card-bottom card-first flex-row">
+					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${item.model_list[0].model_id}`)"
+						class="card-bottom card-first flex-row">
 						<view class="second-view flex-row">
 							<view>
-								<image :src="item.model_list[0]!=''?item.model_list[0].model_images:'https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj'" mode="aspectFill"></image>
-								</view>
+								<image
+									:src="item.model_list[0]!=''?item.model_list[0].model_images:'https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj'"
+									mode="aspectFill"></image>
+							</view>
 							<view class="bottom-item">
 								<view>{{item.model_list[0].model_name}}</view>
 								<view>
@@ -30,22 +35,25 @@
 								</view>
 								<view class="flex-row flex-between">
 									<view class="bottom-text">
-										{{ curType() }} <text style="margin-left: 10rpx;">￥</text><text>{{60 }}</text>
+										{{ leaseUnitsResult }} <text
+											style="margin-left: 10rpx;">￥</text><text>{{item.model_list[0].hire_price}}</text>
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				
-				<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}`)" v-for="(items,index) in item.model_list" :key="index"
-						:style="{ marginLeft: index > 0 ? '32rpx' : '0' }" class="form-item" :data-item="items"
-						>
+
+				<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}`)"
+						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">
 							<view>
-									<image :src="items.model_images || 'https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj'" mode="aspectFill"></image>
+								<image
+									:src="items.model_images || 'https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj'"
+									mode="aspectFill"></image>
 							</view>
 							<view class="bottom-item">
 								<view>{{ items.model_name }}</view>
@@ -54,7 +62,12 @@
 								</view>
 								<view class="flex-row flex-between">
 									<view class="bottom-text">
-										{{ curType() }} <text style="margin-left: 10rpx;">￥</text><text>{{ 60}}</text>
+										{{ leaseUnitsResult }}<text
+											style="margin-left: 10rpx;">￥</text><text>{{(items.hire_price /100).toFixed(1)}}</text>
+									</view>
+									<view v-if="items.sell_price && isBuy" class="bottom-text">
+										购买<text
+											style="margin-left: 10rpx;">￥</text><text>{{(items.sell_price /100).toFixed(1)}}</text>
 									</view>
 								</view>
 							</view>
@@ -69,13 +82,13 @@
 					</view>
 					<view class="flex-row align-center">
 						<view>
-								<image @click.stop="callFn(item.link_phone)" style="width: 84rpx;height: 64rpx;"
-								src="https://qiniu.bms16.com/Ft0YA1JYmq66hdoeEN-PgBHy5vLa"  mode=""></image>
+							<image @click.stop="callFn(item.link_phone)" style="width: 84rpx;height: 64rpx;"
+								src="https://qiniu.bms16.com/Ft0YA1JYmq66hdoeEN-PgBHy5vLa" mode=""></image>
 						</view>
 						<view style="margin-left: 20rpx;">
 							<image @click.stop="bindToNav(item)" style="width: 112rpx;height: 64rpx;"
 								src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" mode=""></image>
-								
+
 						</view>
 					</view>
 				</view>
@@ -98,17 +111,35 @@
 		loginToast
 	} from '@/utils'
 	export default {
+		computed: {
+			leaseUnitsResult() {
+				const result = LEASE_TYPE_ARR.find(v => v.value == this.shopType);
+				return result ? result.label : '';
+			},
+			leaseUnits() {
+				const result = LEASE_TYPE_ARR.find(v => v.value == this.shopType);
+				return result ? result.unit : '';
+			}
+		},
 		props: {
+			isBuy: {
+				type: Boolean,
+				defult: true
+			},
+			shopType: {
+				type: Number,
+				defult: 1
+			},
 			params: {
 				type: Object
 			},
-			near_store_list:{
-				type:Array,
-				defult:[]
+			near_store_list: {
+				type: Array,
+				defult: []
 			},
-			activeMarkersId:{
-				type:Number,
-				defult:0
+			activeMarkersId: {
+				type: Number,
+				defult: 0
 			}
 		},
 		data() {
@@ -140,9 +171,6 @@
 				model_list: [],
 				shopModelListView: []
 			};
-		},
-		computed: {
-			
 		},
 		watch: {
 			// params: {
@@ -166,7 +194,7 @@
 					name: shop_name,
 				})
 			},
-			callFn(tel){
+			callFn(tel) {
 				uni.showModal({
 					content: `您是否要拨打电话${tel}？`,
 					confirmText: '确定',
@@ -185,7 +213,7 @@
 				return '租'
 			},
 			async navToStore(admin_id) {
-				const url = '/pages/storeDetails/storeDetails?admin_id=' + admin_id 
+				const url = '/pages/storeDetails/storeDetails?admin_id=' + admin_id
 				uni.navigateTo({
 					url
 				})
@@ -240,7 +268,7 @@
 						let all_num = 0
 						let distance = ''
 						for (let i = 0; item.model_list.length > i; i++) {
-							
+
 							let model_item = item.model_list[i]
 							all_num += item.model_list[i].car_num - 0
 							distance = common.formatDistance(item.distance)
@@ -248,8 +276,9 @@
 						item.all_num = all_num
 						item.distance = distance
 						item.model_list.map(items => {
-							items.model_images =  items.model_images
-							items.total_price = (me.leaseTime * (items.price_setting[0].hire_price - 0)) /100
+							items.model_images = items.model_images
+							items.total_price = (me.leaseTime * (items.price_setting[0].hire_price - 0)) /
+								100
 							return item
 						})
 					}
@@ -339,4 +368,4 @@
 
 <style scoped>
 	@import url("./carRentalList.css");
-</style>
+</style>

pages/service/components/leaseType/leaseType.vue

@@ -2,15 +2,9 @@
     <view class="container-view-contril">
 		<u-popup zIndex='9999' 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="title">{{ selectType == 'cabinet' ? '车辆类型' : '租借类型' }}</view>
 		        <scroll-view style="max-height: 700rpx;" scroll-y>
 		        	<view class="item-wrap">
-		        		<view
-		        		    :class="['item', leaseType == 100 && 'checked']"
-		        		    @click="leaseType = 100"
-		        		>
-		        		    全部
-		        		</view>
 		        	    <template v-if="selectType == 'cabinet'">
 		        	        <view 
 		        	            v-for="(item, index) in modelTypeList" 
@@ -22,15 +16,24 @@
 		        	        </view>
 		        	    </template>
 		        	    <template v-if="selectType == 'store'" >
-		        	        <view 
-		        	            v-for="(item, index) in LEASE_TYPE_ARR" 
-		        	            :class="['item', leaseType == item.value && 'checked']"
-		        	            :key="index"
-		        	            @click="leaseType = item.value"
-		        	        >
-		        	            {{ item.label }}
+		        	        <view class="">
+		        	        	<view class="flexs">
+		        	        		<view
+		        	        		    v-for="(item, index) in LEASE_TYPE_ARR" 
+		        	        		    :class="['item', leaseType == item.value && 'checked']"
+		        	        		    :key="index"
+		        	        		    @click="leaseType = item.value"
+		        	        			v-if="item.value != 100"
+		        	        		>
+		        	        		    {{ item.label }}
+		        	        		</view>
+		        	        	</view>
+		        	        	<view class="bugFlex">
+		        	        		  <view class="title">购买</view>
+		        	        		  <u-switch v-model="buy"></u-switch>
+		        	        	</view>
 		        	        </view>
-		        	        <view class="item" style="opacity: 0;"></view>
+							
 		        	    </template>
 		        	</view>
 		        </scroll-view>
@@ -53,7 +56,8 @@ export default {
         return {
 			// showLeaseType: false,
 			LEASE_TYPE_ARR,
-			leaseType:100
+			leaseType:100,
+			buy:true
 		};
     },
     /**
@@ -67,12 +71,24 @@ export default {
 			type: Boolean,
 			default: false
 		},
+		isBuy:{
+			type: Boolean,
+			default: true
+		},
+		shopType:{
+			type: Number,
+			default: 1
+		},
         selectType: {
 			type: String,
 			default: ''
 		},
 
     },
+	mounted() {
+		this.leaseType = this.shopType
+		this.buy = this.isBuy
+	},
     /**
      * 组件的方法列表
      */
@@ -81,12 +97,26 @@ export default {
             this.$emit('closeSelectType')
 		},
         chooseLeaseType() {
-            this.$emit('checkCabinetType', this.leaseType)
+			console.log(this.buy)
+            this.$emit('checkCabinetType', {
+				selectType:this.selectType,
+				leaseType:this.leaseType,
+				isBuy:this.buy
+			})
 		}
 	}
 };
 </script>
 <style lang="scss" scoped>
+	.bugFlex{
+		display: flex;
+		justify-content: space-between;
+		margin-top: 30rpx;
+	}
+	.flexs{
+		display: flex;
+		flex-wrap: wrap;
+	}
 .bottom-popup {
         padding: 40rpx 32rpx 32rpx 32rpx;
         padding-bottom: env(safe-area-inset-bottom);
@@ -121,6 +151,10 @@ export default {
                 color: #060809;
                 text-align: center;
                 font-style: normal;
+				margin-right: 16rpx;
+				&:nth-child(3n+3){
+					margin-right: 0;
+				}
             }
             .checked {
                 background: #FFFFFF;

pages/service/service.vue

@@ -55,17 +55,23 @@
             ]">换电柜</view>
 				</view>
 				<view class="config-view flex-row">
+					<view @click='openSelectType' class="flex-row selectFlex">
+						<text class="text">{{leaseUnitsResult}}{{isBuy ? "+购买" : ''}}</text>
+						<u-icon v-if="showLeaseType" name="arrow-down" color="#9FA7B7" size="26"></u-icon>
+						<u-icon v-else name="arrow-up" color="#9FA7B7" size="26"></u-icon>
+					</view>
 					<view class="seach-img" @tap="openSearch"><img
 							src="https://qiniu.bms16.com/FiWnFuZm5vWQ_Si3CEYLGJnVhSal" alt="搜索" /></view>
-					<view @tap="openSelectType" class="screen-img"><img
+					<!-- <view @tap="openSelectType" class="screen-img"><img
 							:src="'https://qiniu.bms16.com/'+(shop_type!=''?'FikPWd13ENc2SWnC3q1n5F22uUDs':'FpElQHM5NbxHDjz1LrwaHYN668LR')"
-							alt="筛选" /></view>
+							alt="筛选" /></view> -->
 				</view>
 			</view>
-			<CarRentalList :activeMarkersId='activeMarkersId' v-if="selectType === 'store'" :near_store_list="nearCabinetList" />
+			<CarRentalList :isBuy='isBuy' :shopType='shopType' :activeMarkersId='activeMarkersId' v-if="selectType === 'store'" :near_store_list="nearCabinetList" />
+			
 			<CabinetList v-if="selectType === 'cabinet'" :near_cabinet_list="nearCabinetList" />
 		</view>
-		<leaseType :showLeaseType="showLeaseType" :selectType="selectType" :modelTypeList="modelTypeList"
+		<leaseType :isBuy='isBuy' :shopType='shopType' :showLeaseType="showLeaseType" :selectType="selectType" :modelTypeList="modelTypeList"
 			@closeSelectType="closeSelectType" @checkCabinetType="checkCabinetType" />
 			
 		<CustomTabbar curt-tab="service" />
@@ -97,6 +103,8 @@
 	export default {
 		data() {
 			return {
+				shopType:1,
+				isBuy:true,
 				activeMarkersId: 0,
 				selectType: "store",
 				type: 1,
@@ -113,6 +121,16 @@
 				shop_type: ''
 			};
 		},
+		computed: {
+			leaseUnitsResult() {
+				const result = LEASE_TYPE_ARR.find(v => v.value == this.shopType);
+				return result ? result.label : '';
+			},
+			leaseUnits(){
+				const result = LEASE_TYPE_ARR.find(v => v.value == this.shopType);
+				return result ? result.unit : '';
+			}
+		},
 		components: {
 			googleMap,
 			LeaseType,
@@ -207,33 +225,47 @@
 
 			},
 			//附近门店列表
-			loadCarRentalList(name = '', shop_type = '') {
+			loadCarRentalList(name = '') {
 				const pData = {
 					limit: 50,
 					longitude: this.myLocation.longitude,
 					latitude: this.myLocation.latitude,
 					name,
-					shop_type
+					shop_type:'',
+					duration_unit:this.shopType
 				};
 				const me = this;
-				var nearCabinetList = [];
+				let nearCabinetList = [];
 				http.postApi(config.API_NEAR_SHOP_LIST, pData, (resp) => {
 					if (resp.data.code == 200) {
 						me.markers = {}
 						let markers = {
 							markers: []
 						}
-						nearCabinetList = resp.data.data.list.map(item => {
-							item.model_list.map(items=>{
-								items.model_images = items.model_images.split(',')[0] || ''
-							})
-							return {
-								...item,
-								distance: common.formatDistance(common.getFlatternDistance(this.myLocation
+						for (let index = 0; index < resp.data.data.list.length; index++) {
+								let element = resp.data.data.list[index];
+								element.distance = common.formatDistance(common.getFlatternDistance(this.myLocation
 									.longitude, this
-									.myLocation.latitude, item.longitude, item.latitude))
-							}
-						})
+									.myLocation.latitude, element.longitude, element.latitude))
+								let model_list = []
+								for (let y = 0; y < element.model_list.length; y++) {
+									let item = element.model_list[y];
+										item.model_images = item.model_images.split(',')[0] || ''
+										let price_setting = []
+										for (let i = 0; i < item.price_setting.length; i++) {
+											let items1 = item.price_setting[i];
+											if(items1.hire_duration_unit == this.shopType){
+												item.hire_price = items1.hire_price
+												model_list.push(item)
+											}
+										}
+								}
+								nearCabinetList.push({
+									...element,
+									model_list
+								})
+						}
+						
 						markers.markers = nearCabinetList.map(item => {
 							return {
 								width: 50,
@@ -248,10 +280,7 @@
 						})
 
 						this.getLocationPostion(this.myLocation, markers);
-						// console.log(nearCabinetList, "nearCabinetList");
-						me.setData({
-							nearCabinetList: nearCabinetList,
-						});
+						this.nearCabinetList = nearCabinetList
 					} else {
 						common.simpleToast(resp.data.msg);
 					}
@@ -356,14 +385,39 @@
 				}
 			},
 			checkCabinetType(e) {
-				console.log(e, "e");
-				const obj = LEASE_TYPE_ARR.find(v => v.value == e)
-				const shop_type = (e == 100) ? '' : obj.type
-				this.setData({
-					showLeaseType: false,
-					shop_type
-				});
-				this.loadCarRentalList('', shop_type)
+				if(e.selectType == "store"){
+					this.isBuy = e.isBuy
+					this.shopType = e.leaseType
+					this.showLeaseType = false
+					this.loadCarRentalList()
+				}
+				// console.log(e, "e");
+				// const obj = LEASE_TYPE_ARR.find(v => v.value == e)
+				// const shop_type = (e == 100) ? '' : obj.type
+				// this.setData({
+				// 	showLeaseType: false,
+				// 	shop_type
+				// });
+				// this.loadCarRentalList('', shop_type)
+			},
+			shopList(list){
+				console.log(list)
+				let nearCabinetList = []
+				for (let i = 0; i < list.length; i++) {
+					let item = list[i];
+					for (var index = 0; index < item.model_list.length; index++) {
+						var items = item.model_list[index];
+							for (var s = 0; s < items.price_setting.length; s++) {
+								var element = items.price_setting[s];
+								if(element.hire_duration_unit == this.shopType){
+									items.hire_price = element.hire_price
+								}
+							}
+					}
+					nearCabinetList.push(item)
+				}
+				console.log(nearCabinetList)
+				this.nearCabinetList = nearCabinetList
 			},
 			loadModelType() {
 				const me = this
@@ -382,4 +436,15 @@
 </script>
 <style>
 	@import "./service.css";
+	.selectFlex{
+		align-items: center;
+		margin-right: 20rpx;
+	}
+	.selectFlex .text{
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #060809;
+		margin-right: 10rpx;
+	}
 </style>