bug修改

common/config.js

@@ -54,7 +54,7 @@ var config = {
 	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', //门店详情
 	API_DAYHIRE_REPORT_REPORT_TYPE: api_web_url + '?r=dayhire/report/report-type', //问题反馈列表
-	API_DAYHIRE_REPORT_REPORT: api_web_url + '?r=dayhire/report/report', //提交问题反馈
+	API_DAYHIRE_REPORT_REPORT: api_web_url + '?r=flk/index/report', //提交问题反馈
 	API_DAYHIRE_USER_NEAR_RETURN_SHOP: api_web_url + '?r=dayhire/user/return-shop', //附近可还车门店列表
 	API_DAYHIRE_CAR_TRACK_INFO: api_web_url + '?r=dayhire/car/track-info', //轨迹信息
 	API_DAYHIRE_CAR_LOCATION: api_web_url + '?r=dayhire/car/location', //车辆当前位置

common/http.js

@@ -125,6 +125,7 @@ function postRequest(url, data, successCallBack, failCallBack) {
 				return
 			} else {
 				uni.showToast({ title: res.data.msg, icon: 'none' })
+				return
 			}
 			if (_checkTokenValid(res)) {
 				successCallBack(res);

common/request.js

@@ -76,6 +76,7 @@ async function getRequest(url, data) {
 	 }
 	 if(res.data.code === 503){
 	 	throw Error(res.data.msg);
+		return
 	 }
 	if (_checkTokenValid(res)) {
 		return res

component/carPlan/carPlan.vue

@@ -12,9 +12,9 @@
 					</view>
 					
 					<view v-if="type!=100" class="car-model-price-view">
-						<text style="margin-right: 12rpx;">已选择{{priceAll}}</text>
+						<text>已选择</text>
 						<text>{{leaseUnitsResult}}</text>
-						<text>时长 {{count}} 
+						<text style="margin-left: 12rpx;">时长 {{count}} 
 							<text v-if="type==1">日</text>
 							<text v-if="type==2">月</text>
 							<text v-if="type==3">年</text>
@@ -23,7 +23,7 @@
 							<text v-if="type==6">周</text>
 							<text v-if="type==7">季</text>
 						</text>
-						<text>共计{{tools.countToDay(count,type)}}天</text>
+						<!-- <text>共计{{tools.countToDay(count,type)}}天</text> -->
 					</view>
 					<view class="car-model-tip">现车 随时可到店提车</view>
 				</view>
@@ -50,7 +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  @click="tapSelectType({hire_duration_unit:100,hire_price:params.sell_price})" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" >
+					<view v-if="params.sell_price != 0"  @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>
@@ -72,9 +72,9 @@
 					<view class="quantity-count flex-row flex-between">
 						<view class="total-time flex-row">
 							 共 
-							<view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,type)}}</view>
+							<view style="font-weight: 600;margin: 0 10rpx;">{{count}}</view>
 							<!-- <view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,isSelectStatus)}}</view> -->
-							<text>天</text>
+							<text>{{leaseUnitsResult}}</text>
 						</view>
 						<!-- <view class="count-btn fbtn" @tap.stop.prevent="bindMinus">-</view> -->
 						<view @tap.stop.prevent="bindMinus"><img class="count-btn fbtn"
@@ -129,7 +129,7 @@
 		},
 		computed: {
 			leaseUnitsResult() {
-				const result = LEASE_TYPE_ARR.find(v => v.value == this.params.rentalType);
+				const result = LEASE_TYPE_ARR.find(v => v.value == this.type);
       			return result ? result.label : '';
 			}
 		},

component/customTabbar/index.vue

@@ -1,14 +1,14 @@
 <template>
-	<view class="" >
+	<view class="">
 		<view style="height: 148rpx;"></view>
-		<view class="tabbar-wrap"  >
+		<view class="tabbar-wrap">
 			<view class="tabbar">
 				<view v-for="(item, index) in tabs" :key="index" class="tab-item" @tap="routerPush(item.url)">
 					<image :src="curtTab === item.name ? item.activeIcon : item.icon" class="tab-icon"></image>
 					<text :class="['base-text', curtTab === item.name && 'checked']">{{ item.label }}</text>
 				</view>
 				<view v-if="!isScanCondeRentalCar" class="center-entrance" @tap="navToInputPages">
