update
This commit is contained in:
parent
dd2babf6ef
commit
886da2dbef
@ -336,7 +336,10 @@
|
||||
</view>
|
||||
|
||||
<!-- 商家 -->
|
||||
<div class="merchantsBox" v-if="showStore">
|
||||
<div
|
||||
class="merchantsBox"
|
||||
v-if="showStore && item.storeList && item.storeList.length > 0"
|
||||
>
|
||||
<div class="merchantsTop">
|
||||
<div class="leftMerchants">
|
||||
<span class="pageTitle">精选商家</span>
|
||||
@ -1914,7 +1917,7 @@ export default {
|
||||
if (data.Data.List && data.Data.List.length > 0) {
|
||||
heightList.push(642);
|
||||
} else {
|
||||
heightList.push(342);
|
||||
heightList.push(260);
|
||||
}
|
||||
|
||||
this.swiperHeight = heightList;
|
||||
@ -2432,7 +2435,7 @@ export default {
|
||||
if (this.pageType === "mapIndex") {
|
||||
this.$emit("allGWDataList", { res: allStationList });
|
||||
}
|
||||
let newStationList = [];
|
||||
let allnewStationList = [];
|
||||
|
||||
if (allStationDataList && allStationDataList.length > 0) {
|
||||
allStationDataList.forEach((item) => {
|
||||
@ -2440,12 +2443,25 @@ export default {
|
||||
nameList.forEach((subItem) => {
|
||||
let sortName = subItem.split("服务区")[0];
|
||||
if (item.StationName.indexOf(sortName) !== -1) {
|
||||
newStationList.push(item);
|
||||
allnewStationList.push(item);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
let newStationList = [];
|
||||
if (allnewStationList && allnewStationList.length > 0) {
|
||||
allnewStationList.forEach((item) => {
|
||||
if (item.StationClassification === 1) {
|
||||
newStationList.push(item);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
console.log(
|
||||
"newStationListnewStationListnewStationListnewStationList",
|
||||
newStationList
|
||||
);
|
||||
|
||||
// 当前这几个服务区的全部充电数据 按照服务区分类
|
||||
if (list && list.length > 0) {
|
||||
@ -2575,7 +2591,9 @@ export default {
|
||||
// 跳转地图服务区详情
|
||||
handleGoServiceDetail(id, obj) {
|
||||
console.log("id", id);
|
||||
console.log("obj", obj);
|
||||
console.log("this.comeForm", this.comeForm);
|
||||
console.log("this.pageType", this.pageType);
|
||||
|
||||
if (this.pageType === "newMap") {
|
||||
let res = this.handleChangeServiceInfo(obj);
|
||||
|
||||
@ -109,7 +109,7 @@
|
||||
{
|
||||
"path": "mapIndex",
|
||||
"style": {
|
||||
"navigationBarTitleText": "点位地图",
|
||||
"navigationBarTitleText": "扫码充电",
|
||||
"navigationBarBackgroundColor": "#ffffff",
|
||||
"disableScroll": true
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
:style="{
|
||||
paddingTop:
|
||||
loginType === 'min' ? menu.top + 'px' : menu.top + 10 + 'px',
|
||||
height: loginType === 'min' ? menu.height + 'px' : menu.top + 'px',
|
||||
height: loginType === 'min' ? menu.height + 'px' : menu.top + 'px',
|
||||
}"
|
||||
>
|
||||
<image
|
||||
@ -30,9 +30,8 @@
|
||||
</view>
|
||||
|
||||
<view class="phoneBox">
|
||||
<text class="text">汽车维修服务热线 </text>
|
||||
<text class="text">汽车维修服务热线 </text>
|
||||
<text class="phoneText">{{ servicePhone || "-" }}</text>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="projectPublicity">
|
||||
@ -144,7 +143,11 @@ export default {
|
||||
this.serverPart = currentService;
|
||||
},
|
||||
onShow() {
|
||||
this.handleGetServiceDetail();
|
||||
let currentService = uni.getStorageSync("currentService");
|
||||
if (currentService) {
|
||||
this.serverPart = currentService;
|
||||
this.handleGetServiceDetail();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleBack() {
|
||||
|
||||
@ -69,8 +69,8 @@
|
||||
style="font-size: 28rpx"
|
||||
placeholderStyle="font-size:28rpx;color: #B8B7B4;"
|
||||
v-model="shopName"
|
||||
:disabled="isDetail"
|
||||
/>
|
||||
<!-- :disabled="isDetail" -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -82,14 +82,18 @@
|
||||
? "拾得时间"
|
||||
: ""
|
||||
}}</view>
|
||||
<view
|
||||
<!-- <view
|
||||
class="itemValue"
|
||||
style="font-size: 28rpx"
|
||||
v-if="detailObj && detailObj.SUGGESTION_CREATEDATE"
|
||||
>{{ detailObj.SUGGESTION_CREATEDATE || "" }}</view
|
||||
>
|
||||
<view class="itemValue" v-else>
|
||||
<time-picker @update="onTimeUpdate" />
|
||||
> -->
|
||||
<view class="itemValue">
|
||||
<time-picker
|
||||
@update="onTimeUpdate"
|
||||
:defaultDate="detailObj.SUGGESTION_DATE || ''"
|
||||
:defaultTime="detailObj.SUGGESTION_Time || ''"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -102,8 +106,8 @@
|
||||
type="number"
|
||||
maxlength="11"
|
||||
v-model="phone"
|
||||
:disabled="isDetail"
|
||||
/>
|
||||
<!-- :disabled="isDetail" -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -149,17 +153,32 @@
|
||||
</view>
|
||||
<!-- v-if="!isDetail" -->
|
||||
<view class="btnBox">
|
||||
<button class="submitBox" type="primary" @click="formSubmit">
|
||||
<button
|
||||
v-if="!detailObj.SUGGESTION_ID"
|
||||
class="submitBox"
|
||||
type="primary"
|
||||
@click="formSubmit"
|
||||
>
|
||||
新增{{ addType === 1000 ? "失物" : addType === 2000 ? "招领" : "" }}
|
||||
</button>
|
||||
|
||||
<button
|
||||
v-if="detailObj && user.MEMBERSHIP_ID === detailObj.MEMBERSHIP_ID"
|
||||
class="submitBox"
|
||||
type="primary"
|
||||
@click="formSubmit"
|
||||
>
|
||||
{{ detailObj ? "保存" : "新增"
|
||||
}}{{ addType === 1000 ? "失物" : addType === 2000 ? "招领" : "" }}
|
||||
</button>
|
||||
|
||||
<button
|
||||
v-if="showDeleteBtn"
|
||||
class="deleteBox"
|
||||
type="primary"
|
||||
@click="handleDelete"
|
||||
>
|
||||
删除失物
|
||||
删除{{ addType === 1000 ? "失物" : addType === 2000 ? "招领" : "" }}
|
||||
</button>
|
||||
</view>
|
||||
</view>
|
||||
@ -287,13 +306,19 @@ export default {
|
||||
req
|
||||
);
|
||||
console.log("handleGetDetail", data);
|
||||
this.detailObj = data.Result_Data;
|
||||
this.detailObj = {
|
||||
...data.Result_Data,
|
||||
SUGGESTION_DATE: data.Result_Data.SUGGESTION_CREATEDATE.split(" ")[0],
|
||||
SUGGESTION_Time: data.Result_Data.SUGGESTION_CREATEDATE.split(" ")[1],
|
||||
};
|
||||
console.log("this.detailObj", this.detailObj);
|
||||
this.shopName = data.Result_Data.SUGGESTION_TITLE;
|
||||
this.imgList = data.Result_Data.ImageList;
|
||||
this.phone = data.Result_Data.PHONE_NUMBER;
|
||||
this.showDeleteBtn =
|
||||
this.user.MEMBERSHIP_ID === data.Result_Data.MEMBERSHIP_ID &&
|
||||
data.Result_Data.WECHAT_OPENID === "1000";
|
||||
this.user.MEMBERSHIP_ID === data.Result_Data.MEMBERSHIP_ID;
|
||||
|
||||
// && data.Result_Data.WECHAT_OPENID === "1000";
|
||||
},
|
||||
// 删除图片
|
||||
async handleDeleteImg(obj) {
|
||||
|
||||
@ -1,13 +1,18 @@
|
||||
<template>
|
||||
<view class="time-picker">
|
||||
<picker mode="date" :value="selectedDate" @change="onDateChange">
|
||||
<view class="picker-item" style="font-size:28rpx;">
|
||||
<view class="picker-item" style="font-size: 28rpx">
|
||||
<text>{{ formatDate(selectedDate) }}</text>
|
||||
</view>
|
||||
</picker>
|
||||
|
||||
<picker style="margin-left: 12px" mode="time" :value="selectedTime" @change="onTimeChange">
|
||||
<view class="picker-item" style="font-size:28rpx;">
|
||||
<picker
|
||||
style="margin-left: 12px"
|
||||
mode="time"
|
||||
:value="selectedTime"
|
||||
@change="onTimeChange"
|
||||
>
|
||||
<view class="picker-item" style="font-size: 28rpx">
|
||||
<text>{{ formatTime(selectedTime) }}</text>
|
||||
</view>
|
||||
</picker>
|
||||
@ -22,6 +27,24 @@ export default {
|
||||
selectedTime: this.getCurrentTime(),
|
||||
};
|
||||
},
|
||||
props: {
|
||||
defaultDate: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
defaultTime: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
},
|
||||
onReady() {
|
||||
if (this.defaultDate) {
|
||||
this.selectedDate = this.defaultDate;
|
||||
}
|
||||
if (this.defaultTime) {
|
||||
this.selectedTime = this.defaultTime;
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 获取当前日期，格式为 yyyy-MM-dd
|
||||
getCurrentDate() {
|
||||
|
||||
@ -196,7 +196,7 @@
|
||||
{{ item.PHONE_NUMBER || "-" }}
|
||||
</div>
|
||||
<div class="phone" v-if="item.SUGGESTION_REASON">
|
||||
<span class="label">服务热线</span>
|
||||
<span class="label">服务区热线</span>
|
||||
{{ item.SUGGESTION_REASON || "-" }}
|
||||
</div>
|
||||
</view>
|
||||
@ -931,7 +931,7 @@ export default {
|
||||
padding: 24rpx;
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
.leftImgNew {
|
||||
width: 200rpx;
|
||||
height: 200rpx;
|
||||
@ -946,7 +946,7 @@ export default {
|
||||
|
||||
.rightItem {
|
||||
width: calc(100% - 200rpx);
|
||||
height: 200rpx;
|
||||
// height: 200rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
@ -1598,7 +1598,7 @@ export default {
|
||||
.currentServiceBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 20rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
border-radius: 32rpx;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
|
||||
@ -1641,9 +1641,9 @@ export default {
|
||||
justify-content: center;
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 30rpx;
|
||||
font-size: 28rpx;
|
||||
color: #716f69;
|
||||
line-height: 42rpx;
|
||||
line-height: 36rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
padding-bottom: 16rpx;
|
||||
@ -1684,7 +1684,7 @@ export default {
|
||||
|
||||
.todayRecommendation {
|
||||
width: 100%;
|
||||
margin-top: 48rpx;
|
||||
margin-top: 24rpx;
|
||||
.todayTitle {
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
@ -1713,7 +1713,7 @@ export default {
|
||||
.currentServiceBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 20rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
border-radius: 32rpx;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
|
||||
@ -1839,7 +1839,7 @@ export default {
|
||||
.currentServiceBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 20rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
border-radius: 32rpx;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
|
||||
|
||||
@ -72,7 +72,6 @@
|
||||
circular="true"
|
||||
class="banner"
|
||||
@change="swiperChange($event, 'currentBan')"
|
||||
|
||||
:current="currentBan"
|
||||
>
|
||||
<swiper-item v-for="(image, i) in bannerList" :key="i">
|
||||
@ -85,7 +84,9 @@
|
||||
class="carousel newCarousel"
|
||||
:style="{
|
||||
marginTop:
|
||||
loginType === 'min' ? `${menu.bottom + 8}px` : `${menu.top + 50}px`,
|
||||
loginType === 'min'
|
||||
? `${menu.bottom + 8 + 12}px`
|
||||
: `${menu.top + 50 + 12}px`,
|
||||
}"
|
||||
v-if="showBanner && pageStyle === 2"
|
||||
>
|
||||
@ -97,7 +98,11 @@
|
||||
@change="swiperChange($event, 'currentBan')"
|
||||
:current="currentBan"
|
||||
>
|
||||
<swiper-item v-for="(image, i) in bannerList" :key="i" @click="handleGoDiscovery">
|
||||
<swiper-item
|
||||
v-for="(image, i) in bannerList"
|
||||
:key="i"
|
||||
@click="handleGoDiscovery"
|
||||
>
|
||||
<image class="swiperImg" :src="image"></image>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
@ -1388,6 +1393,8 @@ export default {
|
||||
Province_Code: "340000",
|
||||
longitude: longitude,
|
||||
latitude: latitude,
|
||||
// longitude: 117.202392,
|
||||
// latitude: 31.833196,
|
||||
};
|
||||
uni.showLoading({
|
||||
title: "查找最近的服务区...",
|
||||
@ -1629,12 +1636,12 @@ export default {
|
||||
|
||||
.topRight {
|
||||
width: 302rpx;
|
||||
height: 72rpx;
|
||||
height: 62rpx;
|
||||
background: #f6f8fa;
|
||||
border-radius: 36rpx;
|
||||
margin-left: 24rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 16rpx 20rpx;
|
||||
padding: 12rpx 20rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@ -1954,11 +1961,11 @@ export default {
|
||||
width: 100%;
|
||||
// height: 280rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx 0 0 0;
|
||||
padding: 24rpx 0 0 0;
|
||||
background: linear-gradient(180deg, #f9fbff 0%, #ffffff 100%);
|
||||
border-radius: 8rpx;
|
||||
border: 2rpx solid #f3f3f3;
|
||||
margin-top: 32rpx;
|
||||
margin-top: 24rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
@ -1969,7 +1976,7 @@ export default {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
margin-bottom: 32rpx;
|
||||
margin-bottom: 24rpx;
|
||||
|
||||
.funItemIcon {
|
||||
width: 48rpx;
|
||||
@ -1995,7 +2002,7 @@ export default {
|
||||
background: linear-gradient(180deg, #f9fbff 0%, #ffffff 100%);
|
||||
border-radius: 8rpx;
|
||||
border: 2rpx solid #f3f3f3;
|
||||
margin-top: 32rpx;
|
||||
margin-top: 24rpx;
|
||||
padding: 24rpx;
|
||||
|
||||
.headTop {
|
||||
|
||||
@ -82,6 +82,10 @@
|
||||
v-for="(item, index) in shopList"
|
||||
:key="index"
|
||||
@click.stop="goBuy(item)"
|
||||
:style="{
|
||||
marginBottom: index + 1 === shopList.length ? '0' : '',
|
||||
borderWidth: index + 1 === shopList.length ? '0' : '',
|
||||
}"
|
||||
>
|
||||
<div class="shopItemTop">
|
||||
<div class="shopImg">
|
||||
@ -447,7 +451,7 @@ export default {
|
||||
box-sizing: border-box;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
border-radius: 48rpx;
|
||||
padding: 12rpx 24rpx;
|
||||
padding: 8rpx 24rpx;
|
||||
.addressIcon {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
|
||||
@ -4,172 +4,187 @@
|
||||
:class="showListPage ? 'mapBox moveLeft' : 'mapBox'"
|
||||
v-if="!showListPage"
|
||||
>
|
||||
<map
|
||||
id="myMap"
|
||||
:longitude="longitude"
|
||||
:latitude="latitude"
|
||||
class="map"
|
||||
:scale="17"
|
||||
:show-location="true"
|
||||
:markers="markers"
|
||||
:enable-scroll="!isDragging"
|
||||
@markertap="handleClickMarker"
|
||||
></map>
|
||||
<movable-area style="width: 100vw; height: 100vh">
|
||||
<map
|
||||
id="myMap"
|
||||
:longitude="longitude"
|
||||
:latitude="latitude"
|
||||
class="map"
|
||||
:scale="17"
|
||||
:show-location="true"
|
||||
:markers="markers"
|
||||
:enable-scroll="!isDragging"
|
||||
@markertap="handleClickMarker"
|
||||
></map>
|
||||
|
||||
<view class="topBox">
|
||||
<view class="topRight">
|
||||
<image
|
||||
class="searchIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png"
|
||||
/>
|
||||
<input
|
||||
style="margin-left: 16rpx; font-size: 28rpx"
|
||||
placeholder="请输入服务区"
|
||||
v-model="searchText"
|
||||
@confirm="handleConfirm"
|
||||
/>
|
||||
<!-- <span class="searchText">请输入服务区</span> -->
|
||||
<view class="topBox">
|
||||
<view class="topRight">
|
||||
<image
|
||||
class="searchIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png"
|
||||
/>
|
||||
<input
|
||||
style="margin-left: 16rpx; font-size: 28rpx"
|
||||
placeholder="请输入服务区"
|
||||
v-model="searchText"
|
||||
@confirm="handleConfirm"
|
||||
/>
|
||||
<!-- <span class="searchText">请输入服务区</span> -->
|
||||
</view>
|
||||
|
||||
<view class="listBox" @click="handleChangePageType">
|
||||
<image class="listIcon" src="/static/home/listIcon.svg" />
|
||||
<text class="text">列表</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="listBox" @click="handleChangePageType">
|
||||
<image class="listIcon" src="/static/home/listIcon.svg" />
|
||||
<text class="text">列表</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="statusBox">
|
||||
<!-- 国网 -->
|
||||
<view class="statusItem">
|
||||
<!-- <image
|
||||
<view class="statusBox">
|
||||
<view>
|
||||
<!-- 国网 -->
|
||||
<view class="statusItem">
|
||||
<!-- <image
|
||||
class="statusIcon"
|
||||
src="https://eshangtech.com/minTestImg/stateGridIcon.png"
|
||||
/> -->
|
||||
<view class="colorBox" style="background-color: #ff9929"></view>
|
||||
<text class="brandCharge">国网</text>
|
||||
<span class="empty">空</span>
|
||||
<view class="valueBox">
|
||||
<span class="emptyValue"
|
||||
>{{
|
||||
chargeData && chargeData.GWDetail
|
||||
? chargeData.GWDetail.GWEmpty
|
||||
: 0
|
||||
}}
|
||||
</span>
|
||||
<span class="sum"
|
||||
>/{{
|
||||
chargeData && chargeData.GWDetail
|
||||
? chargeData.GWDetail.GWSum
|
||||
: 0
|
||||
}}</span
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
<view class="colorBox" style="background-color: #ff9929"></view>
|
||||
<text class="brandCharge">国网</text>
|
||||
<span class="empty">空</span>
|
||||
<view class="valueBox">
|
||||
<span class="emptyValue"
|
||||
>{{
|
||||
chargeData && chargeData.GWDetail
|
||||
? chargeData.GWDetail.GWEmpty
|
||||
: 0
|
||||
}}
|
||||
</span>
|
||||
<span class="sum"
|
||||
>/{{
|
||||
chargeData && chargeData.GWDetail
|
||||
? chargeData.GWDetail.GWSum
|
||||
: 0
|
||||
}}</span
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 理想 -->
|
||||
<view class="statusItem">
|
||||
<view class="colorBox" style="background-color: #d81e06"></view>
|
||||
<!-- <image
|
||||
<!-- 理想 -->
|
||||
<view class="statusItem">
|
||||
<view class="colorBox" style="background-color: #d81e06"></view>
|
||||
<!-- <image
|
||||
class="statusIcon"
|
||||
src="https://eshangtech.com/minTestImg/LXIcon.png"
|
||||
/> -->
|
||||
<text class="brandCharge">理想</text>
|
||||
<span class="empty">空</span>
|
||||
<view class="valueBox">
|
||||
<span class="emptyValue">{{
|
||||
chargeData && chargeData.LXDetail
|
||||
? chargeData.LXDetail.LXEmpty
|
||||
: 0
|
||||
}}</span>
|
||||
<span class="sum"
|
||||
>/{{
|
||||
chargeData && chargeData.LXDetail
|
||||
? chargeData.LXDetail.LXSum
|
||||
: 0
|
||||
}}</span
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
<text class="brandCharge">理想</text>
|
||||
<span class="empty">空</span>
|
||||
<view class="valueBox">
|
||||
<span class="emptyValue">{{
|
||||
chargeData && chargeData.LXDetail
|
||||
? chargeData.LXDetail.LXEmpty
|
||||
: 0
|
||||
}}</span>
|
||||
<span class="sum"
|
||||
>/{{
|
||||
chargeData && chargeData.LXDetail
|
||||
? chargeData.LXDetail.LXSum
|
||||
: 0
|
||||
}}</span
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 蔚来 -->
|
||||
<view class="statusItem" v-if="false">
|
||||
<!-- <image
|
||||
<!-- 蔚来 -->
|
||||
<view class="statusItem" v-if="false">
|
||||
<!-- <image
|
||||
class="statusIcon"
|
||||
src="https://eshangtech.com/minTestImg/WLIcon.png"
|
||||
/> -->
|
||||
<view class="colorBox" style="background-color: #f4ea2a"></view>
|
||||
<text class="brandCharge">蔚来</text>
|
||||
<span class="empty">空</span>
|
||||
<view class="valueBox">
|
||||
<span class="emptyValue">{{
|
||||
chargeData && chargeData.WLDetail
|
||||
? chargeData.WLDetail.WLEmpty
|
||||
? chargeData.WLDetail.WLEmpty
|
||||
: 0
|
||||
: 0
|
||||
}}</span>
|
||||
<span class="sum"
|
||||
>/{{
|
||||
chargeData && chargeData.WLDetail
|
||||
? chargeData.WLDetail.WLSum
|
||||
? chargeData.WLDetail.WLSum
|
||||
<view class="colorBox" style="background-color: #f4ea2a"></view>
|
||||
<text class="brandCharge">蔚来</text>
|
||||
<span class="empty">空</span>
|
||||
<view class="valueBox">
|
||||
<span class="emptyValue">{{
|
||||
chargeData && chargeData.WLDetail
|
||||
? chargeData.WLDetail.WLEmpty
|
||||
? chargeData.WLDetail.WLEmpty
|
||||
: 0
|
||||
: 0
|
||||
: 0
|
||||
}}</span
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
}}</span>
|
||||
<span class="sum"
|
||||
>/{{
|
||||
chargeData && chargeData.WLDetail
|
||||
? chargeData.WLDetail.WLSum
|
||||
? chargeData.WLDetail.WLSum
|
||||
: 0
|
||||
: 0
|
||||
}}</span
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 交控 -->
|
||||
<view class="statusItem">
|
||||
<!-- <image
|
||||
<!-- 交控 -->
|
||||
<view class="statusItem">
|
||||
<!-- <image
|
||||
class="statusIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
|
||||
/> -->
|
||||
<view class="colorBox" style="background-color: #57d16e"></view>
|
||||
<text class="brandCharge">交控新能源</text>
|
||||
<span class="empty">空</span>
|
||||
<view class="valueBox">
|
||||
<span class="emptyValue"
|
||||
>{{
|
||||
chargeData && chargeData.JKDetail
|
||||
? chargeData.JKDetail.JKEmpty
|
||||
: 0
|
||||
}}
|
||||
</span>
|
||||
<span class="sum"
|
||||
>/{{
|
||||
chargeData && chargeData.JKDetail
|
||||
? chargeData.JKDetail.JKSum
|
||||
: 0
|
||||
}}</span
|
||||
>
|
||||
<view class="colorBox" style="background-color: #57d16e"></view>
|
||||
<text class="brandCharge">交控新能源</text>
|
||||
<span class="empty">空</span>
|
||||
<view class="valueBox">
|
||||
<span class="emptyValue"
|
||||
>{{
|
||||
chargeData && chargeData.JKDetail
|
||||
? chargeData.JKDetail.JKEmpty
|
||||
: 0
|
||||
}}
|
||||
</span>
|
||||
<span class="sum"
|
||||
>/{{
|
||||
chargeData && chargeData.JKDetail
|
||||
? chargeData.JKDetail.JKSum
|
||||
: 0
|
||||
}}</span
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="serviceDetailBox" v-if="showChargeBox">
|
||||
<charge-box
|
||||
:serviceAreaList="currentServiceList"
|
||||
:pageType="'mapIndex'"
|
||||
@allChargeData="handleGetChargeData"
|
||||
@allLXDataList="handleLXAddMarker"
|
||||
@allJKDataList="handleJKAddMarker"
|
||||
@allGWDataList="handleGWAddMarker"
|
||||
/>
|
||||
</view>
|
||||
|
||||
<view
|
||||
class="scanBox"
|
||||
@click="handleScan"
|
||||
@touchstart="touchStart"
|
||||
@touchmove="touchMove"
|
||||
@touchend="touchEnd"
|
||||
:style="{ top: positionY + 'px', left: positionX + 'px' }"
|
||||
>
|
||||
<view class="scanIconBox">
|
||||
<image class="scanIcon" src="/static/tabs/scanCode.svg" />
|
||||
<view class="serviceDetailBox" v-if="showChargeBox">
|
||||
<charge-box
|
||||
:serviceAreaList="currentServiceList"
|
||||
:pageType="'mapIndex'"
|
||||
@allChargeData="handleGetChargeData"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<!-- @allLXDataList="handleLXAddMarker"
|
||||
@allJKDataList="handleJKAddMarker"
|
||||
@allGWDataList="handleGWAddMarker" -->
|
||||
|
||||
<movable-view
|
||||
class="scanBox"
|
||||
direction="all"
|
||||
@change="handleChangeScanBox"
|
||||
:x="positionX || 16"
|
||||
:y="positionY || 60"
|
||||
:damping="100"
|
||||
:friction="100"
|
||||
:inertia="false"
|
||||
>
|
||||
<!--
|
||||
:style="{ left: positionX + 'px', top: positionY + 'px' }"
|
||||
|
||||
@touchstart="touchStart"
|
||||
@touchmove="touchMove"
|
||||
@touchend="touchEnd"
|
||||
|
||||
:style="{ left: `${positionX}px`, top: `${positionY}px` }"
|
||||
-->
|
||||
<view class="scanIconBox" @click="handleScan">
|
||||
<image class="scanIcon" src="/static/tabs/scanCode.svg" />
|
||||
</view>
|
||||
</movable-view>
|
||||
</movable-area>
|
||||
</view>
|
||||
|
||||
<view
|
||||
@ -237,25 +252,29 @@ export default {
|
||||
|
||||
startX: 0, // 拖动开始时的 X 坐标
|
||||
startY: 0, // 拖动开始时的 Y 坐标
|
||||
positionX: 0, // 元素当前的 X 坐标
|
||||
positionX: 16, // 元素当前的 X 坐标
|
||||
positionY: 60, // 元素当前的 Y 坐标
|
||||
isDragging: false, // 是否正在拖动
|
||||
screenWidth: 0, // 屏幕宽度
|
||||
screenHeight: 0, // 屏幕高度
|
||||
ticking: false, // 用于requestAnimationFrame节流
|
||||
lastMoveTime: 0, // 上次移动的时间戳，用于节流
|
||||
lastMoveTime: 0, // 上次移动的时间戳，用于节流
|
||||
|
||||
isShowAllData: true, // 判断是否点击了服务区 没有点击 就显示全部的数据 点击了 就显示单个服务区的具体每个品牌的数据
|
||||
};
|
||||
},
|
||||
onLoad() {
|
||||
let systemInfo = uni.getSystemInfoSync();
|
||||
|
||||
console.log("systemInfo", systemInfo);
|
||||
this.positionX = systemInfo.safeArea.width - 66;
|
||||
// this.positionX = systemInfo.safeArea.width - 66;
|
||||
|
||||
this.screenWidth = systemInfo.safeArea.width;
|
||||
this.screenHeight = systemInfo.safeArea.height;
|
||||
let storgeList = uni.getStorageSync("serviceList");
|
||||
if (storgeList) {
|
||||
this.serviceList = JSON.parse(storgeList);
|
||||
this.handleAddServiceMarkers();
|
||||
}
|
||||
let nearService = uni.getStorageSync("nearService");
|
||||
if (nearService) {
|
||||
@ -275,37 +294,52 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 给服务区添加点位
|
||||
handleAddServiceMarkers() {
|
||||
let list = [];
|
||||
if (this.serviceList && this.serviceList.length > 0) {
|
||||
this.serviceList.forEach((item) => {
|
||||
list.push({
|
||||
id: Number(`${item.SERVERPART_ID}`), // 使用时间戳作为唯一ID
|
||||
serviceId: item.SERVERPART_ID,
|
||||
serviceName: `${item.SERVERPART_NAME}`,
|
||||
latitude: item.SERVERPART_Y,
|
||||
longitude: item.SERVERPART_X,
|
||||
iconPath: "/static/home/redFixed.svg",
|
||||
width: 30,
|
||||
height: 30,
|
||||
});
|
||||
});
|
||||
}
|
||||
this.markers = list;
|
||||
},
|
||||
handleChangeScanBox(e) {
|
||||
this.positionX = e.target.offsetLeft;
|
||||
this.positionY = e.target.offsetTop;
|
||||
},
|
||||
touchStart(e) {
|
||||
this.isDragging = true;
|
||||
this.ticking = false; // 重置ticking状态
|
||||
const touch = e.touches[0];
|
||||
this.startX = touch.clientX - this.positionX;
|
||||
this.startY = touch.clientY - this.positionY;
|
||||
},
|
||||
touchMove(e) {
|
||||
if (this.isDragging) {
|
||||
// 使用requestAnimationFrame优化渲染性能
|
||||
if (!this.ticking) {
|
||||
this.ticking = true;
|
||||
this.$nextTick(() => {
|
||||
const touch = e.touches[0];
|
||||
let newPosX = touch.clientX - this.startX;
|
||||
let newPosY = touch.clientY - this.startY;
|
||||
if (!this.isDragging) return;
|
||||
|
||||
// 限制拖动范围，不让元素移出屏幕
|
||||
newPosX = Math.max(0, Math.min(newPosX, this.screenWidth - 50)); // 限制 X 轴范围
|
||||
newPosY = Math.max(0, Math.min(newPosY, this.screenHeight - 50)); // 限制 Y 轴范围
|
||||
// 使用时间戳进行节流，每16ms（约60fps）更新一次位置
|
||||
const touch = e.touches[0];
|
||||
let newPosX = touch.clientX - this.startX;
|
||||
let newPosY = touch.clientY - this.startY;
|
||||
|
||||
this.positionX = newPosX;
|
||||
this.positionY = newPosY;
|
||||
this.ticking = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
// 限制拖动范围，不让元素移出屏幕
|
||||
newPosX = Math.max(0, Math.min(newPosX, this.screenWidth - 50)); // 限制 X 轴范围
|
||||
newPosY = Math.max(0, Math.min(newPosY, this.screenHeight - 50)); // 限制 Y 轴范围
|
||||
|
||||
this.positionX = newPosX;
|
||||
this.positionY = newPosY;
|
||||
},
|
||||
touchEnd(e) {
|
||||
this.isDragging = false;
|
||||
this.ticking = false; // 重置ticking状态
|
||||
},
|
||||
// 取问号后面的参数
|
||||
getQueryParams(url) {
|
||||
@ -700,7 +734,7 @@ export default {
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
|
||||
position: absolute;
|
||||
top: 120rpx;
|
||||
left: 16rpx;
|
||||
right: 16rpx;
|
||||
z-index: 2;
|
||||
.statusItem {
|
||||
display: flex;
|
||||
@ -791,10 +825,10 @@ export default {
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
// bottom: 40rpx;
|
||||
top: 120rpx;
|
||||
// top: 0;
|
||||
// left: 0;
|
||||
right: 16rpx;
|
||||
z-index: 1;
|
||||
// left: 0;
|
||||
z-index: 2;
|
||||
|
||||
.scanIconBox {
|
||||
width: 100rpx;
|
||||
|
||||
@ -452,6 +452,10 @@
|
||||
v-for="(item, i) in merchantList"
|
||||
:key="i"
|
||||
@click="goShop(item)"
|
||||
:style="{
|
||||
marginBottom: i + 1 === merchantList.length ? '0' : '',
|
||||
borderWidth: i + 1 === merchantList.length ? '0' : '',
|
||||
}"
|
||||
>
|
||||
<div>
|
||||
<div class="shopItemTop">
|
||||
@ -553,7 +557,11 @@
|
||||
|
||||
<div
|
||||
class="shopList"
|
||||
v-if="item.GoodsList && item.GoodsList.length > 0"
|
||||
v-if="
|
||||
item.GoodsList &&
|
||||
item.GoodsList.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
"
|
||||
>
|
||||
<div
|
||||
class="shopItem"
|
||||
@ -1130,6 +1138,7 @@ export default {
|
||||
}, // 充电桩数据
|
||||
loginType: "",
|
||||
come: "", // 来自哪个页面
|
||||
isFirst: true,
|
||||
};
|
||||
},
|
||||
async onLoad(query) {
|
||||
@ -1153,14 +1162,19 @@ export default {
|
||||
await this.handleGetMerchant();
|
||||
},
|
||||
async onShow() {
|
||||
let currentService = uni.getStorageSync("currentService");
|
||||
if (
|
||||
currentService.SERVERPART_ID !== this.serverpart &&
|
||||
this.come !== "chargeBox"
|
||||
) {
|
||||
this.serverpart = currentService.SERVERPART_ID;
|
||||
await this.handleGetServerpartDetail(this.serverpart);
|
||||
await this.handleGetMerchant();
|
||||
if (this.isFirst) {
|
||||
this.isFirst = false;
|
||||
} else {
|
||||
let currentService = uni.getStorageSync("currentService");
|
||||
console.log("onShow", currentService);
|
||||
console.log("serverpart", this.serverpart);
|
||||
console.log("come", this.come);
|
||||
// && this.come !== "chargeBox"
|
||||
if (currentService.SERVERPART_ID !== this.serverpart) {
|
||||
this.serverpart = currentService.SERVERPART_ID;
|
||||
await this.handleGetServerpartDetail(this.serverpart);
|
||||
await this.handleGetMerchant();
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@ -1530,7 +1544,7 @@ export default {
|
||||
pageSize: 9999,
|
||||
pageIndex: 1,
|
||||
});
|
||||
let list = data.Data.List;
|
||||
let list = data.Data.List || [];
|
||||
console.log("handleGetMerchant", list);
|
||||
this.merchantList = list;
|
||||
uni.hideLoading();
|
||||
@ -1607,7 +1621,7 @@ export default {
|
||||
.currentServiceBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 16rpx;
|
||||
padding: 8rpx 16rpx;
|
||||
background: #fff;
|
||||
border-radius: 32rpx;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
@ -2441,6 +2455,7 @@ export default {
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
margin-bottom: 24rpx;
|
||||
}
|
||||
|
||||
.newTabList {
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -282,7 +282,7 @@
|
||||
padding: 24rpx;
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
}
|
||||
.main .pageList .listBox .shopItem .leftImgNew.data-v-57bb4cfa {
|
||||
width: 200rpx;
|
||||
@ -297,7 +297,6 @@
|
||||
}
|
||||
.main .pageList .listBox .shopItem .rightItem.data-v-57bb4cfa {
|
||||
width: calc(100% - 200rpx);
|
||||
height: 200rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
.main .top .topContent .currentServiceBox.data-v-5ed2f26c {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 20rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
border-radius: 32rpx;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
}
|
||||
@ -69,9 +69,9 @@
|
||||
justify-content: center;
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 30rpx;
|
||||
font-size: 28rpx;
|
||||
color: #716f69;
|
||||
line-height: 42rpx;
|
||||
line-height: 36rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
padding-bottom: 16rpx;
|
||||
@ -108,7 +108,7 @@
|
||||
}
|
||||
.main .todayRecommendation.data-v-5ed2f26c {
|
||||
width: 100%;
|
||||
margin-top: 48rpx;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
.main .todayRecommendation .todayTitle.data-v-5ed2f26c {
|
||||
font-family: "PingFangSC";
|
||||
@ -134,7 +134,7 @@
|
||||
.main .selectService .currentServiceBox.data-v-5ed2f26c {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 20rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
border-radius: 32rpx;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
}
|
||||
@ -241,7 +241,7 @@
|
||||
.main .header .currentServiceBox.data-v-5ed2f26c {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 20rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
border-radius: 32rpx;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
}
|
||||
|
||||
@ -1296,7 +1296,10 @@ var _default = {
|
||||
Province_Code: "340000",
|
||||
longitude: longitude,
|
||||
latitude: latitude
|
||||
// longitude: 117.202392,
|
||||
// latitude: 31.833196,
|
||||
};
|
||||
|
||||
uni.showLoading({
|
||||
title: "查找最近的服务区..."
|
||||
});
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -46,12 +46,12 @@
|
||||
}
|
||||
.main .topBox .topContent .topRight.data-v-71e217db {
|
||||
width: 302rpx;
|
||||
height: 72rpx;
|
||||
height: 62rpx;
|
||||
background: #f6f8fa;
|
||||
border-radius: 36rpx;
|
||||
margin-left: 24rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 16rpx 20rpx;
|
||||
padding: 12rpx 20rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
@ -323,11 +323,11 @@
|
||||
.main .content .otherFunBox.data-v-71e217db {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx 0 0 0;
|
||||
padding: 24rpx 0 0 0;
|
||||
background: linear-gradient(180deg, #f9fbff 0%, #ffffff 100%);
|
||||
border-radius: 8rpx;
|
||||
border: 2rpx solid #f3f3f3;
|
||||
margin-top: 32rpx;
|
||||
margin-top: 24rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
@ -338,7 +338,7 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
margin-bottom: 32rpx;
|
||||
margin-bottom: 24rpx;
|
||||
}
|
||||
.main .content .otherFunBox .funItem .funItemIcon.data-v-71e217db {
|
||||
width: 48rpx;
|
||||
@ -360,7 +360,7 @@
|
||||
background: linear-gradient(180deg, #f9fbff 0%, #ffffff 100%);
|
||||
border-radius: 8rpx;
|
||||
border: 2rpx solid #f3f3f3;
|
||||
margin-top: 32rpx;
|
||||
margin-top: 24rpx;
|
||||
padding: 24rpx;
|
||||
}
|
||||
.main .content .highwayHeadlines .headTop.data-v-71e217db {
|
||||
|
||||
@ -106,13 +106,15 @@ var render = function () {
|
||||
var l0 = g0
|
||||
? _vm.__map(_vm.shopList, function (item, index) {
|
||||
var $orig = _vm.__get_orig(item)
|
||||
var g1 = item.CouponList && item.CouponList.length > 0
|
||||
var g2 = g1
|
||||
var g1 = _vm.shopList.length
|
||||
var g2 = _vm.shopList.length
|
||||
var g3 = item.CouponList && item.CouponList.length > 0
|
||||
var g4 = g3
|
||||
? item.SCANCODE_ORDER === 1 &&
|
||||
item.CouponList &&
|
||||
item.CouponList.length > 0
|
||||
: null
|
||||
var g3 =
|
||||
var g5 =
|
||||
item.GoodsList &&
|
||||
item.GoodsList.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
@ -121,17 +123,19 @@ var render = function () {
|
||||
g1: g1,
|
||||
g2: g2,
|
||||
g3: g3,
|
||||
g4: g4,
|
||||
g5: g5,
|
||||
}
|
||||
})
|
||||
: null
|
||||
var g4 = !g0 ? _vm.shopList && _vm.shopList.length > 0 : null
|
||||
var g6 = !g0 ? _vm.shopList && _vm.shopList.length > 0 : null
|
||||
_vm.$mp.data = Object.assign(
|
||||
{},
|
||||
{
|
||||
$root: {
|
||||
g0: g0,
|
||||
l0: l0,
|
||||
g4: g4,
|
||||
g6: g6,
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -25,7 +25,7 @@
|
||||
box-sizing: border-box;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
border-radius: 48rpx;
|
||||
padding: 12rpx 24rpx;
|
||||
padding: 8rpx 24rpx;
|
||||
}
|
||||
.main .top .topContent .first .addressIcon.data-v-c850b6c4 {
|
||||
width: 24rpx;
|
||||
|
||||
@ -107,18 +107,25 @@ var render = function () {
|
||||
var l0 = g1
|
||||
? _vm.__map(_vm.merchantList, function (item, i) {
|
||||
var $orig = _vm.__get_orig(item)
|
||||
var g2 = item.CouponList && item.CouponList.length > 0
|
||||
var g3 = g2
|
||||
var g2 = _vm.merchantList.length
|
||||
var g3 = _vm.merchantList.length
|
||||
var g4 = item.CouponList && item.CouponList.length > 0
|
||||
var g5 = g4
|
||||
? item.SCANCODE_ORDER === 1 &&
|
||||
item.CouponList &&
|
||||
item.CouponList.length > 0
|
||||
: null
|
||||
var g4 = item.GoodsList && item.GoodsList.length > 0
|
||||
var g6 =
|
||||
item.GoodsList &&
|
||||
item.GoodsList.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
return {
|
||||
$orig: $orig,
|
||||
g2: g2,
|
||||
g3: g3,
|
||||
g4: g4,
|
||||
g5: g5,
|
||||
g6: g6,
|
||||
}
|
||||
})
|
||||
: null
|
||||
@ -226,7 +233,9 @@ var _default = {
|
||||
},
|
||||
// 充电桩数据
|
||||
loginType: "",
|
||||
come: "" // 来自哪个页面
|
||||
come: "",
|
||||
// 来自哪个页面
|
||||
isFirst: true
|
||||
};
|
||||
},
|
||||
onLoad: function onLoad(query) {
|
||||
@ -273,18 +282,30 @@ var _default = {
|
||||
while (1) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
case 0:
|
||||
if (!_this2.isFirst) {
|
||||
_context2.next = 4;
|
||||
break;
|
||||
}
|
||||
_this2.isFirst = false;
|
||||
_context2.next = 14;
|
||||
break;
|
||||
case 4:
|
||||
currentService = uni.getStorageSync("currentService");
|
||||
if (!(currentService.SERVERPART_ID !== _this2.serverpart && _this2.come !== "chargeBox")) {
|
||||
_context2.next = 7;
|
||||
console.log("onShow", currentService);
|
||||
console.log("serverpart", _this2.serverpart);
|
||||
console.log("come", _this2.come);
|
||||
// && this.come !== "chargeBox"
|
||||
if (!(currentService.SERVERPART_ID !== _this2.serverpart)) {
|
||||
_context2.next = 14;
|
||||
break;
|
||||
}
|
||||
_this2.serverpart = currentService.SERVERPART_ID;
|
||||
_context2.next = 5;
|
||||
_context2.next = 12;
|
||||
return _this2.handleGetServerpartDetail(_this2.serverpart);
|
||||
case 5:
|
||||
_context2.next = 7;
|
||||
case 12:
|
||||
_context2.next = 14;
|
||||
return _this2.handleGetMerchant();
|
||||
case 7:
|
||||
case 14:
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
}
|
||||
@ -715,7 +736,7 @@ var _default = {
|
||||
});
|
||||
case 3:
|
||||
data = _context5.sent;
|
||||
list = data.Data.List;
|
||||
list = data.Data.List || [];
|
||||
console.log("handleGetMerchant", list);
|
||||
_this5.merchantList = list;
|
||||
uni.hideLoading();
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -28,7 +28,7 @@
|
||||
.main .topBox .topContent .currentServiceBox.data-v-49dced80 {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 12rpx 16rpx;
|
||||
padding: 8rpx 16rpx;
|
||||
background: #fff;
|
||||
border-radius: 32rpx;
|
||||
border: 1rpx solid #e7e7e6;
|
||||
@ -732,6 +732,7 @@
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
margin-bottom: 24rpx;
|
||||
}
|
||||
.main .content .popularMerchants .newTabList.data-v-49dced80 {
|
||||
width: 100%;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user