|
|
@@ -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>
|
郭宇琦