-		
+
 					<image src="https://qiniu.bms16.com/Fm_kDVr1TIeIbbBW6-5bz0r-cECO"
 						style="width: 122rpx; height: 122rpx;"></image>
 					<!-- <img src="https://qiniu.bms16.com/FhCHLz8rQJ5mpJ6nUA4RbKiVkUOo" style="width: 120rpx; height: 24rpx;"/> -->
@@ -109,45 +109,55 @@
 				})
 			},
 			loadGeneralQRData(options) {
-				if (('q' in options) || ('result' in options) && (options.result.indexOf(
-							"https://zx.uwenya.cc/xcx/s") != -
-						1)) {
-					var url = ''
-					if ('q' in options) {
-						url = decodeURIComponent(options.q);
-					}
-					if ('result' in options) {
-						url = options.result
-					}
-					var obj = this.getUrlParams(url)
-					if (('t' in obj) && ('d' in obj)) {
-						if (obj.t == 1 || obj.t == 2 || obj.t == 5 || obj.t == 4) {
-							uni.navigateTo({
-								url: '/pages/cabinetDetail/cabinetDetail?dev_id=' + obj.d + '&type=' +
-									obj.t,
-							})
-							return 101
-						}
-						if (obj.t == 10) {
-							this.navToInputPage(obj.d)
-							return 106
-						}
-					}
-
+				let objOpt = this.$paramsObj(options)
+				if (objOpt.d) {
+					console.log('扫码的是机柜')
+					uni.navigateTo({
+						url: `/pages/cabinetDetail/cabinetDetail?dev_id=${objOpt.d}`,
+					})
+					return
+				} else {
+					console.log('扫码的是车辆')
+					this.navToInputPage(options)
+					return
 				}
+				// if (options.indexOf("https://zx.uwenya.cc/xcx/s") != -1) {
+				// 			console.log('跑进来了')
+				// 	var url = ''
+				// 	if ('q' in options) {
+				// 		url = decodeURIComponent(options.q);
+				// 	}
+				// 	if ('result' in options) {
+				// 		url = options.result
+				// 	}
+				// 	var obj = this.getUrlParams(url)
+				// 	if (('t' in obj) && ('d' in obj)) {
+				// 		if (obj.t == 1 || obj.t == 2 || obj.t == 5 || obj.t == 4) {
+				// 			uni.navigateTo({
+				// 				url: '/pages/cabinetDetail/cabinetDetail?dev_id=' + obj.d + '&type=' +
+				// 					obj.t,
+				// 			})
+				// 			return 101
+				// 		}
+				// 		if (obj.t == 10) {
+
+				// 			return 106
+				// 		}
+				// 	}
+
+				// }else{
+
+				// }
 			},
 			async navToInputPage(car_sn) {
 				const me = this
-				const {
-					userInfo = ''
-				} = storage.getUserInfoData()
+				const userInfo = storage.getUserInfoData()
+				console.log(userInfo)
+				console.log(car_sn)
 				if (userInfo.status - 0 == 2) {
+					var location = uni.getStorageSync('user_current_location')
 					const params = await this._getParams()
-					// var plate_number = params.carList.length != 0 && params.carList[0].license_plate_number ? params
-					// 	.carList[0].license_plate_number : me.plate_number
-					
 					if (params.carList.length == 0) {
-						var location = uni.getStorageSync('user_current_location')
 						me.loadScanCode(location, car_sn)
 					} else {
 						if (params.order_status) {
@@ -161,38 +171,40 @@
 										uni.navigateTo({
 											url: '/pages/orderStatus/orderStatus'
 										});
+									} else {
+										me.loadScanCode(location, car_sn)
 									}
 								}
 							})
-							
+
 						}
 					}
+				} else {
+					this.$msg('用户异常')
 				}
 			},
 
