ylj/wanmeiyizhan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-06-11 19:20:31 +08:00
parent 57dde3d600
commit 2bdb2c9f60
76 changed files with 1990 additions and 1209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
components/chargeBox.vue
View File

@ -496,10 +496,14 @@
<view class="bottomItemNew" v-if="styleType === 2" @click.stop="handleOpenDetail(item)"> <view class="bottomItemNew" v-if="styleType === 2" @click.stop="handleOpenDetail(item)">
<view class="leftCharge"> <view class="leftCharge">
<image class="chargeIcon" src="https://eshangtech.com/minTestImg/stateGridIcon.png" /> <image class="chargeIcon" v-if="item.GWDetail && item.GWDetail.GWSum > 0"
<image class="chargeIcon" src="https://eshangtech.com/minTestImg/LXIcon.png" /> src="https://eshangtech.com/minTestImg/stateGridIcon.png" />
<image class="chargeIcon" src="https://eshangtech.com/minTestImg/WLIcon.png" /> <image class="chargeIcon" v-if="item.LXDetail && item.LXDetail.LXSum > 0"
<image class="chargeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" /> src="https://eshangtech.com/minTestImg/LXIcon.png" />
<image class="chargeIcon" v-if="item.WLDetail && item.WLDetail.WLSum > 0"
src="https://eshangtech.com/minTestImg/WLIcon.png" />
<image class="chargeIcon" v-if="item.JKDetail && item.JKDetail.JKSum > 0"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" />
</view> </view>
<view class="rightcharge"> <view class="rightcharge">
<span class="empty">空</span> <span class="empty">空</span>
@ -847,6 +851,7 @@ export default {
// 更新内容的时候 看好 有两版内容 样式需要改两个地方 暂时这样 后续可以变为一个 // 更新内容的时候 看好 有两版内容 样式需要改两个地方 暂时这样 后续可以变为一个
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
onReady() { onReady() {
let SERVERPART_TARGET = uni.getStorageSync("SERVERPART_TARGET"); let SERVERPART_TARGET = uni.getStorageSync("SERVERPART_TARGET");
if (SERVERPART_TARGET) { if (SERVERPART_TARGET) {
this.SERVERPART_TARGETOBJ = JSON.parse(SERVERPART_TARGET); this.SERVERPART_TARGETOBJ = JSON.parse(SERVERPART_TARGET);
@ -1860,6 +1865,10 @@ export default {
}); });
} }
} }
console.log('thisServiceResthisServiceResthisServiceRes', LXData);
// 空多少个 // 空多少个
let LXEmpty = 0; let LXEmpty = 0;
// 一共多少个 // 一共多少个
@ -2027,6 +2036,9 @@ export default {
} }
} }
console.log('thisServiceResthisServiceResthisServiceRes', WLData);
// 空多少个 // 空多少个
let WLEmpty = 0; let WLEmpty = 0;
// 一共多少个 // 一共多少个
@ -2099,13 +2111,46 @@ export default {
}, },
extractDirection(stationName) { extractDirection(stationName) {
if (!stationName) return ''; if (!stationName) return '';
// 方法1：使用正则表达式匹配括号内的方向信息
const directionRegex = /（([^）]+方向)）|\(([^)]+方向)\)/; // 定义方向匹配的正则表达式
const match = stationName.match(directionRegex); const directionPatterns = [
if (match) { /(?:（|\(|【)([^）\)】]*方向)(?:\)|）|】)/, // 匹配括号内的方向
// 返回第一个非空的匹配组（兼容中文和英文括号） /([^，,。.;;！!?？、\s]+方向)/, // 匹配无括号的方向
return match[1] || match[2] || ''; /方向([^，,。.;;！!?？、\s]+)/ // 匹配"方向XX"格式
];
for (const pattern of directionPatterns) {
const match = stationName.match(pattern);
if (match) {
// 提取最核心的方向信息（去掉前后可能的多余字符）
const direction = match[1] || match[0];
return direction.replace(/^[（\(【]|[）\)】]$/g, '').trim();
}
} }
return '';
// if (!stationName) return '';
// const bracketMatch = stationName.match(/(?:（|\().*?方向(?:\)|）)/);
// if (bracketMatch) {
// return bracketMatch[0];
// }
// const plainMatch = stationName.match(/.*?方向/);
// if (plainMatch) {
// return plainMatch[0];
// }
// return '';
// if (!stationName) return '';
// // 方法1：使用正则表达式匹配括号内的方向信息
// const directionRegex = /（([^）]+方向)）|\(([^)]+方向)\)/;
// const match = stationName.match(directionRegex);
// if (match) {
// // 返回第一个非空的匹配组（兼容中文和英文括号）
// return match[1] || match[2] || '';
// }
}, },
// 随机给充电桩数据 // 随机给充电桩数据
handleHaveRandomData() { handleHaveRandomData() {
@ -2827,6 +2872,7 @@ export default {
let electricityFeeObj = {} let electricityFeeObj = {}
if (obj.LXInfoList && obj.LXInfoList.length > 0) { if (obj.LXInfoList && obj.LXInfoList.length > 0) {
console.log('obj.LXInfoList.LXInfoList.LXInfoList', obj.LXInfoList);
let directionList = {} let directionList = {}
let directionTypeList = [] let directionTypeList = []
let electricityFeeStr = '' let electricityFeeStr = ''
@ -2887,6 +2933,7 @@ export default {
} }
if (obj.WLInfoList && obj.WLInfoList.length > 0) { if (obj.WLInfoList && obj.WLInfoList.length > 0) {
console.log('obj.WLInfoListobj.WLInfoListobj.WLInfoList', obj.WLInfoList);
let directionList = {} let directionList = {}
let directionTypeList = [] let directionTypeList = []
@ -3134,6 +3181,8 @@ export default {
this.selectElectricityFee = this.electricityFeeRes[list[0].label] || [] this.selectElectricityFee = this.electricityFeeRes[list[0].label] || []
this.pageDirection = pageDirection this.pageDirection = pageDirection
console.log('this.pageDirectionthis.pageDirectionthis.pageDirection', this.pageDirection);
this.$emit("handleChangeShow", true); this.$emit("handleChangeShow", true);
this.$refs.popup.open("bottom"); this.$refs.popup.open("bottom");
this.isShow = true; this.isShow = true;
@ -3174,7 +3223,7 @@ export default {
this.selectElectricityFee = this.electricityFeeRes['蔚来'] || [] this.selectElectricityFee = this.electricityFeeRes['蔚来'] || []
} }
this.selectSmallTab = 0
}, },
handleChangeSmallTab(value) { handleChangeSmallTab(value) {

22
components/chargeBoxStyle.vue
View File

@ -64,7 +64,7 @@
<span class="line"></span> <span class="line"></span>
<span class="address">{{ <span class="address">{{
item.SERVERPART_ADDRESS || "-" item.SERVERPART_ADDRESS || "-"
}}</span> }}</span>
</div> </div>
<scroll-view :scroll-x="true" class="typeList" <scroll-view :scroll-x="true" class="typeList"
v-if="item.ServerpartInfo.SERVERPART_TARGET"> v-if="item.ServerpartInfo.SERVERPART_TARGET">
@ -99,10 +99,14 @@
<view class="bottomItemNew" @click.stop="handleOpenDetail(item)"> <view class="bottomItemNew" @click.stop="handleOpenDetail(item)">
<view class="leftCharge"> <view class="leftCharge">
<image class="chargeIcon" src="https://eshangtech.com/minTestImg/stateGridIcon.png" /> <image class="chargeIcon" v-if="item.GWDetail && item.GWDetail.GWSum > 0"
<image class="chargeIcon" src="https://eshangtech.com/minTestImg/LXIcon.png" /> src="https://eshangtech.com/minTestImg/stateGridIcon.png" />
<image class="chargeIcon" src="https://eshangtech.com/minTestImg/WLIcon.png" /> <image class="chargeIcon" v-if="item.LXDetail && item.LXDetail.LXSum > 0"
<image class="chargeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" /> src="https://eshangtech.com/minTestImg/LXIcon.png" />
<image class="chargeIcon" v-if="item.WLDetail && item.WLDetail.WLSum > 0"
src="https://eshangtech.com/minTestImg/WLIcon.png" />
<image class="chargeIcon" v-if="item.JKDetail && item.JKDetail.JKSum > 0"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" />
</view> </view>
<view class="rightcharge"> <view class="rightcharge">
<span class="empty">空</span> <span class="empty">空</span>
@ -257,7 +261,7 @@
<span class="label">最大功率</span> <span class="label">最大功率</span>
<span class="value">{{ <span class="value">{{
item.Power ? item.Power + "kw" : "" item.Power ? item.Power + "kw" : ""
}}</span> }}</span>
</div> </div>
<div class="noticeList"> <div class="noticeList">
@ -459,9 +463,12 @@ export default {
}, },
// 打开对应的悬浮框 // 打开对应的悬浮框
handleOpenDetail(item) { handleOpenDetail(item) {
console.log('this.noChargeDetail', this.noChargeDetail);
if (this.noChargeDetail) { if (this.noChargeDetail) {
return return
} }
let obj = {} let obj = {}
if (item) { if (item) {
obj = item obj = item
@ -823,7 +830,8 @@ export default {
uni.setStorageSync("currentService", res); // 当前选中服务区信息 uni.setStorageSync("currentService", res); // 当前选中服务区信息
if (this.comeForm === "home") { if (this.comeForm === "home") {
uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" }); // uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
uni.navigateTo({ url: "/pages/serviceDetail/index" });
} else { } else {
uni.navigateBack({ uni.navigateBack({
delta: 1, delta: 1,

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "驿佳", "name" : "驿佳",
"appid" : "__UNI__F870657", "appid" : "__UNI__F870657",
"description" : "", "description" : "",
"versionName" : "1.0.30", "versionName" : "1.0.31",
"versionCode" : 1030, "versionCode" : 1031,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

7
pages/home/newIndex.vue
View File

@ -345,6 +345,10 @@ export default {
label: "投诉建议", value: 8, id: "NewSuggestIcon", src: "/static/home/NewSuggestIcon.png", label: "投诉建议", value: 8, id: "NewSuggestIcon", src: "/static/home/NewSuggestIcon.png",
desc: "如果您对我们的服务有任何意见或建议，或者遇到了问题，请使用‘投诉建议’，直接向我们反馈，我们会认真倾听并改进！" desc: "如果您对我们的服务有任何意见或建议，或者遇到了问题，请使用‘投诉建议’，直接向我们反馈，我们会认真倾听并改进！"
}, },
// {
// label: "投诉建议", value: 8, id: "NewSuggestIcon", src: "https://eshangtech.com/wanmeiyizhanImg/NewSuggestIcon.png",
// desc: "如果您对我们的服务有任何意见或建议，或者遇到了问题，请使用‘投诉建议’，直接向我们反馈，我们会认真倾听并改进！"
// },
], // 可以跳转的功能列表 ], // 可以跳转的功能列表
tabList: [ tabList: [
{ label: "驿达推荐", desc: "推荐精选", value: 1 }, { label: "驿达推荐", desc: "推荐精选", value: 1 },
@ -987,7 +991,8 @@ export default {
if (obj.value === 1) { if (obj.value === 1) {
// 扫码充电 // 扫码充电
if (this.loginType === "min") { if (this.loginType === "min") {
uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndex" }); // uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndex" });
uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndexAPP" });
} else { } else {
uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndexAPP" }); uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndexAPP" });
} }

1
pages/scanCodeCharge/components/chargeBox.vue
View File

@ -1482,6 +1482,7 @@ export default {
} else { } else {
this.chargeDetailList = []; this.chargeDetailList = [];
} }
this.selectSmallTab = 0
}, },
}, },
}; };

324
pages/scanCodeCharge/mapIndexAPP.vue
View File

@ -15,97 +15,204 @@
</view> </view>
</view> --> </view> -->
<view style="width: 100vw; height: calc(100vh - 606rpx);position: relative;" v-show="showMap"> <cover-view v-if="loginType !== 'min'" style="width: 100vw; height: calc(100vh - 606rpx);position: relative;"
v-show="showMap">
<map id="myMap" :longitude="longitude" :latitude="latitude" class="map" :scale="17" :show-location="true" <map id="myMap" :longitude="longitude" :latitude="latitude" class="map" :scale="17" :show-location="true"
:markers="markers" :enable-scroll="!isDragging" @markertap="handleClickMarker"></map> :markers="markers" :enable-scroll="!isDragging" @markertap="handleClickMarker"></map>
<view v-if="false">
<cover-view class="statusBox" :style="{ left: showListPage ? '-2000px' : '' }" @tap="handleShowChargeDetail">
<cover-view>
<!-- 国网 -->
<cover-view class="statusItem" style="margin: 0 16rpx;">
<cover-view class="colorBox" style="background-color: #ff9929"></cover-view>
<cover-view class="brandCharge">国网</cover-view>
<cover-view class="empty">空</cover-view>
<cover-view class="valueBox">
<cover-view class="emptyValue">{{
chargeData && chargeData.GWDetail
? chargeData.GWDetail.GWEmpty
: 0
}}
</cover-view>
<cover-view class="sum">/{{
chargeData && chargeData.GWDetail
? chargeData.GWDetail.GWSum
: 0
}}</cover-view>
</cover-view>
</cover-view>
<!-- 理想 --> <cover-view class="statusBox" style="z-index: 9999;">
<cover-view class="statusItem" style="margin: 0 16rpx;"> <!-- 国网 -->
<cover-view class="colorBox" style="background-color: #d81e06"></cover-view> <cover-view class="statusItem" style="margin: 0 16rpx;">
<cover-view class="colorBox" style="background-color: #ff9929"></cover-view>
<cover-view class="brandCharge">理想</cover-view> <cover-view class="brandCharge">国网</cover-view>
<cover-view class="empty">空</cover-view> <cover-view class="empty">空</cover-view>
<cover-view class="valueBox"> <cover-view class="valueBox">
<cover-view class="emptyValue">{{ <cover-view class="emptyValue">{{
chargeData && chargeData.LXDetail chargeData && chargeData.GWDetail
? chargeData.LXDetail.LXEmpty ? chargeData.GWDetail.GWEmpty
: 0 : 0
}}</cover-view> }}
<cover-view class="sum">/{{
chargeData && chargeData.LXDetail
? chargeData.LXDetail.LXSum
: 0
}}</cover-view>
</cover-view>
</cover-view>
<!-- 蔚来 -->
<cover-view class="statusItem">
<cover-view class="colorBox" style="background-color: #f4ea2a;margin: 0 16rpx;"></cover-view>
<cover-view class="brandCharge">蔚来</cover-view>
<cover-view class="empty">空</cover-view>
<cover-view class="valueBox">
<cover-view class="emptyValue">{{
chargeData && chargeData.WLDetail
? chargeData.WLDetail.WLEmpty
? chargeData.WLDetail.WLEmpty
: 0
: 0
}}</cover-view>
<cover-view class="sum">/{{
chargeData && chargeData.WLDetail
? chargeData.WLDetail.WLSum
? chargeData.WLDetail.WLSum
: 0
: 0
}}</cover-view>
</cover-view>
</cover-view>
<!-- 交控 -->
<cover-view class="statusItem" style="margin: 0 16rpx;">
<cover-view class="colorBox" style="background-color: #57d16e"></cover-view>
<cover-view class="brandCharge">交控新能源</cover-view>
<cover-view class="empty">空</cover-view>
<cover-view class="valueBox">
<cover-view class="emptyValue">{{
chargeData && chargeData.JKDetail
? chargeData.JKDetail.JKEmpty
: 0
}}
</cover-view>
<cover-view class="sum">/{{
chargeData && chargeData.JKDetail
? chargeData.JKDetail.JKSum
: 0
}}</cover-view>
</cover-view>
</cover-view> </cover-view>
<cover-view class="sum">/{{
chargeData && chargeData.GWDetail
? chargeData.GWDetail.GWSum
: 0
}}</cover-view>
</cover-view> </cover-view>
</cover-view> </cover-view>
<!-- 理想 -->
<cover-view class="statusItem" style="margin: 0 16rpx;">
<cover-view class="colorBox" style="background-color: #d81e06"></cover-view>
<cover-view class="brandCharge">理想</cover-view>
<cover-view class="empty">空</cover-view>
<cover-view class="valueBox">
<cover-view class="emptyValue">{{
chargeData && chargeData.LXDetail
? chargeData.LXDetail.LXEmpty
: 0
}}</cover-view>
<cover-view class="sum">/{{
chargeData && chargeData.LXDetail
? chargeData.LXDetail.LXSum
: 0
}}</cover-view>
</cover-view>
</cover-view>
<!-- 蔚来 -->
<cover-view class="statusItem">
<cover-view class="colorBox" style="background-color: #f4ea2a;margin: 0 16rpx;"></cover-view>
<cover-view class="brandCharge">蔚来</cover-view>
<cover-view class="empty">空</cover-view>
<cover-view class="valueBox">
<cover-view class="emptyValue">{{
chargeData && chargeData.WLDetail
? chargeData.WLDetail.WLEmpty
? chargeData.WLDetail.WLEmpty
: 0
: 0
}}</cover-view>
<cover-view class="sum">/{{
chargeData && chargeData.WLDetail
? chargeData.WLDetail.WLSum
? chargeData.WLDetail.WLSum
: 0
: 0
}}</cover-view>
</cover-view>
</cover-view>
<!-- 交控 -->
<cover-view class="statusItem" style="margin: 0 16rpx;">
<cover-view class="colorBox" style="background-color: #57d16e"></cover-view>
<cover-view class="brandCharge">交控新能源</cover-view>
<cover-view class="empty">空</cover-view>
<cover-view class="valueBox">
<cover-view class="emptyValue">{{
chargeData && chargeData.JKDetail
? chargeData.JKDetail.JKEmpty
: 0
}}
</cover-view>
<cover-view class="sum">/{{
chargeData && chargeData.JKDetail
? chargeData.JKDetail.JKSum
: 0
}}</cover-view>
</cover-view>
</cover-view>
</cover-view>
</cover-view>
<view v-else style="width: 100vw; height: calc(100vh - 606rpx);position: relative;" v-show="showMap">
<map id="myMap" :longitude="longitude" :latitude="latitude" class="map" :scale="17" :show-location="true"
:markers="markers" :enable-scroll="!isDragging" @markertap="handleClickMarker"></map>
<view class="statusBox" @click="handleShowChargeDetail">
<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="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>
<!-- 蔚来 -->
<view class="statusItem">
<!-- <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
: 0
: 0
}}</span>
</view>
</view>
<!-- 交控 -->
<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>
</view>
</view>
</view> </view>
</view> </view>
<view class="pageBottomStyle"> <view class="pageBottomStyle">
@ -134,7 +241,8 @@
</view> </view>
<view class="currentServiceBox"> <view class="currentServiceBox">
<chargeBoxStyle :dataList="dataList" :pageType="'mapList'" :hideConfig="true" :noChargeDetail="true" /> <chargeBoxStyle :dataList="dataList" :pageType="'mapList'" :hideConfig="true"
:noChargeDetail="loginType !== 'min'" />
</view> </view>
</view> </view>
@ -254,6 +362,9 @@ export default {
}, },
async onLoad() { async onLoad() {
let systemInfo = uni.getSystemInfoSync(); let systemInfo = uni.getSystemInfoSync();
let type = uni.getStorageSync("loginType");
this.loginType = type;
console.log('this.loginType', this.loginType);
// this.positionX = systemInfo.safeArea.width - 66; // this.positionX = systemInfo.safeArea.width - 66;
@ -297,13 +408,28 @@ export default {
methods: { methods: {
extractDirection(stationName) { extractDirection(stationName) {
if (!stationName) return ''; if (!stationName) return '';
// 方法1：使用正则表达式匹配括号内的方向信息 // 定义方向匹配的正则表达式（按优先级排序）
const directionRegex = /（([^）]+方向)）|\(([^)]+方向)\)/; const directionPatterns = [
const match = stationName.match(directionRegex); /(?:（|\(|【)([^）\)】]*方向\d*)(?:\)|）|】)/, // 匹配括号内的方向（可含数字）
if (match) { /([^，,。.;;！!?？、\s]+方向\d*)/, // 匹配无括号的方向（可含数字）
// 返回第一个非空的匹配组（兼容中文和英文括号） /方向([^，,。.;;！!?？、\s]+)/ // 匹配"方向XX"格式
return match[1] || match[2] || ''; ];
for (const pattern of directionPatterns) {
const match = stationName.match(pattern);
if (match) {
// 提取最核心的方向信息
let direction = match[1] || match[0];
// 清理结果：去除括号和数字
direction = direction
.replace(/^[（\(【]|[）\)】]$/g, '') // 去除括号
.replace(/\d+$/, '') // 去除末尾数字
.trim();
return direction;
}
} }
return '';
}, },
// 每次进入页面拿到一次繁忙度的数据 // 每次进入页面拿到一次繁忙度的数据
async handleGetBusiness() { async handleGetBusiness() {
@ -537,7 +663,7 @@ export default {
this.isLoading = false this.isLoading = false
this.dataList = list this.dataList = list
console.log('djasijdaskjdaslkdj', this.dataList); console.log('djasijdaskjdaslkdj', this.dataList);
this.chargeData = list[0]
}, },
// 到充电数据 // 到充电数据
async handleGetChargeData(serviceList, idList) { async handleGetChargeData(serviceList, idList) {
@ -2032,7 +2158,8 @@ export default {
color: #ffffff; color: #ffffff;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
display: inline-block; display: inline-flex;
align-items: center;
background-color: #009DFF; background-color: #009DFF;
padding: 6rpx 30rpx 10rpx 32rpx; padding: 6rpx 30rpx 10rpx 32rpx;
border-radius: 32rpx; border-radius: 32rpx;
@ -2169,7 +2296,8 @@ export default {
color: #ffffff; color: #ffffff;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
display: inline-block; display: inline-flex;
align-items: center;
background-color: #009DFF; background-color: #009DFF;
padding: 6rpx 30rpx 10rpx 32rpx; padding: 6rpx 30rpx 10rpx 32rpx;
border-radius: 32rpx; border-radius: 32rpx;
@ -2183,7 +2311,7 @@ export default {
margin-top: 20rpx; margin-top: 20rpx;
.funItem { .funItem {
height: 40rpx; height: 50rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 10rpx 16rpx; padding: 10rpx 16rpx;
background-color: #009DFF; background-color: #009DFF;
@ -2192,15 +2320,15 @@ export default {
align-items: center; align-items: center;
.funItemIcon { .funItemIcon {
width: 20rpx; width: 28rpx;
height: 20rpx; height: 28rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.funItemText { .funItemText {
font-family: Source Han Sans SC, Source Han Sans SC; font-family: Source Han Sans SC, Source Han Sans SC;
font-weight: 400; font-weight: 400;
font-size: 20rpx; font-size: 26rpx;
color: #FFFFFF; color: #FFFFFF;
text-align: left; text-align: left;
font-style: normal; font-style: normal;

24
pages/scanCodeCharge/travelNavigation.vue
View File

@ -1992,13 +1992,33 @@ export default {
}, },
name: this.endObj.name, name: this.endObj.name,
}, },
pageType: 1 pageType: 0
} }
// OneNavi.calculateDriveRoute({
// start: [//起点
// {
// latitude: this.startObj.latitude,
// longitude: this.startObj.longitude
// }
// ],
// end: [//终点
// {
// latitude: this.endObj.latitude,
// longitude: this.endObj.longitude
// }
// ],
// strategy: 20//策略，取值0-20，参考https://lbs.amap.com/api/android-navi-sdk/guide/route-plan/drive-route-plan
// });
OneNavi.showRoute(req, () => { OneNavi.showRoute(req, () => {
console.log('进去了'); // console.log('进去了');
}) })
} }

2
pages/serviceDetail/index.vue
View File

@ -1166,7 +1166,7 @@ export default {
}, },
name: obj.SERVERPART_NAME, name: obj.SERVERPART_NAME,
}, },
pageType: 1 pageType: 0
} }
OneNavi.showRoute(req, () => { OneNavi.showRoute(req, () => {

6
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/manifest.json vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/card.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/currentService.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/keyboard.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/noData.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/contact/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/couponDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/discovery/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/detail.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/bindingCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/complaints/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/complaintsAndQuestionare/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/complaintsDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/consumption/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/help/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/integral/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/myCoupon/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/mycar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/newComplaints/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeFn/payfor/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/mapIndex.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/investMoney/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/register.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mallHome/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/address/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/newAdd/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newEvaluate/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newMap/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orders/buydetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orders/order/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orders/orderdetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payAgreement/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/product/productDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/product/shopCart/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/rate/components/rateItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/rate/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/reservationOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/scanCodeCharge/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/mapDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/shopDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/coupon/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/orderRemark/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/thirdParty/aliPay.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/thirdParty/chargAndSwapp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/thirdParty/newPage.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/thirdParty/testPage.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/userCenter/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js.map vendored
View File

File diff suppressed because one or more lines are too long

1239
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

1364
unpackage/dist/dev/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/mp-weixin/pages/serviceDetail/index.js vendored
View File

@ -450,7 +450,7 @@ var _default = {
}, },
name: obj.SERVERPART_NAME name: obj.SERVERPART_NAME
}, },
pageType: 1 pageType: 0
}; };
OneNavi.showRoute(req, function () { OneNavi.showRoute(req, function () {
console.log('进去了'); console.log('进去了');

7
unpackage/dist/dev/mp-weixin/project.private.config.json vendored
View File

@ -7,6 +7,13 @@
"condition": { "condition": {
"miniprogram": { "miniprogram": {
"list": [ "list": [
{
"name": "pages/scanCodeCharge/mapIndex",
"pathName": "pages/scanCodeCharge/mapIndex",
"query": "",
"launchMode": "default",
"scene": null
},
{ {
"name": "pages/scanCodeCharge/mapIndexAPP", "name": "pages/scanCodeCharge/mapIndexAPP",
"pathName": "pages/scanCodeCharge/mapIndexAPP", "pathName": "pages/scanCodeCharge/mapIndexAPP",