first commit

This commit is contained in:
cclu 2025-04-03 18:40:27 +08:00
parent f169d89786
commit 07668a531b
90 changed files with 906 additions and 323 deletions

View File

@ -252,14 +252,14 @@
<view class="chargeInfo">
<span class="empty"></span>
<span class="emptyValue">{{
item.SunDetail && item.SunDetail.SunEmpty
? item.SunDetail.SunEmpty
item.JKDetail && item.JKDetail.JKEmpty
? item.JKDetail.JKEmpty
: "0"
}}</span>
<span class="sum"
>/{{
item.SunDetail && item.SunDetail.SunSum
? item.SunDetail.SunSum
item.JKDetail && item.JKDetail.JKSum
? item.JKDetail.JKSum
: "0"
}}</span
>
@ -278,16 +278,14 @@
<view class="chargeInfo">
<span class="empty"></span>
<span class="emptyValue">{{
item.chargeAndReplaceDetail &&
item.chargeAndReplaceDetail.chargeAndReplace
? item.chargeAndReplaceDetail.chargeAndReplace
item.GWDetail && item.GWDetail.GWEmpty
? item.GWDetail.GWEmpty
: "0"
}}</span>
<span class="sum"
>/{{
item.chargeAndReplaceDetail &&
item.chargeAndReplaceDetail.chargeAndReplaceSum
? item.chargeAndReplaceDetail.chargeAndReplaceSum
item.GWDetail && item.GWDetail.GWSum
? item.GWDetail.GWSum
: "0"
}}</span
>
@ -517,7 +515,7 @@
<view
class="centerItem"
@click.stop="handleGoServiceDetail(item.SERVERPART_ID, item)"
v-if="styleType === 1"
v-if="styleType === 1 && pageType !== 'mapList'"
>
<!-- 拥有设施的小图标 -->
<view
@ -531,7 +529,10 @@
</view>
<!-- 新款样式 -->
<view class="centerItem" v-if="styleType === 2">
<view
class="centerItem"
v-if="styleType === 2 || pageType === 'mapList'"
>
<!-- @click.stop="handleGoServiceDetail(item.SERVERPART_ID, item)" -->
<view
@ -629,14 +630,14 @@
<view class="chargeInfo">
<span class="empty"></span>
<span class="emptyValue">{{
item.SunDetail && item.SunDetail.SunEmpty
? item.SunDetail.SunEmpty
item.JKDetail && item.JKDetail.JKEmpty
? item.JKDetail.JKEmpty
: "0"
}}</span>
<span class="sum"
>/{{
item.SunDetail && item.SunDetail.SunSum
? item.SunDetail.SunSum
item.JKDetail && item.JKDetail.JKSum
? item.JKDetail.JKSum
: "0"
}}</span
>
@ -655,16 +656,14 @@
<view class="chargeInfo">
<span class="empty"></span>
<span class="emptyValue">{{
item.chargeAndReplaceDetail &&
item.chargeAndReplaceDetail.chargeAndReplace
? item.chargeAndReplaceDetail.chargeAndReplace
item.GWDetail && item.GWDetail.GWEmpty
? item.GWDetail.GWSum
: "0"
}}</span>
<span class="sum"
>/{{
item.chargeAndReplaceDetail &&
item.chargeAndReplaceDetail.chargeAndReplaceSum
? item.chargeAndReplaceDetail.chargeAndReplaceSum
item.GWDetail && item.GWDetail.GWEmpty
? item.GWDetail.GWSum
: "0"
}}</span
>
@ -1017,6 +1016,10 @@ export default {
type: String,
default: "",
},
pageStyleType: {
type: Number,
default: 2,
},
},
//
// #ifdef MP-WEIXIN
@ -1031,12 +1034,20 @@ export default {
this.handleSERVERPART_TARGETOBJ();
}
this.handldGetData();
console.log("pageStyleType", this.pageStyleType);
if (this.pageStyleType === 1) {
this.styleType = 1;
}
},
// #endif
// #ifdef APP-PLUS
mounted() {
console.log("onReady");
console.log("showType", this.showType);
if (this.pageStyleType === 1) {
this.styleType = 1;
}
let SERVERPART_TARGET = uni.getStorageSync("SERVERPART_TARGET");
if (SERVERPART_TARGET) {
this.SERVERPART_TARGETOBJ = JSON.parse(SERVERPART_TARGET);
@ -1060,6 +1071,8 @@ export default {
methods: {
//
handleGoDetail(id, obj) {
console.log("this.pageType", this.pageType);
if (this.pageType === "newMap") {
let res = this.handleChangeServiceInfo(obj);
// let res = {
@ -1071,6 +1084,8 @@ export default {
// latitude: obj.SERVERPART_Y
// }
uni.setStorageSync("currentService", res); //
console.log("this.comeForm", this.comeForm);
if (this.comeForm === "home") {
uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
} else {
@ -1305,12 +1320,12 @@ export default {
});
}
subItem.LiXiang = LIAUTOCHARGESum;
subItem.Sun = STATEGRIDCHARGESum;
// subItem.Sun = STATEGRIDCHARGESum;
subItem.chargeAndReplaceSum = GACENERGYCHARGESum;
//
subItem.imgList =
this.styleType === 1
this.styleType === 1 && this.pageType !== "mapList"
? [
{
url:
@ -1591,7 +1606,7 @@ export default {
// title: "",
// },
]
: this.styleType === 2
: this.styleType === 2 || this.pageType === "mapList"
? [
{
url:
@ -1718,7 +1733,7 @@ export default {
let chargeAndReplaceRate = this.handleGetRandomData(0, 60);
subItem.LXHave = Math.floor(subItem.LiXiang * (LXRate / 100));
subItem.SunHave = Math.floor(subItem.Sun * (SunRate / 100));
// subItem.SunHave = Math.floor(subItem.Sun * (SunRate / 100));
subItem.chargeAndReplace = Math.floor(
subItem.chargeAndReplaceSum * (chargeAndReplaceRate / 100)
);
@ -1758,7 +1773,7 @@ export default {
});
const res = await new Promise((resolve, reject) => {
uni.request({
url: `https://restapi.amap.com/v3/direction/driving?key=${key}&origin=${start}&destination=${itemEnd}&strategy=0`,
url: `https://restapi.amap.com/v3/direction/driving?key=${key}&origin=${start}&destination=${itemEnd}&strategy=20`,
method: "GET",
success(res) {
if (
@ -1825,16 +1840,16 @@ export default {
WLEmpty: Math.floor(WLSum * (WLRate / 100)),
WLSum: WLSum,
};
item.SunDetail = {
SunEmpty: Math.floor(SunSum * (SunRate / 100)),
SunSum: SunSum,
};
item.chargeAndReplaceDetail = {
chargeAndReplace: Math.floor(
chargeAndReplaceSum * (chargeAndReplaceRate / 100)
),
chargeAndReplaceSum: chargeAndReplaceSum,
};
// item.SunDetail = {
// SunEmpty: Math.floor(SunSum * (SunRate / 100)),
// SunSum: SunSum,
// };
// item.GWDetail = {
// GWEmpty: Math.floor(
// chargeAndReplaceSum * (chargeAndReplaceRate / 100)
// ),
// GWSum: chargeAndReplaceSum,
// };
}
}
@ -1874,7 +1889,7 @@ export default {
//
newRes = await _this.handleTrafficControlData(newRes, nameList);
//
// newRes = await _this.handleGetStateGrid(newRes, nameList);
newRes = await _this.handleGetStateGrid(newRes, nameList);
if (this.pageType === "mapIndex") {
this.$emit("allChargeData", { res: newRes });
@ -2121,18 +2136,34 @@ export default {
LXEmpty: LXEmpty,
};
if (this.styleType === 2) {
if (this.styleType === 2 || this.pageType === "mapList") {
item.allChargeDetail = {
allSum:
Number(LXSum || 0) +
Number(item.WLDetail.WLSum || 0) +
Number(item.SunDetail.SunSum || 0) +
Number(item.chargeAndReplaceDetail.chargeAndReplaceSum || 0),
Number(
item.JKDetail && item.JKDetail.JKSum
? item.JKDetail.JKSum
: 0
) +
Number(
item.GWDetail && item.GWDetail.GWSum
? item.GWDetail.GWSum
: 0
),
empty:
Number(LXEmpty || 0) +
Number(item.WLDetail.WLEmpty || 0) +
Number(item.SunDetail.WLEmpty || 0) +
Number(item.chargeAndReplaceDetail.WLEmpty || 0),
Number(
item.JKDetail && item.JKDetail.JKEmpty
? item.JKDetail.JKEmpty
: 0
) +
Number(
item.GWDetail && item.GWDetail.GWEmpty
? item.GWDetail.GWEmpty
: 0
),
};
}
@ -2306,7 +2337,7 @@ export default {
JKSum: JKSum,
JKEmpty: JKEmpty,
};
if (this.styleType === 2) {
if (this.styleType === 2 || this.pageType === "mapList") {
item.allChargeDetail = {
allSum:
Number(
@ -2314,7 +2345,9 @@ export default {
) +
Number(item.WLDetail.WLSum || 0) +
Number(JKSum || 0) +
Number(item.chargeAndReplaceDetail.chargeAndReplaceSum || 0),
Number(
item.GWDetail && item.GWDetail.GWSum ? item.GWDetail.GWSum : 0
),
empty:
Number(
item.LXDetail && item.LXDetail.LXEmpty
@ -2324,7 +2357,9 @@ export default {
Number(item.WLDetail.WLEmpty || 0) +
Number(JKEmpty || 0) +
Number(
item.chargeAndReplaceDetail.chargeAndReplaceSumEmpty || 0
item.GWDetail && item.GWDetail.GWEmpty
? item.GWDetail.GWEmpty
: 0
),
};
}
@ -2354,7 +2389,7 @@ export default {
const DataSecret = "fK7YzAq1R8Vp9hL0"; // fK7YzAq1R8Vp9hL0 DataSecret
const DataSecretIV = "z3XnWl8FQ2pTm5Ba"; // z3XnWl8FQ2pTm5Ba DataSecretIV
let url = `https://dipper-ah.ahcce.com/jgpt-gateway/third`;
let url = `https://dipper.in.ah.cn/jgpt-gateway/third`;
let tokenData = await this.$testApi.$post("/send", {
url: `${url}/supervise/v1.0.0/query_token`,
@ -2369,7 +2404,18 @@ export default {
console.log("国网", tokenData);
let token = tokenData.data.Data.AccessToken;
const allStationList = await this.$testApi.$post("/send", {
let allStationList = [];
let GWDataList = uni.getStorageSync("GWDataList");
let dataTime = new Date(GWDataList.timestamp || 0).getTime();
let nowTime = new Date().getTime();
// 15 15
if (GWDataList && nowTime < dataTime + 1000 * 60 * 15) {
allStationList = GWDataList;
this.handleGetGWAllData(token);
} else {
allStationList = await this.$testApi.$post("/send", {
url: `${url}/supervise/v1.0.0/query_supervise_stations_info`,
data: JSON.stringify({
PageNo: 1,
@ -2379,8 +2425,13 @@ export default {
seq: "002",
token: token,
});
uni.setStorageSync("GWDataList", allStationList);
}
let allStationDataList = allStationList.data.Data.StationInfos;
if (this.pageType === "mapIndex") {
this.$emit("allGWDataList", { res: allStationList });
}
let newStationList = [];
if (allStationDataList && allStationDataList.length > 0) {
@ -2396,7 +2447,6 @@ export default {
});
}
console.log("newStationList", newStationList);
//
if (list && list.length > 0) {
let newRes = JSON.parse(JSON.stringify(list));
@ -2461,7 +2511,7 @@ export default {
GWSum: GWSum,
GWEmpty: GWEmpty,
};
if (this.styleType === 2) {
if (this.styleType === 2 || this.pageType === "mapList") {
item.allChargeDetail = {
allSum:
Number(
@ -2492,6 +2542,26 @@ export default {
}
},
//
handleGetGWAllData(token) {
let url = `https://dipper.in.ah.cn/jgpt-gateway/third`;
this.$testApi
.$post("/send", {
url: `${url}/supervise/v1.0.0/query_supervise_stations_info`,
data: JSON.stringify({
PageNo: 1,
PageSize: 999,
}),
id: 2,
seq: "002",
token: token,
})
.then((res) => {
console.log("方法外的调用", res);
uni.setStorageSync("GWDataList", res);
});
},
//
handleGetRandomData(max, min) {
return Math.floor(Math.random() * (max - min + 1)) + min;
@ -2499,9 +2569,17 @@ export default {
//
handleGoServiceDetail(id, obj) {
console.log("id", id);
console.log("this.comeForm", this.comeForm);
if (this.pageType === "newMap") {
let res = this.handleChangeServiceInfo(obj);
if (this.comeForm === "addContact") {
uni.setStorageSync("addContact", res);
} else {
uni.setStorageSync("currentService", res); //
}
if (this.comeForm === "home") {
uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
} else {

View File

@ -22,6 +22,10 @@
/>
</view>
</view>
<view class="formItem">
<view class="itemTitle">服务区热线</view>
<view class="itemValue">{{ showServicePhone || "" }} </view>
</view>
<!-- <view class="formItem">
<view class="itemTitle">失物类型</view>
@ -143,11 +147,19 @@
</view>
</view>
</view>
<view class="btnBox" v-if="!isDetail">
<!-- v-if="!isDetail" -->
<view class="btnBox">
<button class="submitBox" type="primary" @click="formSubmit">
{{
addType === 1000 ? "新增失物" : addType === 2000 ? "新增招领" : ""
}}
{{ detailObj ? "保存" : "新增"
}}{{ addType === 1000 ? "失物" : addType === 2000 ? "招领" : "" }}
</button>
<button
v-if="showDeleteBtn"
class="deleteBox"
type="primary"
@click="handleDelete"
>
删除失物
</button>
</view>
</view>
@ -172,6 +184,8 @@ export default {
isDetail: false, //
detailObj: {}, //
loginType: "",
showServicePhone: "", // 线
showDeleteBtn: false, //
};
},
components: {
@ -184,6 +198,7 @@ export default {
},
onLoad(query) {
console.log("user", this.user);
console.log("query", query);
let type = uni.getStorageSync("loginType");
this.loginType = type;
if (query.addType) {
@ -194,6 +209,11 @@ export default {
this.isDetail = true;
this.handleGetDetail(query.id);
}
uni.setNavigationBarTitle({
title: `${query.id ? "编辑" : "新增"}${
Number(query.addType) === 1000 ? "失物" : "招领"
}`,
});
this.handleGetDefaultTime();
//
@ -204,11 +224,35 @@ export default {
}
},
onShow() {
let currentService = uni.getStorageSync("currentService");
console.log("currentService", currentService);
let currentService = uni.getStorageSync("addContact");
console.log("addContact", currentService);
if (currentService) {
this.nowServerpart = currentService;
this.detailObj.SERVERPART_NAME = currentService.SERVERPART_NAME;
this.handleGetServiceDetail(currentService.SERVERPART_ID);
} else {
let nearService = uni.getStorageSync("nearService");
this.nowServerpart = nearService;
this.handleGetServiceDetail(nearService.SERVERPART_ID);
}
},
onUnload() {
uni.setStorageSync("addContact", null);
},
methods: {
async handleGetServiceDetail(id) {
const req = {
ServerpartId: id,
};
let detailData = await this.$api.$get(
"/CommercialApi/BaseInfo/GetServerpartInfo",
req
);
console.log("detailData", detailData);
let obj = detailData.Result_Data;
this.showServicePhone = obj.SERVERPART_TEL;
},
//
handlePreview(imgList, index) {
console.log("imgList", imgList);
@ -238,6 +282,9 @@ export default {
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";
},
//
async handleDeleteImg(obj) {
@ -320,6 +367,38 @@ export default {
console.log("e", e);
this.thisTime = `${e.date} ${e.time}`;
},
//
handleDelete() {
uni.showModal({
title: "提示",
content: "确认删除?",
success: async (res) => {
if (res.confirm) {
let req = {
...this.detailObj,
SUGGESTION_STATE: 0,
};
const data = await this.$api.$post(
"/EShangApiMain/SiteManage/SynchroSUGGESTION",
req
);
if (data.Result_Code === 100) {
uni.showToast({
title: "删除成功!",
icon: "none",
});
uni.setStorageSync("contactReload", true);
setTimeout(() => {
uni.navigateBack({
delta: 1,
});
}, 1000);
}
}
},
});
},
async formSubmit() {
if (!this.nowServerpart.SERVERPART_ID) {
uni.showToast({
@ -366,9 +445,21 @@ export default {
}
}
let req = {
let req = {};
if (this.detailObj.SUGGESTION_ID) {
req = {
...this.detailObj,
SERVERPART_ID: this.nowServerpart.SERVERPART_ID,
ENUM_LABEL: this.lostTypeList[this.lostTypeIndex].value,
SUGGESTION_TITLE: this.shopName,
PHONE_NUMBER: this.phone,
DISPOSITION_PERSON: this.user.MEMBERSHIP_NAME,
SERVERPART_NAME: this.nowServerpart.SERVERPART_NAME,
SUGGESTION_REASON: this.showServicePhone,
};
} else {
req = {
SERVERPART_ID: this.nowServerpart.SERVERPART_ID,
// ENUM_LABEL: this.lostTypeList[this.lostTypeIndex].value,
SUGGESTION_TITLE: this.shopName,
PHONE_NUMBER: this.phone,
PROVINCE_CODE: "340000",
@ -378,7 +469,9 @@ export default {
SUGGESTION_NAME: this.user.MEMBERSHIP_NAME,
SERVERPART_NAME: this.nowServerpart.SERVERPART_NAME,
WECHAT_OPENID: this.addType,
SUGGESTION_REASON: this.showServicePhone,
};
}
const data = await this.$api.$post(
"/EShangApiMain/SiteManage/SynchroSUGGESTION",
@ -458,6 +551,7 @@ export default {
title: data.Result_Desc,
icon: "success",
});
uni.setStorageSync("contactReload", true);
setTimeout(() => {
uni.navigateBack({
delta: 1,
@ -472,6 +566,8 @@ export default {
},
//
handleChangeService() {
uni.navigateTo({ url: "/pages/newMap/index/index?comeForm=addContact" });
return;
if (this.detailObj) {
} else {
uni.navigateTo({ url: "/pages/newMap/index/index" });
@ -547,6 +643,14 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
font-family: "PingFangSC";
font-weight: 400;
font-size: 28rpx;
color: #130f05;
line-height: 40rpx;
text-align: left;
font-style: normal;
.selectBox {
width: 100%;
}
@ -618,6 +722,19 @@ export default {
font-style: normal;
padding: 22rpx 0;
}
.deleteBox {
font-family: "PingFangSC";
font-weight: 400;
font-size: 32rpx;
color: #ba922f;
line-height: 44rpx;
text-align: center;
font-style: normal;
border: 1px solid #ba922f;
background: transparent;
padding: 22rpx 0;
margin-top: 16rpx;
}
}
}
}

View File

@ -195,6 +195,10 @@
<!-- <span class="label">联系电话</span> -->
{{ item.PHONE_NUMBER || "-" }}
</div>
<div class="phone" v-if="item.SUGGESTION_REASON">
<span class="label">服务热线</span>
{{ item.SUGGESTION_REASON || "-" }}
</div>
</view>
</div>
@ -393,14 +397,24 @@ export default {
},
onShow() {
let currentService = uni.getStorageSync("currentService");
if (
currentService.SERVERPART_ID !== this.nowServiceObj.SERVERPART_ID ||
this.goAdd
) {
if (currentService.SERVERPART_ID !== this.nowServiceObj.SERVERPART_ID) {
this.nowServiceObj = currentService;
this.dataList = [];
this.handleGetListData();
this.goAdd = false;
// this.goAdd = false;
}
let contactReload = uni.getStorageSync("contactReload");
if (contactReload) {
this.dataList = [];
this.pageObj = {
pageSize: 10,
pageIndex: 1,
isOver: false,
};
this.handleGetListData();
uni.setStorageSync("contactReload", null);
}
},
methods: {
@ -408,7 +422,7 @@ export default {
handleGoDetail(obj) {
console.log("obj", obj);
uni.navigateTo({
url: `/pages/contact/addContact?id=${obj.SUGGESTION_ID}`,
url: `/pages/contact/addContact?id=${obj.SUGGESTION_ID}&addType=${obj.WECHAT_OPENID}`,
});
},
//
@ -472,7 +486,7 @@ export default {
},
//
handleGoAdd() {
this.goAdd = true;
// this.goAdd = true;
uni.navigateTo({
url: `/pages/contact/addContact?addType=${this.fintType}`,
});
@ -529,7 +543,7 @@ export default {
this.handleClosePopup();
this.handleGetListData();
},
//
//
async handleGetListData() {
const req = {
SearchParameter: {
@ -540,6 +554,11 @@ export default {
SUGGESTION_STATES: 1,
ENUM_LABEL: this.rightSelectValue || "",
WECHAT_OPENID: this.fintType,
SUGGESTION_CREATEDATE_Start: this.$moment
.now()
.set("month", -3)
.format("YYYY-MM-DD"),
SUGGESTION_CREATEDATE_End: this.$moment.now().format("YYYY-MM-DD"),
},
SortStr: "SUGGESTION_CREATEDATE desc",
PageSize: this.pageObj.pageSize,
@ -990,7 +1009,7 @@ export default {
text-align: left;
font-style: normal;
margin-right: 12rpx;
width: 120rpx;
width: 150rpx;
display: inline-block;
}
}

View File

@ -478,6 +478,16 @@ export default {
"https://eshangtech.com/wanmeiyizhanImg/home/lostAndfoundNew.svg",
click: true,
},
{
label: "汽车维修",
value: 9,
src: "https://eshangtech.com/wanmeiyizhanImg/home/automobileMaintenance.svg",
noSrc:
"https://eshangtech.com/wanmeiyizhanImg/home/automobileMaintenance.svg",
pageStyleSrc:
"https://eshangtech.com/wanmeiyizhanImg/home/automobileMaintenance.svg",
click: true,
},
], //
userInfo: {}, //
seat: {}, //
@ -1087,7 +1097,10 @@ export default {
console.log("_this.loginType", _this.loginType);
//
if (value === 1) {
uni.navigateTo({ url: "/pages/scanCodeCharge/index" });
//
// uni.navigateTo({ url: "/pages/scanCodeCharge/index" });
//
uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndex" });
// return 2024-12-13
return;
@ -1936,7 +1949,7 @@ export default {
flex-wrap: wrap;
.funItem {
width: 25%;
width: 20%;
box-sizing: border-box;
display: flex;
flex-direction: column;
@ -2337,7 +2350,7 @@ export default {
border: none;
overflow: hidden;
.funItem {
width: 25%;
width: 20%;
.funItemIcon {
width: 80rpx;
height: 80rpx;

View File

@ -174,7 +174,11 @@
</div>
</div>
<div v-if="chaegeBoxList && chaegeBoxList.length > 0">
<charge-box :serviceAreaList="chaegeBoxList" :pageType="'newMap'" :comeForm="comeForm" />
<charge-box
:serviceAreaList="chaegeBoxList"
:pageType="'newMap'"
:comeForm="comeForm"
/>
</div>
</div>
</div>
@ -539,6 +543,8 @@ export default {
// longitude: obj.SERVERPART_X,
// latitude: obj.SERVERPART_Y
// }
console.log("this.comeForm", this.comeForm);
uni.setStorageSync("currentService", res); //
if (this.comeForm === "home") {
uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });

View File

@ -1,6 +1,6 @@
<template>
<view class="main">
<div class="mapBox">
<view :class="showListPage ? 'mapBox moveLeft' : 'mapBox'">
<map
id="myMap"
:longitude="longitude"
@ -41,15 +41,21 @@
/> -->
<text class="brandCharge">理想</text>
<span class="empty"></span>
<view class="valueBox">
<span class="emptyValue">{{
chargeData && chargeData.LXDetail ? chargeData.LXDetail.LXEmpty : 0
chargeData && chargeData.LXDetail
? chargeData.LXDetail.LXEmpty
: 0
}}</span>
<span class="sum"
>/{{
chargeData && chargeData.LXDetail ? chargeData.LXDetail.LXSum : 0
chargeData && chargeData.LXDetail
? chargeData.LXDetail.LXSum
: 0
}}</span
>
</view>
</view>
<view class="statusItem">
<!-- <image
@ -59,6 +65,7 @@
<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
@ -76,6 +83,7 @@
}}</span
>
</view>
</view>
<view class="statusItem">
<!-- <image
@ -85,6 +93,7 @@
<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
@ -94,10 +103,13 @@
</span>
<span class="sum"
>/{{
chargeData && chargeData.JKDetail ? chargeData.JKDetail.JKSum : 0
chargeData && chargeData.JKDetail
? chargeData.JKDetail.JKSum
: 0
}}</span
>
</view>
</view>
<view class="statusItem">
<!-- <image
@ -107,6 +119,7 @@
<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
@ -116,11 +129,14 @@
</span>
<span class="sum"
>/{{
chargeData && chargeData.GWDetail ? chargeData.GWDetail.GWSum : 0
chargeData && chargeData.GWDetail
? chargeData.GWDetail.GWSum
: 0
}}</span
>
</view>
</view>
</view>
<view class="serviceDetailBox" v-if="showChargeBox">
<charge-box
@ -129,9 +145,50 @@
@allChargeData="handleGetChargeData"
@allLXDataList="handleLXAddMarker"
@allJKDataList="handleJKAddMarker"
@allGWDataList="handleGWAddMarker"
/>
</view>
</div>
<view class="scanBox" @click="handleScan">
<view class="scanIconBox">
<image class="scanIcon" src="/static/tabs/scanCode.svg" />
</view>
</view>
</view>
<view :class="showListPage ? 'listPage moveRight' : 'listPage '">
<!-- 搜索框 -->
<view class="searchBox">
<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/mapFixed.svg" />
<text class="text">地图</text>
</view>
</view>
<scroll-view class="scrollListBox" :scroll-y="true">
<view v-if="showChargeList">
<charge-box
:serviceAreaList="allServiceNameList"
:pageStyleType="1"
:pageType="'mapList'"
/>
</view>
</scroll-view>
</view>
</view>
</template>
@ -146,11 +203,14 @@ export default {
seatInfo: {}, //
currentServiceObj: {}, //
currentServiceList: [], //
allServiceNameList: [], //
defaultAllServiceNameList: [], //
chargeData: {}, //
markers: [], //
serviceList: [], //
searchText: "", //
showChargeBox: true,
showChargeList: true,
showListPage: false, //
};
},
@ -165,21 +225,108 @@ export default {
longitude: nearService.SERVERPART_X,
latitude: nearService.SERVERPART_Y,
};
// this.longitude = this.seatInfo.longitude;
// this.latitude = this.seatInfo.latitude;
this.longitude = 116.894166;
this.latitude = 31.920213;
this.longitude = this.seatInfo.longitude;
this.latitude = this.seatInfo.latitude;
// this.longitude = 116.894166;
// this.latitude = 31.920213;
this.currentServiceObj = nearService;
// this.currentServiceList = [nearService.SERVERPART_NAME];
this.currentServiceList = ["新桥服务区"];
this.currentServiceList = [nearService.SERVERPART_NAME];
// this.currentServiceList = [""];
//
this.handleGetServiceNameList();
}
},
methods: {
//
getQueryParams(url) {
let queryStr = url.split("?")[1]; // ?
let params = {};
if (queryStr) {
let pairs = queryStr.split("&");
pairs.forEach((pair) => {
let [key, value] = pair.split("=");
params[key] = decodeURIComponent(value || "");
});
}
return params;
},
//
handleScan() {
let _this = this;
uni.scanCode({
success: function (res) {
console.log("条码类型:" + res.scanType);
console.log("条码内容:" + res.result);
let url = res.result;
if (url.indexOf("lixiang") !== -1) {
let obj = _this.getQueryParams(url);
console.log("obj", obj);
uni.showModal({
title: "",
content: `识别二维码类型为【理想】,确认跳转?`,
success(res) {
uni.navigateToMiniProgram({
appId: "wxefd5d8119561aaca",
path: `/pages/electricity/pile/index?connectorId=${obj.qrcode}`,
success(res) {},
});
},
});
} else if (url.indexOf("jksdxny") !== -1) {
//
uni.showModal({
title: "",
content: `识别二维码类型为【交控新能源】,确认跳转?`,
success(res) {
uni.navigateToMiniProgram({
appId: "wx01617ba079061ca9",
path: `/pages/map/index`,
success(res) {},
});
},
});
} else if (url.indexOf("app.nio") !== -1) {
//
uni.showModal({
title: "",
content: `识别二维码类型为【蔚来】,确认跳转?`,
success(res) {
uni.navigateToMiniProgram({
appId: "wx35849c7f0cf7f7a9",
path: `/pages/index/index`,
success(res) {},
});
},
});
}
},
});
},
//
handleGetServiceNameList() {
let name = [];
if (this.serviceList && this.serviceList.length > 0) {
this.serviceList.forEach((item) => {
name.push(item.SERVERPART_NAME);
});
}
console.log("name", name);
this.allServiceNameList = name;
this.defaultAllServiceNameList = name;
},
//
handleChangePageType() {},
handleChangePageType() {
this.showListPage = !this.showListPage;
},
//
async handleConfirm() {
if (this.showListPage) {
this.showChargeList = false;
} else {
this.showChargeBox = false;
}
this.chaegeBoxList = [];
let req = {
// longitude: this.longitude,
@ -196,7 +343,14 @@ export default {
let list = data.Result_Data.List;
console.log("listlistlist", list);
let obj = list[0];
this.searchText = "";
if (this.showListPage) {
this.showChargeList = true;
if (this.searchText) {
this.allServiceNameList = [obj.SERVERPART_NAME];
} else {
this.handleGetServiceNameList();
}
} else {
this.seatInfo = {
longitude: obj.SERVERPART_X,
latitude: obj.SERVERPART_Y,
@ -206,6 +360,8 @@ export default {
this.currentServiceObj = obj;
this.currentServiceList = [obj.SERVERPART_NAME];
this.showChargeBox = true;
}
this.searchText = "";
},
//
handleLXAddMarker(e) {
@ -270,9 +426,37 @@ export default {
}
this.markers = this.markers.concat(pointList);
},
//
//
handleGWAddMarker(e) {
let stationList = e.res.data.Data.StationInfos;
console.log('stationList国网国网',stationList);
let pointList = [];
if (this.serviceList && this.serviceList.length > 0) {
this.serviceList.forEach((item) => {
if (stationList && stationList.length > 0) {
stationList.forEach((subItem) => {
if (subItem.Address.indexOf(item.SERVERPART_NAME) !== -1) {
const date = new Date();
pointList.push({
id: date.getTime(), // 使ID
latitude: subItem.StationLat,
longitude: subItem.StationLng,
iconPath: "/static/home/orangeFixed.svg",
width: 30,
height: 30,
});
}
});
}
});
}
console.log("国网点位", pointList);
this.markers = this.markers.concat(pointList);
},
//
handleGetChargeData(e) {
console.log("全部的充电数据", e);
console.log("当前服务区的充电数据", e);
let obj = e.res[0];
// e[0]
this.chargeData = obj;
@ -312,6 +496,7 @@ export default {
position: absolute;
top: 0;
left: 0;
transition: transform 0.5s ease;
.map {
width: 100%;
height: 100%;
@ -434,6 +619,10 @@ export default {
font-style: normal;
margin-right: 4rpx;
}
.valueBox {
display: flex;
justify-content: flex-end;
width: 100rpx;
.emptyValue {
font-family: "DINAlternate";
font-weight: 400;
@ -455,6 +644,7 @@ export default {
}
}
}
}
.serviceDetailBox {
width: calc(100% - 64rpx);
box-sizing: border-box;
@ -462,10 +652,128 @@ export default {
border-radius: 16rpx;
position: absolute;
left: 32rpx;
// bottom: 160rpx;
bottom: 80rpx;
z-index: 2;
background: #fff;
}
.scanBox {
// width: 100%;
width: 80rpx;
height: 80rpx;
// height: 100rpx;
display: flex;
justify-content: center;
align-items: center;
position: absolute;
// bottom: 40rpx;
top: 120rpx;
// left: 0;
right: 16rpx;
z-index: 2;
.scanIconBox {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
background: #ba922f;
display: flex;
justify-content: center;
align-items: center;
.scanIcon {
width: 52rpx;
height: 52rpx;
}
}
}
}
.moveLeft {
transform: translateX(-100%);
}
.listPage {
width: 100%;
height: 100vh;
position: absolute;
top: 0;
left: 100%;
transition: transform 0.5s ease;
box-sizing: border-box;
padding: 16rpx;
z-index: 2;
.searchBox {
width: 100%;
height: 72rpx;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
.topRight {
width: calc(100% - 240rpx);
height: 72rpx;
background: #fff;
border-radius: 36rpx;
box-sizing: border-box;
padding: 16rpx 20rpx;
display: flex;
align-items: center;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
.searchIcon {
width: 32rpx;
height: 32rpx;
}
.searchText {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #9fa1aa;
line-height: 40rpx;
text-align: left;
font-style: normal;
margin-left: 8rpx;
}
}
.listBox {
width: 180rpx;
height: 72rpx;
// background: #fff;
background-image: url("https://eshangtech.com/minTestImg/mapBg.png");
background-repeat: no-repeat;
background-size: 100% 100%;
border-radius: 36rpx;
box-sizing: border-box;
padding: 16rpx 20rpx;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
.listIcon {
width: 40rpx;
height: 40rpx;
margin-right: 12rpx;
}
.text {
font-family: "PingFangSC";
font-weight: 400;
font-size: 30rpx;
color: #130f05;
line-height: 36rpx;
text-align: justify;
font-style: normal;
}
}
}
.scrollListBox {
width: 100%;
height: calc(100% - 100rpx);
margin-top: 16rpx;
}
}
.moveRight {
transform: translateX(-100%);
}
}
</style>

View File

@ -1346,6 +1346,7 @@ export default {
}
let areaList = routePoint.split(";");
let newAreaList = [];
if (areaList && areaList.length > 0) {
areaList.forEach((item) => {
@ -1355,19 +1356,44 @@ export default {
newAreaList.push(`${newLong},${newLat}`);
});
}
console.log("newAreaList", newAreaList);
console.log("serverInfo.cityCoordinate", serverInfo.cityCoordinate);
//
let serviceAreaList = [];
if (serverInfo.cityCoordinate && newAreaList && newAreaList.length > 0) {
for (let key in serverInfo.cityCoordinate) {
if (
newAreaList.indexOf(serverInfo.cityCoordinate[key]) !== -1 &&
key !== this.endObj.SERVERPART_NAME
) {
serviceAreaList.push(key);
for (const key in serverInfo.cityCoordinate) {
const [name, coord] = [key, serverInfo.cityCoordinate[key]];
const [serviceLng, serviceLat] = coord.split(",");
newAreaList.forEach((item) => {
const [arrayLng, arrayLat] = item.split(",");
// // ±0.03
const lngDiff = Math.abs(Number(serviceLng) - Number(arrayLng));
const latDiff = Math.abs(Number(serviceLat) - Number(arrayLat));
if (lngDiff <= 0.03 && latDiff <= 0.03) {
console.log("name", name);
if(serviceAreaList.indexOf(name)===-1){
serviceAreaList.push(name);
}
}
});
}
// for (let key in serverInfo.cityCoordinate) {
// if (
// newAreaList.indexOf(serverInfo.cityCoordinate[key]) !== -1 &&
// key !== this.endObj.SERVERPART_NAME
// ) {
// serviceAreaList.push(key);
// }
// }
}
console.log("serviceAreaList", serviceAreaList);
// push
if (serviceAreaList.indexOf(this.endObj.ServerPart_Name) === -1) {
serviceAreaList.push(this.endObj.ServerPart_Name);

BIN
static/home/mapBg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

1
static/home/mapFixed.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1743644765166" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3466" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512.68266667 1.93422222c-230.51377778 0-417.56444445 189.55377778-417.56444445 425.30133333 0 235.63377778 417.56444445 591.75822222 417.56444445 591.75822223s417.56444445-358.62755555 417.56444444-591.75822223c0-235.74755555-186.93688889-425.30133333-417.56444444-425.30133333z m0 545.67822223c-105.01688889 0-187.05066667-84.53688889-187.05066667-187.05066667 0-105.01688889 84.53688889-187.05066667 187.05066667-187.05066667 105.01688889 0 187.05066667 84.53688889 187.05066666 187.05066667 0 102.51377778-82.03377778 187.05066667-187.05066666 187.05066667z m0 0" fill="#0567ff" p-id="3467"></path></svg>

After

Width:  |  Height:  |  Size: 941 B

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

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

View File

@ -1902,7 +1902,7 @@ function initData(vueOptions, context) {
try {
data = data.call(context); // 支持 Vue.prototype 上挂的数据
} catch (e) {
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
}
}
@ -8945,7 +8945,7 @@ function type(obj) {
function flushCallbacks$1(vm) {
if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
var mpInstance = vm.$scope;
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@ -8966,14 +8966,14 @@ function nextTick$1(vm, cb) {
//1.nextTick 之前 已 setData 且 setData 还未回调完成
//2.nextTick 之前存在 render watcher
if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
var mpInstance = vm.$scope;
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
']:nextVueTick');
}
return nextTick(cb, vm)
}else{
if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
var mpInstance$1 = vm.$scope;
console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
']:nextMPTick');
@ -9069,7 +9069,7 @@ var patch = function(oldVnode, vnode) {
});
var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
if (Object.keys(diffData).length) {
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
']差量更新',
JSON.stringify(diffData));

View File

@ -1,4 +1,4 @@
{
"usingComponents": {},
"component": true
"component": true,
"usingComponents": {}
}

View File

@ -279,11 +279,23 @@ var _default = {
},
onShow: function onShow() {
var currentService = uni.getStorageSync("currentService");
if (currentService.SERVERPART_ID !== this.nowServiceObj.SERVERPART_ID || this.goAdd) {
if (currentService.SERVERPART_ID !== this.nowServiceObj.SERVERPART_ID) {
this.nowServiceObj = currentService;
this.dataList = [];
this.handleGetListData();
this.goAdd = false;
// this.goAdd = false;
}
var contactReload = uni.getStorageSync("contactReload");
if (contactReload) {
this.dataList = [];
this.pageObj = {
pageSize: 10,
pageIndex: 1,
isOver: false
};
this.handleGetListData();
uni.setStorageSync("contactReload", null);
}
},
methods: {
@ -291,7 +303,7 @@ var _default = {
handleGoDetail: function handleGoDetail(obj) {
console.log("obj", obj);
uni.navigateTo({
url: "/pages/contact/addContact?id=".concat(obj.SUGGESTION_ID)
url: "/pages/contact/addContact?id=".concat(obj.SUGGESTION_ID, "&addType=").concat(obj.WECHAT_OPENID)
});
},
// 回车查询调用的方法
@ -370,7 +382,7 @@ var _default = {
},
// 跳转去添加失物的页面
handleGoAdd: function handleGoAdd() {
this.goAdd = true;
// this.goAdd = true;
uni.navigateTo({
url: "/pages/contact/addContact?addType=".concat(this.fintType)
});
@ -447,7 +459,7 @@ var _default = {
this.handleClosePopup();
this.handleGetListData();
},
// 拿到失物招领的数据
// 拿到失物招领的数据 只要最近三个月的数据
handleGetListData: function handleGetListData() {
var _this3 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
@ -462,7 +474,9 @@ var _default = {
SERVERPART_IDS: _this3.inSearchAll ? "" : _this3.nowServiceObj.SERVERPART_ID || "",
SUGGESTION_STATES: 1,
ENUM_LABEL: _this3.rightSelectValue || "",
WECHAT_OPENID: _this3.fintType
WECHAT_OPENID: _this3.fintType,
SUGGESTION_CREATEDATE_Start: _this3.$moment.now().set("month", -3).format("YYYY-MM-DD"),
SUGGESTION_CREATEDATE_End: _this3.$moment.now().format("YYYY-MM-DD")
},
SortStr: "SUGGESTION_CREATEDATE desc",
PageSize: _this3.pageObj.pageSize,

File diff suppressed because one or more lines are too long

View File

@ -364,7 +364,7 @@
text-align: left;
font-style: normal;
margin-right: 12rpx;
width: 120rpx;
width: 150rpx;
display: inline-block;
}
.main .pageList .listBox .shopItem .title.data-v-57bb4cfa {

View File

@ -249,6 +249,13 @@ var _default = {
noSrc: "https://eshangtech.com/wanmeiyizhanImg/home/nolostAndfound.svg",
pageStyleSrc: "https://eshangtech.com/wanmeiyizhanImg/home/lostAndfoundNew.svg",
click: true
}, {
label: "汽车维修",
value: 9,
src: "https://eshangtech.com/wanmeiyizhanImg/home/automobileMaintenance.svg",
noSrc: "https://eshangtech.com/wanmeiyizhanImg/home/automobileMaintenance.svg",
pageStyleSrc: "https://eshangtech.com/wanmeiyizhanImg/home/automobileMaintenance.svg",
click: true
}],
// 更多功能的渲染列表
userInfo: {},
@ -970,8 +977,11 @@ var _default = {
console.log("_this.loginType", _this.loginType);
// 扫码充电
if (value === 1) {
// 旧
// uni.navigateTo({ url: "/pages/scanCodeCharge/index" });
// 新
uni.navigateTo({
url: "/pages/scanCodeCharge/index"
url: "/pages/scanCodeCharge/mapIndex"
});
// 变成要去跳转理想的了 先return掉 后面再看怎么弄 2024-12-13

View File

@ -331,7 +331,7 @@
flex-wrap: wrap;
}
.main .content .otherFunBox .funItem.data-v-71e217db {
width: 25%;
width: 20%;
box-sizing: border-box;
display: flex;
flex-direction: column;
@ -692,7 +692,7 @@
overflow: hidden;
}
.main .newContent .otherFunBoxNew .funItem.data-v-71e217db {
width: 25%;
width: 20%;
}
.main .newContent .otherFunBoxNew .funItem .funItemIcon.data-v-71e217db {
width: 80rpx;

View File

@ -513,6 +513,7 @@ var _default = {
// longitude: obj.SERVERPART_X,
// latitude: obj.SERVERPART_Y
// }
console.log("this.comeForm", this.comeForm);
uni.setStorageSync("currentService", res); // 当前选中服务区信息
if (this.comeForm === "home") {
uni.navigateTo({

View File

@ -1,8 +1,7 @@
{
"description": "项目配置文件。",
"packOptions": {
"ignore": [],
"include": []
"ignore": []
},
"setting": {
"urlCheck": false,
@ -10,15 +9,10 @@
"postcss": false,
"minified": false,
"newFeature": true,
"bigPackageSizeSupport": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
"bigPackageSizeSupport": true
},
"compileType": "miniprogram",
"libVersion": "3.7.0",
"libVersion": "",
"appid": "wx4c497eddcec4a0e7",
"projectname": "皖美驿站",
"condition": {
@ -38,9 +32,5 @@
"current": -1,
"list": []
}
},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 4
}
}

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

View File

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__F870657","name":"皖美驿站","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Push":{},"Share":{},"Speech":{},"VideoPlayer":{},"Maps":{"coordType":"gcj02"},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"AMapModule":{"__plugin_info__":{"name":"AMapModule测试插件","description":"AMapModule测试插件1.7","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.45","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"custom":true,"color":"#130F05","backgroundColor":"#fff","selectedColor":"#130F05","borderStyle":"rgba(0,0,0,0.4)","list":[{"text":"首页","pagePath":"pages/home/index","iconPath":"static/tabs/home.png","selectedIconPath":"static/tabs/home-active.png"},{"text":"线上商城","pagePath":"pages/onlineShop/index","iconPath":"static/tabs/store-active.png","selectedIconPath":"static/tabs/store-active.png"},{"text":"精选活动","pagePath":"pages/discovery/index","iconPath":"static/tabs/discovery.png","selectedIconPath":"static/tabs/discovery-active.png"},{"text":"我的","pagePath":"pages/userCenter/index","iconPath":"static/tabs/user.png","selectedIconPath":"static/tabs/user-active.png"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__F870657","name":"皖美驿站","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Push":{},"Share":{},"Speech":{},"VideoPlayer":{},"Maps":{"coordType":"gcj02"},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"AMapModule":{"__plugin_info__":{"name":"AMapModule测试插件","description":"AMapModule测试插件1.7","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.36","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"custom":true,"color":"#130F05","backgroundColor":"#fff","selectedColor":"#130F05","borderStyle":"rgba(0,0,0,0.4)","list":[{"text":"首页","pagePath":"pages/home/index","iconPath":"static/tabs/home.png","selectedIconPath":"static/tabs/home-active.png"},{"text":"线上商城","pagePath":"pages/onlineShop/index","iconPath":"static/tabs/store-active.png","selectedIconPath":"static/tabs/store-active.png"},{"text":"精选活动","pagePath":"pages/discovery/index","iconPath":"static/tabs/discovery.png","selectedIconPath":"static/tabs/discovery-active.png"},{"text":"我的","pagePath":"pages/userCenter/index","iconPath":"static/tabs/user.png","selectedIconPath":"static/tabs/user-active.png"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}

File diff suppressed because one or more lines are too long