-			loadScanCode(location, battery_sn) {
-				const pData = {
-					longitude: location.longitude,
-					latitude: location.latitude,
-					battery_sn: battery_sn
-				}
+			loadScanCode(location, car_sn) {
 				const me = this
-				http.postApi(config.API_FLK_CAR_DETAIL, pData, (resp) => {
+				http.postApi(config.API_FLK_CAR_DETAIL, {car_sn}, (resp) => {
 					uni.hideLoading()
 					if (resp.data.code === 200) {
-						if (resp.data.data.online === 0 || isOffline) {
-							common.simpleToast('此车辆已离线，请选择其他车辆')
-						} else {
-							if (resp.data.data.is_mine) {
-								//直接切换当前扫码的车辆
-								uni.setStorageSync('car_info', resp.data.data);
-								me.$emit('changCar',resp.data.data)
-								return
-							} else {
-								common.simpleToast('此车辆正在被使用！')
-								return
-							}
+						console.log(resp.data.data)
+						// if (resp.data.data.online === 0) {
+						// 	common.simpleToast('此车辆已离线，请选择其他车辆')
+						// 	return
+						// }
+						if (resp.data.data.is_mine) {
+							//直接切换当前扫码的车辆
+							uni.setStorageSync('car_info', resp.data.data);
+							me.$emit('changCar', resp.data.data)
+							common.simpleToast('已切换当前车辆！')
+							return
 						}
+						uni.navigateTo({
+							url: `/pages/carDetail/carDetail?model_id=${resp.data.data.model_id}`
+						});
+						return
 					} else {
 						common.simpleToast(resp.data.msg)
 					}
@@ -255,7 +267,7 @@
 <style scoped>
 	.tabbar-wrap {
 		position: fixed;
-		bottom:0rpx;
+		bottom: 0rpx;
 		left: 0;
 		right: 0;
 		/* border-bottom: env(safe-area-inset-bottom) solid #fff; */

component/scanCabBtn/scanBtn.vue

@@ -22,7 +22,7 @@
 	var common = require('../../common/common.js');
 	var storage = require('../../common/storage.js')
 	var user = require('../../common/user.js');
-	var bluetooth = require('../../common/bluetooth.js');
+	// var bluetooth = require('../../common/bluetooth.js');
 	// var IndexImpl = require('../../pages/index/model/indexImpl.js');
 	const DF_CAB_INFO_DONE = 10000; //机柜信息传输完成
 	var subscribeTimer = null;
@@ -127,8 +127,8 @@
 			//#ifdef MP-WEIXIN
 			this.payType = 0
 			//#endif
-			bluetooth.initBluetooth()
-			this.bluetoothClose()
+			// bluetooth.initBluetooth()
+			// this.bluetoothClose()
 			// this.loadBatteryInfo()
 			//this.loadExchangeInfo()
 		},

manifest.json

@@ -27,7 +27,8 @@
             "Barcode" : {},
             "Camera" : {},
             "OAuth" : {},
-            "Contacts" : {}
+            "Contacts" : {},
+            "iBeacon" : {}
         },
         "distribute" : {
             "android" : {

pages/cabinetDetail/cabinetDetail.vue

@@ -94,7 +94,7 @@
 										:class="(item.fault_reason&&item.fault_reason.length>0)?'namber namber-s':'namber namber-g'">
 										{{item.box_sn}}
 									</view>
-									<view v-if="item.tag_info && item.tag_info.length !== 0" class="tag_type_n">
+									<view v-if="item.tag_info != 'undefined' && item.tag_info && item.tag_info.length !== 0" class="tag_type_n">
 										{{item.tag_info[0].main_tag_name ? (item.tag_info[0].main_tag_name) : ''}}{{item.tag_info[0].child_tag_name ? '/' + item.tag_info[0].child_tag_name : ''}}
 									</view>
 								</view>
@@ -216,9 +216,9 @@ import progressView from '@/component/progressView/progressView';
 					this.loadCabinetDetail();
 				}
 			} else {
-				this.getLocationAndSave();
+				// this.getLocationAndSave();
 			}
-			bluetooth.initBluetooth()
+			// bluetooth.initBluetooth()
 			
 		},
 		/**

pages/carDetail/carDetail.vue

@@ -34,7 +34,7 @@
 					<text v-if="item.hire_duration_unit==7">季租</text>
 				</view>
 
-				<view @click="tapSelectType({hire_duration_unit:100,hire_price:car_detail.sell_price})"
+				<view v-if="car_detail.sell_price != 0" @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>
@@ -149,6 +149,7 @@
 					longitude: longitude,
 				}, (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])
 						resp.data.data.distance = common.formatDistance(Number(resp.data.data.distance))
 						me.setData({

pages/carList/carList.vue

@@ -102,6 +102,9 @@
 					uni.hideLoading();
 					if (resp.data.code === 200) {
 						const carList=resp.data.data.list
+						resp.data.data.list.map(item=>{
+							item.model_images = item.model_images.split(',')[0]
+						})
 						me.setData({
 							carList,
 						})

pages/feedback/index.vue

@@ -169,7 +169,7 @@
 				const pData = {
 					content: this.content,
 					image_list: imgList,
-					type_id: this.typeId
+					type: this.typeId
 				}
 				const that = this
 				http.postApi(config.API_DAYHIRE_REPORT_REPORT, pData, (resp) => {

pages/index/index.vue

@@ -244,13 +244,13 @@
 			uni.getNetworkType({
 				success: (res) => {
 					if (res.networkType != 'none') {
-						this.init()
+						// this.init()
 					}
 				}
 			});
 			// #endif
 			// #ifndef APP
-			this.init()
+			// this.init()
 			// #endif
 		
 		},

pages/my/my.vue

@@ -70,6 +70,7 @@ var request = require('@/common/request.js');
 				newsList:{},
 				statusBarHeight:0,
 				car_info: {},
+				shopInfo:{},
 				QINIU_URL,
 				defaultAvatarUrl: defaultHeadImg,
 				comboDialoginfo: {
@@ -138,8 +139,17 @@ var request = require('@/common/request.js');
 		},
 		onLoad() {
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
+			this.serviceFn()
 		},
 		methods: {
+			async serviceFn(){
+				let {data} = await request.postApi(config.API_FLK_INDEX_SHOP_SETTING,{})
+				console.log(data)
+				if(data.code == 200){
+					this.shopInfo = data.data
+				}
+				
+			},
 			async newsNumFn(){
 				let {data} = await request.postApi(config.API_FLK_MESSAGE_UNREAD_COUNT,{})
 				if(data.code == 200){
@@ -202,6 +212,22 @@ var request = require('@/common/request.js');
 					return
 				}
 				if(statues){
+					let _this = this
+					if(!_this.shopInfo.link_phone){
+						this.$msg("未获取到手机号码")
+						return
+					}
+					uni.showModal({
+						content: `您是否要拨打电话${_this.shopInfo.link_phone}？`,
+						confirmText: '确定',
+						success: (res) => {
+							if (res.confirm) {
+								uni.makePhoneCall({
+									phoneNumber: _this.shopInfo.link_phone,
+								})
+							}
+						},
+					})
 					return
 				}
 				if (jumpCheck) {

pages/orderStatus/orderStatus.css

@@ -132,9 +132,15 @@
 
 .top-flex > view:nth-of-type(1) {
 	color: #060809;
-	font-size: 36rpx;
+	font-size: 34rpx;
 	font-weight: 400;
 	margin-bottom: 20rpx;
+	width: 450rpx;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	-webkit-box-orient: vertical;
 }
 
 .top-flex > view:nth-of-type(2) {
@@ -143,7 +149,7 @@
 	color: #9EA9BB;
 }
 
-.car-info img {
+.car-info image {
 	width: 125rpx;
 	height: 125rpx;
 	border-radius: 16rpx;
@@ -915,8 +921,11 @@
 }
 .store-name{
 	font-weight: 600;
-	font-size: 36rpx;
+	font-size: 34rpx;
 	color: #060809;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
 }
 .time-style{
 	font-weight: 400;
@@ -943,4 +952,27 @@
 .get-time-view{
 	font-weight: 400;
 	align-items: center;
+}
+.serviceList{
+	display: flex;
+	align-items: center;
+	margin-top: 20rpx;
+	flex-wrap: wrap;
+}
+.serviceList .tag{
+	min-width: 106rpx;
+	height: 40rpx;
+	background: #F3F8FF;
+	border-radius: 24rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-family: PingFangSC, PingFang SC;
+	font-weight: 400;
+	font-size: 22rpx;
+	color: #2A3A5A;
+	line-height: 24rpx;
+	text-align: center;
+	font-style: normal;
+	margin-right: 10rpx;
 }

pages/orderStatus/orderStatus.vue

@@ -116,9 +116,9 @@
 			</view>
 			<view class="flex-row store-img-view">
 				<img src="https://qiniu.bms16.com/FrwDlFZdSMiBgqnqDjB19PiDUmuu" alt="">
-				<view style="width: 100%;margin-left: 24rpx;">
+				<view style="width: calc(100% - 180rpx);margin-left: 24rpx;">
 					<view class="store-name">{{orderInfo.shop_name}}</view>
-					<view class="store-name-address">{{orderInfo.address}}</view>
+					<view class="store-name-address">{{orderInfo.address || '未知地址'}}</view>
 					<view class="flex-row flex-between align-center">
 						<view class="flex-row time-style align-center">
 							<img v-if="orderInfo.work_begin_time && orderInfo.work_end_time"
@@ -136,16 +136,20 @@
 		<view class="car-info">
 			<view>车辆信息</view>
 			<view class="car-top flex-row flex-between">
-				<view class="top-flex">
-					<view>{{orderInfo.model_name}}</view>
-					<view>续航{{orderInfo.endurance /100}}km｜重量{{orderInfo.weight}}kg</view>
-				</view>
-				<!-- //配套服务 -->
-				<view class="">
-					asd
+				<view>
+					<view class="top-flex">
+						<view>{{orderInfo.model_name}}</view>
+						<view>续航{{(orderInfo.endurance /100).toFixed(0)}}km｜重量{{(orderInfo.weight / 1000).toFixed(0)}}kg</view>
+					</view>
+					<!-- //配套服务 -->
+					<view class="serviceList">
+						<view v-for="(item,index) of orderInfo.service_list" :key="index" class="tag">
+							{{item}}
+						</view>
+					</view>
 				</view>
-				<img v-if="orderInfo.model_images" :src="orderInfo.model_images" alt=""></img>
-				<img v-else src="https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj" alt="">
+				<image mode="aspectFill" v-if="orderInfo.model_images" :src="orderInfo.model_images"></image>
+				<image v-else src="https://qiniu.bms16.com/FhEvnKUckAHPtWaC04mi2s53IEVj" mode=""></image>
 			</view>
 			<!-- <view class="exchange-info">
 				<view class="flex-row flex-between">
@@ -394,7 +398,7 @@
 							...this.car_detail,
 							price: this.price
 						}
-						resp.data.data.model_images = resp.data.data.model_images.spilt(',')[0]
+						
 						me.setData({
 							car_detail: resp.data.data,
 							params: {
@@ -442,9 +446,17 @@
 					car_sn = res[1].result
 					if(!await this.carDetFn(car_sn)) return
 				}
-				uni.navigateTo({
-					url: `/pages/activation/activation?model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${car_sn}`
+				uni.showLoading({
+					title: '识别中....',
+					mask: true
 				})
+				setTimeout(()=> {
+					uni.hideLoading();
+					uni.navigateTo({
+						url: `/pages/activation/activation?model_id=${this.orderInfo.model_id}&sub_sn=${this.sub_sn}&car_sn=${car_sn}`
+					})
+				}, 1000);
+				
 			},
 
 			navToCabinet() {
@@ -514,7 +526,7 @@
 				}, (resp) => {
 					if (resp.data.code === 200) {
 						me.orderInfo = resp.data.data.order_info
-				
+				me.orderInfo.model_images = me.orderInfo.model_images.split(',')[0]
 						// 
 						if (resp.data.data.order_info.model_id) {
 							me.loadCarInfo(resp.data.data.order_info.model_id)

pages/purchaseOrder/purchaseOrder.vue

@@ -11,7 +11,7 @@
 		</view>
 		<view class="car-info-view">
 			<view class="flex-row align-center">
-				<img style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="modelInfo.image" alt="">
+				<image style="width: 160rpx;height: 160rpx;border-radius: 16rpx;" :src="modelInfo.model_images" mode="aspectFill"></image>
 				<view class="flex-row car-info-grow">
 					<view class="flex-row align-center">
 						<view class="car-name">{{modelInfo.car_model_name}}</view>
@@ -199,13 +199,14 @@
 			if (options && options.params) {
 				const model_info = JSON.parse(decodeURIComponent(options.params)) || {}
 				console.log(model_info, 'model_info');
+				model_info.model_images = model_info.model_images ? model_info.model_images[0] : ''
 				this.setData({
 					modelInfo: model_info,
 					unitPrice: model_info.rental_setting.find(v => v.hire_duration_unit == model_info
 						.selectType)?.hire_price,
 					service_list: model_info.service_list || [],
 					price: model_info.totalPrice / 100,
-					totalPrice: model_info.select_type != 100 ? ((model_info.totalPrice + model_info.deposit) / 100).toFixed(2) : ((model_info.sell_price) / 100).toFixed(2)
+					totalPrice: model_info.selectType != 100 ? ((model_info.totalPrice + model_info.deposit) / 100).toFixed(2) : ((model_info.sell_price) / 100).toFixed(2)
 				})
 			}
 			this.pick_up_time = Math.floor(new Date().getTime() / 1000)

pages/service/service.css

@@ -110,6 +110,7 @@
 	border-radius: 24rpx;
 	text-align: left;
 	font-weight: 500;
+	padding-left: 10rpx;
 	font-size: 32rpx;
 	color: #060809;
 }

pages/service/service.vue

@@ -20,17 +20,14 @@
 		<!-- #endif -->
 
 		<!-- 地图控件 -->
-		<cover-view @click="isSearch = false" :class="[
+	<!-- 	<cover-view @click="isSearch = false" :class="[
         'control-icon-view',
         'flex-row',
         isSearch ? 'flex-between' : 'flex-end',
       ]">
 			<cover-view v-if="isSearch" class="seach-return-view flex-row"><cover-image class="seach-return-img"
 					src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG"></cover-image></cover-view>
-			<!-- <cover-view @tap="moveToLocation" class="current-location-view flex-row"><cover-image
-					class="current-location-icon"
-					src="https://qiniu.bms16.com/FgLe8FKDOzgt3wxi2lZt-yQGmbP3"></cover-image></cover-view> -->
-		</cover-view>
+		</cover-view> -->
 		
 		<view class="store-cabinet-block">
 			<view class="block-p"></view>
@@ -186,7 +183,11 @@
 
 			async locationFn() {
 				let _this = this
-				_this.loadCarRentalList();
+				if (this.selectType === "store") {
+					this.loadCarRentalList();
+				} else {
+					this.loadNearCabinetList();
+				}
 			},
 
 			tapSelectType(e) {
@@ -194,11 +195,9 @@
 					type
 				} = e.currentTarget.dataset;
 				this.nearCabinetList = []
-				console.log(type)
 				this.setData({
 					selectType: type,
 				});
-				console.log(type == 'store' ? 1 : 2)
 				this.type = type == 'store' ? 1 : 2
 				if (type === "store") {
 					this.loadCarRentalList();
@@ -336,7 +335,7 @@
 				});
 			},
 			openSearch() {
-				this.isSearch = true;
+				this.isSearch = !this.isSearch;
 				this.isFocused = true;
 			},
 			openSelectType() {

pages/storeDetails/storeDetails.vue

@@ -193,7 +193,7 @@
 				let obj = []
 				for (let index = 0; index < this.storeInfo.model_list.length; index++) {
 					let item = this.storeInfo.model_list[index];
-					if (this.tagId == 100 && item.sell_price) {
+					if (this.tagId == 100 && item.sell_price && item.sell_price != 0) {
 						obj.push({
 							...item,
 							money: (item.sell_price / 100).toFixed(2)
@@ -221,12 +221,7 @@
 			},
 			locationFn() {
 				let _this = this
-				uni.getLocation({
-					success(res) {
-						_this.loadStoreDetail(_this.shop_id, res.longitude, res.latitude)
-
-					}
-				})
+				_this.loadStoreDetail(_this.shop_id, this.myLocation.longitude, this.myLocation.latitude)
 			},
 			srcFn(url) {
 				uni.navigateTo({

utils/gyq_utils.js

@@ -100,8 +100,26 @@ function checkLocationPermission() {
 		// #endif
 	});
 }
+function paramsObj(url){
+	if(url.indexOf("https://zx.uwenya.cc/xcx/s") == -1){
+		return {}
+	}
+	// 1. 提取参数部分
+	const queryString = url.split('?')[1] || '';
+	
+	// 2. 解析为对象
+	const params = {};
+	queryString.split('&').forEach(pair => {
+	  const [key, value] = pair.split('=');
+	  if (key) {
+	    params[key] = decodeURIComponent(value || '');
+	  }
+	});
+	return params
+}
 export default {
 	install: function(vm) {
+		vm.prototype.$paramsObj = paramsObj;
 		vm.prototype.$srcFn = srcFn;
 		vm.prototype.$msg = msg;
 		vm.prototype.$location = location;