|
@@ -56,7 +56,8 @@
|
|
</view>
|
|
</view>
|
|
<view class="config-view flex-row">
|
|
<view class="config-view flex-row">
|
|
<view @click='openSelectType' class="flex-row selectFlex">
|
|
<view @click='openSelectType' class="flex-row selectFlex">
|
|
- <text class="text">{{leaseUnitsResult}}{{isBuy ? "+购买" : ''}}</text>
|
|
|
|
|
|
+ <text v-if="selectType === 'store'" class="text">{{leaseUnitsResult}}{{isBuy ? "+购买" : ''}}</text>
|
|
|
|
+ <text v-if="selectType === 'cabinet'" class="text">{{cabinetType ? cabinetType : '全部'}}</text>
|
|
<u-icon v-if="showLeaseType" name="arrow-down" color="#9FA7B7" size="26"></u-icon>
|
|
<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>
|
|
<u-icon v-else name="arrow-up" color="#9FA7B7" size="26"></u-icon>
|
|
</view>
|
|
</view>
|
|
@@ -293,7 +294,7 @@
|
|
name
|
|
name
|
|
};
|
|
};
|
|
const me = this;
|
|
const me = this;
|
|
- var nearCabinetList = [];
|
|
|
|
|
|
+ let nearCabinetList = [];
|
|
let {
|
|
let {
|
|
data
|
|
data
|
|
} = await http_gyq.postApi(config_gyq.API_FLK_CABINET_NEAR_LIST, pData)
|
|
} = await http_gyq.postApi(config_gyq.API_FLK_CABINET_NEAR_LIST, pData)
|
|
@@ -301,15 +302,19 @@
|
|
this.markers = {}
|
|
this.markers = {}
|
|
// nearCabinetList = data.data.cabinetList || [];
|
|
// nearCabinetList = data.data.cabinetList || [];
|
|
for (let i = 0; i < data.data.cabinetList.length; i++) {
|
|
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 item = data.data.cabinetList[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){
|
|
|
|
+ nearCabinetList.push(item)
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ }else{
|
|
|
|
+ nearCabinetList.push(item)
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
let markers = {}
|
|
let markers = {}
|
|
markers.markers = nearCabinetList.map(item => {
|
|
markers.markers = nearCabinetList.map(item => {
|
|
@@ -401,6 +406,7 @@
|
|
this.loadCarRentalList()
|
|
this.loadCarRentalList()
|
|
}else{
|
|
}else{
|
|
this.cabinetType = e.leaseType
|
|
this.cabinetType = e.leaseType
|
|
|
|
+ this.showLeaseType = false
|
|
this.loadNearCabinetList()
|
|
this.loadNearCabinetList()
|
|
}
|
|
}
|
|
// console.log(e, "e");
|
|
// console.log(e, "e");
|