bug修复

pages/purchaseOrder/purchaseOrder.vue

@@ -177,6 +177,7 @@
 		},
 		data() {
 			return {
+				takeCar:'',
 				isShowReturnCar:false,
 				isShowCheckOrder:false,
 				sub_sn: "",
@@ -197,7 +198,7 @@
 		,
 		onLoad: function(options) {
 			if (options && options.params) {
-				const model_info = JSON.parse(decodeURIComponent(options.params)) || {}
+				const model_info = JSON.parse(options.params) || {}
 				console.log(model_info, 'model_info');
 				model_info.model_images = model_info.model_images ? model_info.model_images[0] : ''
 				this.setData({

pages/service/components/leaseType/leaseType.vue

@@ -8,9 +8,9 @@
 		        	    <template v-if="selectType == 'cabinet'">
 		        	        <view 
 		        	            v-for="(item, index) in modelTypeList" 
-		        	            :class="['item', leaseType == item.id && 'checked']"
+		        	            :class="['item', leaseType == item.name && 'checked']"
 		        	            :key="index"
-		        	            @click="leaseType = item.id"
+		        	            @click="leaseType = item.name"
 		        	        >
 		        	            {{ item.name }}
 		        	        </view>
@@ -86,6 +86,7 @@ export default {
 
     },
 	mounted() {
+		
 		this.leaseType = this.shopType
 		this.buy = this.isBuy
 	},

pages/service/service.vue

@@ -103,6 +103,7 @@
 	export default {
 		data() {
 			return {
+				cabinetType:0,
 				shopType:1,
 				isBuy:true,
 				activeMarkersId: 0,
@@ -143,12 +144,9 @@
 		 */
 		onLoad: function(options) {
 			this.loadModelType();
-			console.log(this.myLocation)
-			this.locationFn()
 		},
-		
 		onShow() {
-			
+			this.locationFn()
 		},
 
 		methods: {
@@ -165,7 +163,6 @@
 				}
 				this.nearCabinetList.unshift(this.nearCabinetList.splice(index, 1)[0])
 			},
-
 			markertapFn(e) {
 				let markerId = e.markerId
 				if (markerId == 5000) return
@@ -302,7 +299,18 @@
 				} = await http_gyq.postApi(config_gyq.API_FLK_CABINET_NEAR_LIST, pData)
 				if (data.code === 200) {
 					this.markers = {}
-					nearCabinetList = data.data.cabinetList || [];
+					// nearCabinetList = data.data.cabinetList || [];
+					for (let i = 0; i < data.data.cabinetList.length; i++) {
+						let item = nearCabinetList[i];
+						if(this.cabinetType)
+						for (let i = 0; i < item.tag_code.length; i++) {
+							let items = item.tag_code[i];
+							if(items.main_tag_name == this.cabinetType || items.child_tag_name == this.cabinetType){
+								
+							}
+							
+						}
+					}
 					let markers = {}
 					markers.markers = nearCabinetList.map(item => {
 						return {
@@ -391,6 +399,9 @@
 					this.shopType = e.leaseType
 					this.showLeaseType = false
 					this.loadCarRentalList()
+				}else{
+					this.cabinetType = e.leaseType
+					this.loadNearCabinetList()
 				}
 				// console.log(e, "e");
 				// const obj = LEASE_TYPE_ARR.find(v => v.value == e)
@@ -402,7 +413,6 @@
 				// this.loadCarRentalList('', shop_type)
 			},
 			shopList(list){
-				console.log(list)
 				let nearCabinetList = []
 				for (let i = 0; i < list.length; i++) {
 					let item = list[i];
@@ -417,12 +427,13 @@
 					}
 					nearCabinetList.push(item)
 				}
-				console.log(nearCabinetList)
 				this.nearCabinetList = nearCabinetList
 			},
 			loadModelType() {
 				const me = this
 				http.postApi(config.API_NEAR_BATTERY_TYPE_LIST, {}, (resp) => {
+					console.log(99999)
+					console.log(resp.data.data.list)
 					if (resp.data.code === 200) {
 						me.setData({
 							modelTypeList: resp.data.data.list