This commit is contained in:
cclu 2025-03-19 19:25:16 +08:00
parent d96aa79b59
commit fe8ee1338c
741 changed files with 4017 additions and 4559 deletions

View File

@ -1,13 +1,16 @@
<template>
<view>
<view class="chargeBox">
<view
<view class="chargeBox" v-if="showType === 'horizontal'">
<swiper
scroll-x="true"
class="serviceList"
v-if="
detailObj && detailObj.servicePart && detailObj.servicePart.length > 0
"
@change="swiperChange($event, 'currentBan')"
:current="currentBan"
:style="{ height: `${swiperHeight[currentBan]}rpx` }"
>
<view
<!-- autoplay="true" -->
<swiper-item
class="serviceItem"
v-for="(item, index) in detailObj.servicePart"
:key="index"
@ -20,7 +23,7 @@
>
<view
class="leftItem"
@click="handleGoServiceDetail(item.SERVERPART_ID)"
@click="handleGoServiceDetail(item.SERVERPART_ID, item)"
>
<view class="leftImgBox">
<view
@ -29,7 +32,7 @@
backgroundImage: `url(${
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: '/static/images/discovery/defaultIcon.png'
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
})`,
}"
></view>
@ -38,7 +41,7 @@
:src="
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: '/static/images/discovery/defaultIcon.png'
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
"
/> -->
</view>
@ -74,12 +77,12 @@
v-if="item.businessObj"
>{{
item.businessObj.AVR_TICKET >= 30
? "繁忙"
? "人流量较大"
: item.businessObj.AVR_TICKET >= 15 &&
item.businessObj.AVR_TICKET < 30
? "良好"
? "人流量适中"
: item.businessObj.AVR_TICKET < 15
? "空闲"
? "人流量较小"
: ""
}}</span
>
@ -94,7 +97,7 @@
<div class="distanceLeft">
<image
class="distanceIcon"
src="/static/images/home/address.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/address.png"
/>
<span class="distanceNumber"
>{{
@ -134,7 +137,7 @@
<!-- 老款样式 -->
<view
class="centerItem"
@click="handleGoServiceDetail(item.SERVERPART_ID)"
@click="handleGoServiceDetail(item.SERVERPART_ID, item)"
v-if="styleType === 1"
>
<!-- 拥有设施的小图标 -->
@ -151,8 +154,8 @@
<!-- 新款样式 -->
<view
class="centerItem"
@click="handleGoServiceDetail(item.SERVERPART_ID)"
v-if="styleType === 2"
@click="handleGoServiceDetail(item.SERVERPART_ID, item)"
v-if="styleType === 2 && showType !== 'horizontal'"
>
<view
class="centerConfigItemNew"
@ -242,7 +245,7 @@
<view class="chargeIconBox">
<image
class="chargeIcon"
src="/static/images/home/sunIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
/>
</view>
<view class="chargeTitle">交控新能源</view>
@ -296,6 +299,7 @@
<view
class="bottomItemNew"
v-if="styleType === 2"
style="margin-top: 24rpx"
@click="handleOpenDetail(item)"
>
<view class="leftCharge">
@ -307,7 +311,388 @@
class="chargeIcon"
src="https://eshangtech.com/minTestImg/WLIcon.png"
/>
<image class="chargeIcon" src="/static/images/home/sunIcon.svg" />
<image
class="chargeIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
/>
<image
class="chargeIcon"
src="https://eshangtech.com/minTestImg/stateGridIcon.png"
/>
</view>
<view class="rightcharge">
<span class="empty"></span>
<span class="emptyValue">{{
item.allChargeDetail && item.allChargeDetail.empty
? item.allChargeDetail.empty
: "0"
}}</span>
<span class="sum"
>/{{
item.allChargeDetail && item.allChargeDetail.allSum
? item.allChargeDetail.allSum
: "0"
}}</span
>
</view>
</view>
<!-- 商家 -->
<div class="merchantsBox" v-if="showStore">
<div class="merchantsTop">
<div class="leftMerchants">
<span class="pageTitle">精选商家</span>
</div>
<div class="rightMerchants">
<span class="serviceName">{{
item.SERVERPART_NAME || ""
}}</span>
<!-- <image
class="moreIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/> -->
</div>
</div>
<div
class="merchantsList"
v-if="item.storeList && item.storeList.length > 0"
>
<div
class="merchantsItem"
v-for="(subItem, subIndex) in item.storeList"
:key="subIndex"
>
<div class="merchantsIconBox" @click="goShop(subItem)">
<image class="merchantsIcon" :src="subItem.IMAGE_URL" />
</div>
<span class="merchantsName">{{ subItem.TITLE || "" }}</span>
</div>
</div>
<div
class="merchantsList"
style="display: flex; justify-content: center"
v-else
>
<no-data text="暂无商家" :isShow="true"></no-data>
</div>
</div>
</swiper-item>
</swiper>
</view>
<view class="chargeBox" v-else>
<view
class="serviceList"
v-if="
detailObj && detailObj.servicePart && detailObj.servicePart.length > 0
"
>
<view
class="serviceItem"
v-for="(item, index) in detailObj.servicePart"
:key="index"
:style="{
border: index + 1 === detailObj.servicePart.length ? 'none' : '',
marginBottom: index + 1 === detailObj.servicePart.length ? '0' : '',
paddingBottom:
index + 1 === detailObj.servicePart.length ? '0' : '',
}"
@click="handleGoDetail(item.SERVERPART_ID, item)"
>
<view
class="leftItem"
@click.stop="handleGoServiceDetail(item.SERVERPART_ID, item)"
>
<view class="leftImgBox">
<view
class="leftImg"
:style="{
backgroundImage: `url(${
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
})`,
}"
></view>
<!-- <image
class="leftImg"
:src="
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
"
/> -->
</view>
<view class="detailBox">
<view class="detailTop">
<view class="topLeft">
<span class="detailName">{{ item.SERVERPART_NAME }}</span>
<span class="detailState">营业中</span>
<span
class="detailState"
:style="{
color: `${
item.businessObj.AVR_TICKET >= 30
? '#FF5959'
: item.businessObj.AVR_TICKET < 30 &&
item.businessObj.AVR_TICKET >= 15
? '#FF8830'
: item.businessObj.AVR_TICKET < 15
? '#01BD8B'
: ''
}`,
backgroundColor: `rgba(${
item.businessObj.AVR_TICKET >= 30
? '255, 89, 89, 0.1'
: item.businessObj.AVR_TICKET < 30 &&
item.businessObj.AVR_TICKET >= 15
? '255, 136, 48,0.1'
: item.businessObj.AVR_TICKET < 15
? '1, 189, 139, 0.1'
: ''
})`,
}"
v-if="item.businessObj"
>{{
item.businessObj.AVR_TICKET >= 30
? "人流量较大"
: item.businessObj.AVR_TICKET >= 15 &&
item.businessObj.AVR_TICKET < 30
? "人流量适中"
: item.businessObj.AVR_TICKET < 15
? "人流量较小"
: ""
}}</span
>
</view>
<!-- <view class="topRight">
<span class="chargeType">快充</span>
<span class="chargeValue">空4/8</span>
</view> -->
</view>
<view class="detailBottom">
<div class="distanceBox">
<div class="distanceLeft">
<image
class="distanceIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/address.png"
/>
<span class="distanceNumber"
>{{
item.SERVERPART_DISTANCEGD ||
item.SERVERPART_DISTANCE ||
"-"
}}km</span
>
</div>
<span class="line"></span>
<span class="address">{{
item.SERVERPART_ADDRESS || "-"
}}</span>
</div>
<div
class="typeList"
v-if="item.ServerpartInfo.SERVERPART_TARGET"
>
<div
class="typeItem"
v-for="(
subItem, subIndex
) in item.ServerpartInfo.SERVERPART_TARGET.split(',')"
:key="subIndex"
>
{{
SERVERPART_TARGETOBJ && subItem
? SERVERPART_TARGETOBJ[subItem]
: ""
}}
</div>
</div>
</view>
</view>
</view>
<!-- 老款样式 -->
<view
class="centerItem"
@click.stop="handleGoServiceDetail(item.SERVERPART_ID, item)"
v-if="styleType === 1"
>
<!-- 拥有设施的小图标 -->
<view
class="centerConfigItem"
v-for="(subItem, index) in item.imgList"
:key="index"
>
<image class="configImg" :src="subItem.url" />
<text class="configText">{{ subItem.title || "" }}</text>
</view>
</view>
<!-- 新款样式 -->
<view
class="centerItem"
@click.stop="handleGoServiceDetail(item.SERVERPART_ID, item)"
v-if="styleType === 2"
>
<view
class="centerConfigItemNew"
v-for="(subItem, index) in item.imgList.slice(
0,
item.noMore ? 5 : 12
)"
:key="index"
>
<image class="configImg" :src="subItem.url" />
<text class="configText">{{ subItem.title || "" }}</text>
</view>
<view
class="centerConfigItemNew"
v-if="item.noMore"
@click.stop="handleGetMore(item)"
>
<image
class="configImg"
src="https://eshangtech.com/minTestImg/chargeImgNew/getMore.svg"
/>
<text class="configText">更多</text>
</view>
</view>
<view
v-if="styleType === 1"
class="bottomItem"
@click.stop="handleOpenDetail(item)"
>
<view class="chargeBox">
<!-- 理想 -->
<view class="chargeItem">
<view class="chargeIconBox">
<image
class="chargeIcon"
src="https://eshangtech.com/minTestImg/LXIcon.png"
/>
</view>
<view class="chargeTitle">理想</view>
<view class="chargeInfo">
<span class="empty"></span>
<span class="emptyValue">{{
item.LXDetail && item.LXDetail.LXEmpty
? item.LXDetail.LXEmpty
: "0"
}}</span>
<span class="sum"
>/{{
item.LXDetail && item.LXDetail.LXSum
? item.LXDetail.LXSum
: "0"
}}</span
>
</view>
</view>
<!-- 蔚来 -->
<view class="chargeItem">
<view class="chargeIconBox">
<image
class="chargeIcon"
src="https://eshangtech.com/minTestImg/WLIcon.png"
/>
</view>
<view class="chargeTitle">蔚来</view>
<view class="chargeInfo">
<span class="empty"></span>
<span class="emptyValue">{{
item.WLDetail && item.WLDetail.WLEmpty
? item.WLDetail.WLEmpty
: "0"
}}</span>
<span class="sum"
>/{{
item.WLDetail && item.WLDetail.WLSum
? item.WLDetail.WLSum
: "0"
}}</span
>
</view>
</view>
<!-- 交控新能源(阳光) -->
<view class="chargeItem">
<view class="chargeIconBox">
<image
class="chargeIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
/>
</view>
<view class="chargeTitle">交控新能源</view>
<view class="chargeInfo">
<span class="empty"></span>
<span class="emptyValue">{{
item.SunDetail && item.SunDetail.SunEmpty
? item.SunDetail.SunEmpty
: "0"
}}</span>
<span class="sum"
>/{{
item.SunDetail && item.SunDetail.SunSum
? item.SunDetail.SunSum
: "0"
}}</span
>
</view>
</view>
<!-- 国网(充换电) -->
<view class="chargeItem">
<view class="chargeIconBox">
<image
class="chargeIcon"
src="https://eshangtech.com/minTestImg/stateGridIcon.png"
/>
</view>
<view class="chargeTitle">国网</view>
<view class="chargeInfo">
<span class="empty"></span>
<span class="emptyValue">{{
item.chargeAndReplaceDetail &&
item.chargeAndReplaceDetail.chargeAndReplace
? item.chargeAndReplaceDetail.chargeAndReplace
: "0"
}}</span>
<span class="sum"
>/{{
item.chargeAndReplaceDetail &&
item.chargeAndReplaceDetail.chargeAndReplaceSum
? item.chargeAndReplaceDetail.chargeAndReplaceSum
: "0"
}}</span
>
</view>
</view>
</view>
</view>
<view
class="bottomItemNew"
v-if="styleType === 2"
@click.stop="handleOpenDetail(item)"
>
<view class="leftCharge">
<image
class="chargeIcon"
src="https://eshangtech.com/minTestImg/LXIcon.png"
/>
<image
class="chargeIcon"
src="https://eshangtech.com/minTestImg/WLIcon.png"
/>
<image
class="chargeIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
/>
<image
class="chargeIcon"
src="https://eshangtech.com/minTestImg/stateGridIcon.png"
@ -343,7 +728,10 @@
<div class="popupDetailBox">
<div class="popupTitle">
<div class="closeIcon" @click="handleClosePopup">
<image class="img" src="/static/images/home/closeIcon.svg" />
<image
class="img"
src="https://eshangtech.com/wanmeiyizhanImg/home/closeIcon.svg"
/>
</div>
<div clsas="title">电桩详情</div>
<div class="closeIcon"></div>
@ -398,17 +786,17 @@
}"
>
<!-- item.Status === 0
? '/static/images/home/offGrid.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/offGrid.svg'
: item.Status === 1
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 2
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 3
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 4
? '/static/images/home/occupy.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/occupy.svg'
: item.Status === 255
? '/static/images/home/offGrid.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/offGrid.svg'
: '' -->
<div
@ -550,11 +938,11 @@
class="chargeIcon"
:src="
item.Power >= 240
? '/static/images/home/fast.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/fast.svg'
: item.Power <= 130 && item.Power > 60
? '/static/images/home/normal.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/normal.svg'
: item.Power < 60
? '/static/images/home/slow.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/slow.svg'
: ''
"
/>
@ -576,7 +964,9 @@
</template>
<script>
import NoData from "./noData.vue";
export default {
components: { NoData },
data() {
return {
detailObj: {},
@ -593,12 +983,23 @@ export default {
selectPopup: 1,
SERVERPART_TARGETOBJ: {},
styleType: 2, // 1 2
currentBan: 0, //
swiperHeight: [], //
};
},
props: ["serviceAreaList", "startObj", "endObj", "pageType"],
props: [
"serviceAreaList",
"startObj",
"endObj",
"pageType",
"showType",
"showStore",
"comeForm",
],
//
onReady() {
console.log("onShow");
console.log("showType", this.showType);
let SERVERPART_TARGET = uni.getStorageSync("SERVERPART_TARGET");
if (SERVERPART_TARGET) {
this.SERVERPART_TARGETOBJ = JSON.parse(SERVERPART_TARGET);
@ -609,6 +1010,52 @@ export default {
this.handldGetData();
},
methods: {
//
handleGoDetail(id, obj) {
if (this.pageType === "newMap") {
let res = this.handleChangeServiceInfo(obj);
// let res = {
// SERVERPART_NAME: obj.SERVERPART_NAME, //
// SPREGIONTYPE_NAME: obj.SPREGIONTYPE_NAME, //
// Serverpart_ID: obj.SERVERPART_ID,
// SPRegionType_ID: obj.SPREGIONTYPE_ID,
// longitude: obj.SERVERPART_X,
// latitude: obj.SERVERPART_Y
// }
uni.setStorageSync("currentService", res); //
if (this.comeForm === "home") {
uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
} else {
uni.navigateBack({
delta: 1,
});
}
}
},
//
handleChangeServiceInfo(obj) {
let newObj = {
...obj,
Distance: obj.SERVERPART_DISTANCE,
OwnerUnitId: obj.OWNERUNIT_ID,
OwnerUnitName: obj.OWNERUNIT_NAME,
ProvinceCode: "340000",
ServerPart_Id: obj.SERVERPART_ID,
ServerPart_Name: obj.SERVERPART_NAME,
ServerPart_Tel: "",
ServerPart_X: obj.SERVERPART_X,
ServerPart_Y: obj.SERVERPART_Y,
showName: `${obj.SERVERPART_NAME}(${obj.SERVERPART_DISTANCE}km)`,
};
return newObj;
},
goShop(item) {
uni.navigateTo({ url: "/pages/storeDetail/index?id=" + item.ITEM_ID });
},
swiperChange(e, name) {
// this[name] = e.mp.detail.current;
this.currentBan = e.mp.detail.current;
},
handleGetMore(obj) {
obj.noMore = false;
},
@ -666,7 +1113,6 @@ export default {
let storgeList = uni.getStorageSync("serviceList");
if (storgeList) {
serviceList = JSON.parse(storgeList);
} else {
let req = {
@ -1211,12 +1657,12 @@ export default {
const key = "6e96a801bcea5290d3dcbf100358a6b3";
//
const start =
_this.pageType !== "scanCode"
_this.pageType === "travelNavigation"
? `${this.startObj.longitude},${this.startObj.latitude}`
: "";
//
const end =
_this.pageType !== "scanCode"
_this.pageType === "travelNavigation"
? `${this.endObj.longitude},${this.endObj.latitude}`
: "";
//
@ -1227,7 +1673,7 @@ export default {
for (let i = 0; i < list.length; i++) {
let item = list[i];
item.noMore = true;
if (_this.pageType !== "scanCode") {
if (_this.pageType === "travelNavigation") {
let itemEnd = `${list[i].SERVERPART_X},${list[i].SERVERPART_Y}`;
await new Promise((resolve) => {
setTimeout(() => {
@ -1329,8 +1775,11 @@ export default {
}
}
}
console.log("listasdsadasdas", list);
if (this.showStore) {
list = await this.handleGetListStore(list);
}
console.log("listasdsadasdas", list);
_this.detailObj = {
// distanceNumber: distance,
// hour: timeObj.hourStr,
@ -1345,6 +1794,28 @@ export default {
uni.hideLoading();
},
//
async handleGetListStore(list) {
let heightList = [];
for (let i = 0; i < list.length; i++) {
const data = await this.$api.getCoop({
action_type: "GetRcmContent",
rcmtagKey: "HOME_SELLER",
serverpartId: list[i].SERVERPART_ID,
provinceCode: "340000",
});
list[i].storeList = data.Data.List;
if (data.Data.List && data.Data.List.length > 0) {
heightList.push(642);
} else {
heightList.push(342);
}
this.swiperHeight = heightList;
}
return list;
},
//
handleHaveRandomData() {
//
@ -1592,9 +2063,23 @@ export default {
return Math.floor(Math.random() * (max - min + 1)) + min;
},
//
handleGoServiceDetail(id) {
handleGoServiceDetail(id, obj) {
console.log("id", id);
if (this.pageType === "newMap") {
let res = this.handleChangeServiceInfo(obj);
uni.setStorageSync("currentService", res); //
if (this.comeForm === "home") {
uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
} else {
uni.navigateBack({
delta: 1,
});
}
return;
}
uni.navigateTo({
url: "/pages/serviceDetail/index?id=" + id,
url: `/pages/serviceDetail/index?id=${id}&come=chargeBox`,
});
// uni.navigateTo({
// url: `/pages/serviceDetail/mapDetail/index?servicePartId=${id}`,
@ -2136,6 +2621,114 @@ export default {
}
}
}
.merchantsBox {
margin-top: 24rpx;
.merchantsTop {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.leftMerchants {
.pageTitle {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #090c1a;
line-height: 44rpx;
text-align: justify;
font-style: normal;
}
.serviceName {
margin-left: 16rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #787879;
line-height: 32rpx;
text-align: justify;
font-style: normal;
}
}
.rightMerchants {
display: flex;
align-items: center;
.serviceName {
margin-left: 16rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #787879;
line-height: 32rpx;
text-align: justify;
font-style: normal;
}
.moreText {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #787879;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
.moreIcon {
width: 24rpx;
height: 24rpx;
margin-left: 8rpx;
}
}
}
.merchantsList {
width: 100%;
height: 276rpx;
border-radius: 8rpx;
border: 2rpx solid #f3f3f3;
padding: 22rpx;
box-sizing: border-box;
margin-top: 24rpx;
display: flex;
align-items: center;
overflow-x: scroll;
.merchantsItem {
margin-right: 24rpx;
.merchantsIconBox {
width: 168rpx;
height: 168rpx;
border-radius: 8rpx;
overflow: hidden;
.merchantsIcon {
width: 100%;
height: 100%;
}
}
.merchantsName {
display: inline-block;
width: 168rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #090c1a;
line-height: 40rpx;
text-align: justify;
font-style: normal;
}
}
}
}
.rightItem {
width: 70px;
height: 100%;

View File

@ -9,7 +9,7 @@
<span class="state">营业中</span>
</view>
<view class="leftBottom">
<image class="pointIcon" src="/static/images/home/address.png" />
<image class="pointIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/address.png" />
<span class="distanceText">{{
currentServiceMessage.SERVERPART_DISTANCE
? currentServiceMessage.SERVERPART_DISTANCE + "km"
@ -47,8 +47,8 @@
class="itemIcon"
:src="
currentServiceMessage.HASCHARGE
? '/static/images/home/Charging.svg'
: '/static/images/home/noCharging.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/Charging.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/noCharging.svg'
"
/>
@ -67,8 +67,8 @@
class="itemIcon"
:src="
currentServiceMessage.HASPILOTLOUNGE
? '/static/images/home/jinCar.svg'
: '/static/images/home/noJinCar.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/jinCar.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/noJinCar.svg'
"
/>
<!-- <image
@ -82,8 +82,8 @@
class="itemIcon"
:src="
currentServiceMessage.SERVERPART_TYPE
? '/static/images/home/health.svg'
: '/static/images/home/noHealth.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/health.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/noHealth.svg'
"
/>
@ -102,8 +102,8 @@
class="itemIcon"
:src="
currentServiceMessage.HASMOTHER
? '/static/images/home/baby.svg'
: '/static/images/home/nobaby.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/baby.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/nobaby.svg'
"
/>
@ -122,8 +122,8 @@
class="itemIcon"
:src="
currentServiceMessage.HASGUESTROOM
? '/static/images/home/hotel.svg'
: '/static/images/home/nohotel.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/hotel.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/nohotel.svg'
"
/>
<!-- <image

View File

@ -30,7 +30,7 @@
{{item}}
</div>
<div class='vehicle-panel-row-button vehicle-panel-row-button-img'>
<img src='/static/images/keyboard-delete.svg' class='vehicle-en-button-delete' @tap='vehicleTap("delete")' mode='aspectFit'>
<img src='https://eshangtech.com/wanmeiyizhanImg/keyboard-delete.svg' class='vehicle-en-button-delete' @tap='vehicleTap("delete")' mode='aspectFit'>
</div>
</div>
</div>
@ -57,7 +57,7 @@
</div>
<div class='vehicle-panel-row-button vehicle-panel-row-button-img'>
<img src='/static/images/keyboard-delete.svg' class='vehicle-en-button-delete' @tap='vehicleTap("delete")' mode='aspectFit'>
<img src='https://eshangtech.com/wanmeiyizhanImg/keyboard-delete.svg' class='vehicle-en-button-delete' @tap='vehicleTap("delete")' mode='aspectFit'>
</div>
<!-- <div :style="{border:buttonBorder}" class='vehicle-panel-row-button vehicle-panel-ok' @tap='vehicleTap("ok")' >确定</div> -->
</div>

View File

@ -24,7 +24,7 @@ export default {
data() {
return {
newNoDataPath: "/static/images/home/lostAndFoundIcon.svg",
newNoDataPath: "https://eshangtech.com/wanmeiyizhanImg/home/lostAndFoundIcon.svg",
noDataPath: "https://eshangtech.com/ShopICO/no-data.png",
noCoupon: "https://eshangtech.com/ShopICO/no-coupon.png",
};

View File

@ -36,7 +36,7 @@
</view>
<!-- <image
class="tabbarLogo"
src="/static/images/tabbar/CYYIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/tabbar/CYYIcon.png"
@click="handleGoShop"
/> -->
</div>

View File

@ -428,8 +428,7 @@
"pages": [{
"path": "index",
"style": {
"navigationBarTitleText": "失物招领",
"navigationStyle": "custom"
"navigationBarTitleText": "失物招领"
}
},
{

View File

@ -50,11 +50,11 @@
<view class="bottomBtn">
<view class="btn" @click="handleGoWxMin">
<image class="icon" src="/static/images/home/trailer.svg" />
<image class="icon" src="https://eshangtech.com/wanmeiyizhanImg/home/trailer.svg" />
<text class="btnText">一键救援</text>
</view>
<view class="btn right" @click="handleCallPhone">
<image class="icon" src="/static/images/home/rescuePhone.svg" />
<image class="icon" src="https://eshangtech.com/wanmeiyizhanImg/home/rescuePhone.svg" />
<text class="btnText">救援电话</text>
</view>
</view>

View File

@ -19,7 +19,7 @@
<view class="profileBox">
<image
class="profile"
src="/static/images/home/defaultProfit.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/defaultProfit.svg"
/>
</view>
<view class="otherBox">
@ -32,7 +32,7 @@
<view class="commentBox">
<image
class="commentIcon"
src="/static/images/home/commentIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/commentIcon.svg"
/>
<span class="commentText">
{{ item.POST_COMMENTCOUNT || 0 }}</span
@ -41,7 +41,7 @@
<view class="commentBox">
<image
class="commentIcon"
src="/static/images/home/thumbsUp.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/thumbsUp.svg"
/>
<span class="thumbsUp">{{ item.POST_LIKECOUNT || 0 }}</span>
</view>

View File

@ -7,7 +7,7 @@
<view class="itemTitle">服务区名称</view>
<view class="itemValue" @click="handleChangeService">
<view class="selectBox">
<view class="picker"
<view class="picker" style="font-size: 28rpx"
>{{
detailObj && detailObj.SERVERPART_NAME
? detailObj.SERVERPART_NAME
@ -16,7 +16,10 @@
</view>
</view>
<image class="moreIcon" src="/static/images/home/rightArrow.png" />
<image
class="moreIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</view>
</view>
@ -35,11 +38,11 @@
</view>
</picker>
</view>
<image class="moreIcon" src="/static/images/home/rightArrow.png" />
<image class="moreIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png" />
</view>
</view> -->
<view class="formItem">
<view class="formItem" style="align-items: flex-start">
<view class="itemTitle">
{{
addType === 1000 || detailObj.WECHAT_OPENID === "1000"
@ -50,7 +53,7 @@
}}</view
>
<view class="itemValue">
<input
<textarea
:placeholder="
addType === 1000
? '请描述一下丢失物品'
@ -58,6 +61,8 @@
? '请描述一下招领物品'
: ''
"
style="font-size: 28rpx"
placeholderStyle="font-size:28rpx;color: #B8B7B4;"
v-model="shopName"
:disabled="isDetail"
/>
@ -74,6 +79,7 @@
}}</view>
<view
class="itemValue"
style="font-size: 28rpx"
v-if="detailObj && detailObj.SUGGESTION_CREATEDATE"
>{{ detailObj.SUGGESTION_CREATEDATE || "" }}</view
>
@ -86,6 +92,7 @@
<view class="itemTitle">联系电话</view>
<view class="itemValue">
<input
style="font-size: 28rpx"
placeholder="请输入手机号码"
type="number"
maxlength="11"
@ -122,14 +129,14 @@
v-if="!isDetail"
@click="handleDeleteImg(item)"
class="deleteImg"
src="/static/images/home/deleteImg.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/deleteImg.svg"
/>
</view>
</view>
<view class="submitImg" @click="handleUpLoadImg" v-if="!isDetail">
<image
class="imgIcon"
src="/static/images/home/addImageIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/addImageIcon.svg"
/>
</view>
</view>
@ -190,8 +197,10 @@ export default {
this.handleGetDefaultTime();
//
this.handleGetTypeList();
this.phone = this.user.MEMBERSHIP_MOBILEPHONE;
if (query.id) {
} else {
this.phone = this.user.MEMBERSHIP_MOBILEPHONE;
}
},
onShow() {
let currentService = uni.getStorageSync("currentService");
@ -227,6 +236,7 @@ export default {
this.detailObj = data.Result_Data;
this.shopName = data.Result_Data.SUGGESTION_TITLE;
this.imgList = data.Result_Data.ImageList;
this.phone = data.Result_Data.PHONE_NUMBER;
},
//
async handleDeleteImg(obj) {
@ -461,7 +471,10 @@ export default {
},
//
handleChangeService() {
uni.navigateTo({ url: "/pages/newMap/index/index" });
if (this.detailObj) {
} else {
uni.navigateTo({ url: "/pages/newMap/index/index" });
}
},
//
async handleGetTypeList() {
@ -499,13 +512,13 @@ export default {
height: 100vh;
background: #f7f7f7;
box-sizing: border-box;
padding: 16px;
// padding: 16px;
.formBox {
width: 100%;
height: 100%;
background: #fff;
box-sizing: border-box;
padding: 12px 16px;
// padding: 12px 16px;
border-radius: 6px;
display: flex;
flex-direction: column;
@ -514,12 +527,19 @@ export default {
width: 100%;
display: flex;
align-items: center;
padding: 12px 0;
padding: 36rpx 32rpx;
border-bottom: 1px solid #f5f6f7;
box-sizing: border-box;
// padding: 12px 0;
.itemTitle {
width: 30%;
display: block;
font-size: 14px;
color: #000;
font-family: "PingFangSC";
font-weight: 400;
font-size: 28rpx;
color: #130f05;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
.itemValue {
width: 70%;
@ -582,9 +602,20 @@ export default {
}
.btnBox {
width: 100%;
box-sizing: border-box;
padding: 0 40rpx;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
.submitBox {
background-color: #333;
color: #caa97f;
background-color: #ba922f;
font-family: "PingFangSC";
font-weight: 400;
font-size: 32rpx;
color: #ffffff;
line-height: 44rpx;
text-align: center;
font-style: normal;
padding: 22rpx 0;
}
}
}

View File

@ -1,13 +1,13 @@
<template>
<view class="time-picker">
<picker mode="date" :value="selectedDate" @change="onDateChange">
<view class="picker-item">
<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">
<view class="picker-item" style="font-size:28rpx;">
<text>{{ formatTime(selectedTime) }}</text>
</view>
</picker>

View File

@ -6,18 +6,25 @@
height: `${loginType === 'min' ? menu.bottom + 8 : ''}px`,
paddingTop: `${menu.top}px`,
}"
v-if="false"
>
<div class="topContent">
<image
class="backIcon"
src="/static/images/home/backArrow.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/backArrow.svg"
@click="handleBack"
/>
<div class="first" @click="goSelectServer">
<image class="addressIcon" src="/static/images/home/blackFixed.png" />
<image
class="addressIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png"
/>
<div class="text">{{ nowServiceObj.SERVERPART_NAME || "" }}</div>
<image class="moreIcon" src="/static/images/home/rightArrow.png" />
<image
class="moreIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
<div
@ -29,7 +36,7 @@
</div>
</div>
<div class="tabBox">
<div class="tabBox" v-if="false">
<div
:class="fintType === 1000 ? 'tabItem active' : 'tabItem'"
@click="handleChangeType(1000)"
@ -51,7 +58,10 @@
width: showSearchBtn ? 'calc(100% - 80rpx) ' : '100%',
}"
>
<image class="searchIcon" src="/static/images/home/searchIcon.png" />
<image
class="searchIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png"
/>
<input
class="inputBox"
placeholder="请输入物品信息"
@ -62,40 +72,77 @@
@blur="noClickSearch"
@confirm="handleEntrySearch"
/>
<!-- <image class="searchIcon" src="/static/images/home/searchIcon.png" />
<!-- <image class="searchIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png" />
<span class="searchText">请输入服务区</span> -->
</div>
<div class="searchBtn" v-if="showSearchBtn" @click="handleGetListData">
搜索
</div>
<!-- <div class="filterBox" @click="showFilter" style="margin-left: 8px">
<image class="filterIcon" src="/static/images/home/filterIcon.svg" />
<image class="filterIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/filterIcon.svg" />
</div>
<div class="filterBox" @click="handleGoAdd" style="margin-left: 8px">
<image class="filterIcon" src="/static/images/home/addIcon.svg" />
<image class="filterIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/addIcon.svg" />
</div> -->
</div>
<div class="newSelectBox">
<div class="leftBox">
<div class="first" @click="goSelectServer">
<image
class="addressIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png"
/>
<div class="text">{{ nowServiceObj.SERVERPART_NAME || "" }}</div>
<image
class="moreIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
<div
:class="inSearchAll ? 'inSearchAll' : 'searchAll'"
@click="handleSearchAll"
>
查看全部
</div>
</div>
<div class="tabBoxNew">
<div
:class="fintType === 1000 ? 'tabItemNew activeNew' : 'tabItemNew'"
@click="handleChangeType(1000)"
>
失物
</div>
<div
:class="fintType === 2000 ? 'tabItemNew activeNew' : 'tabItemNew'"
@click="handleChangeType(2000)"
>
招领
</div>
</div>
</div>
<div
class="pageList"
:style="{
height: `calc(100vh - 200rpx - ${
height: `calc(100vh - 186rpx - ${
loginType === 'min' ? menu.bottom : menu.top * 2
}px - 30px - 80rpx)`,
}px )`,
}"
>
<div
v-if="dataList && dataList.length > 0"
style="width: 100%; height: 100%"
>
<div class="pageTitle">物品 ({{ dataList.length || "" }})</div>
<!-- <div class="pageTitle">物品 ({{ dataList.length || "" }})</div> -->
<scroll-view
scroll-y
class="listBox"
:style="{
height: `calc(100vh - 200rpx - ${
height: `calc(100vh - 186rpx - ${
loginType === 'min' ? menu.bottom : menu.top * 2
}px - 30px - 80rpx - 80rpx)`,
}px )`,
}"
refresher-enabled
:refresher-triggered="triggered"
@ -108,33 +155,81 @@
:key="index"
@click="handleGoDetail(item)"
>
<div class="title">
<span class="normal">{{ item.beforeOtherName }}</span>
<span class="light">{{ item.lightName }}</span>
<span class="normal">{{ item.afterOtherName }}</span>
<div class="leftImgNew">
<image
class="img"
:src="item.ImageList[0].ImageUrl"
v-if="item.ImageList && item.ImageList.length > 0"
/>
<image
class="img"
src="https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png"
v-else
/>
</div>
<div class="timeBox">
<image class="timeIcon" src="/static/images/home/timeIcon.png" />
<span class="timeText">{{ item.SUGGESTION_CREATEDATE }}</span>
<div class="rightItem">
<view>
<div class="title">
<span class="type">{{
fintType === 1000 ? "失物" : "招领"
}}</span>
<span class="normal">{{ item.beforeOtherName }}</span>
<span class="light">{{ item.lightName }}</span>
<span class="normal">{{ item.afterOtherName }}</span>
</div>
</view>
<view>
<div class="timeBox">
<span class="label">时间</span>
{{ item.SUGGESTION_CREATEDATE || "-" }}
</div>
<div class="placeBox">
<span class="label">{{
fintType === 1000 ? "丢失地点" : "捡拾地点"
}}</span>
{{ item.SERVERPART_NAME || "-" }}
</div>
<div class="phone">
<span class="label">联系电话</span>
{{ item.PHONE_NUMBER || "-" }}
</div>
</view>
</div>
<div class="phoneBox">
<!-- <image
<div v-if="false">
<div class="title">
<span class="normal">{{ item.beforeOtherName }}</span>
<span class="light">{{ item.lightName }}</span>
<span class="normal">{{ item.afterOtherName }}</span>
</div>
<div class="timeBox">
<image
class="timeIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/timeIcon.png"
/>
<span class="timeText">{{ item.SUGGESTION_CREATEDATE }}</span>
</div>
<div class="phoneBox">
<!-- <image
class="phoneIcon"
src="/static/images/home/phoneIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/phoneIcon.svg"
/>
<span class="phoneText">{{ item.PHONE_NUMBER }}</span> -->
<image
class="phoneIcon"
src="/static/images/home/communityInteraction.svg"
/>
<image
class="phoneIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/communityInteraction.svg"
/>
<span class="phoneText">{{ item.SERVERPART_NAME }}</span>
</div>
<div class="callPhoneBox" @click="handleCallPhone(item)">
<image
class="callPhoneIcon"
src="/static/images/home/phone.png"
/>
<span class="phoneText">{{ item.SERVERPART_NAME }}</span>
</div>
<div class="callPhoneBox" @click="handleCallPhone(item)">
<image
class="callPhoneIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/phone.png"
/>
</div>
</div>
</div>
@ -157,7 +252,10 @@
<view class="addNewPost" @click="handleGoAdd">
<view class="newPostBox">
<image class="addIcon" src="/static/images/home/addPost.svg" />
<image
class="addIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/addPost.svg"
/>
<text class="addText">{{
fintType === 1000 ? "新增失物" : fintType === 2000 ? "新增招领" : ""
}}</text>
@ -174,7 +272,7 @@
<div class="popupTitle">
<image
class="closeIcon"
src="/static/images/home/closeIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/closeIcon.svg"
@click="handleClosePopup"
/>
<span class="titleText">更多筛选</span>
@ -476,7 +574,7 @@ export default {
item.lightName = obj.keyword || "";
item.afterOtherName = obj.afterKeyword || "";
} else {
item.lightName = item.SUGGESTION_TITLE;
item.beforeOtherName = item.SUGGESTION_TITLE;
}
});
} else {
@ -699,12 +797,97 @@ export default {
}
}
.newSelectBox {
width: 100%;
box-sizing: border-box;
padding: 24rpx 32rpx 0;
display: flex;
align-items: center;
justify-content: space-between;
.leftBox {
max-width: 70%;
display: flex;
align-items: center;
.first {
display: flex;
align-items: center;
.addressIcon {
width: 24rpx;
height: 24rpx;
margin-right: 8rpx;
}
.text {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 30rpx;
color: #090c1a;
line-height: 36rpx;
text-align: justify;
font-style: normal;
}
.moreIcon {
margin-left: 8rpx;
width: 24rpx;
height: 24rpx;
}
}
.searchAll {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 30rpx;
color: #090c1a;
line-height: 36rpx;
text-align: justify;
font-style: normal;
margin-left: 8rpx;
text-align: center;
padding: 4rpx 16rpx;
}
.inSearchAll {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 30rpx;
color: #fff;
line-height: 36rpx;
text-align: justify;
font-style: normal;
margin-left: 8rpx;
background: #ba922f;
text-align: center;
border-radius: 8rpx;
padding: 4rpx 16rpx;
}
}
.tabBoxNew {
border: 2rpx solid #ba922f;
border-radius: 8rpx;
.tabItemNew {
display: inline-block;
padding: 4rpx 16rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 30rpx;
color: #ba922f;
line-height: 36rpx;
text-align: center;
font-style: normal;
}
.activeNew {
background: #ba922f;
color: #fff;
}
}
}
.pageList {
width: 100%;
// height: calc(100vh - 200rpx);
box-sizing: border-box;
padding: 0 32rpx;
margin-top: 40rpx;
margin-top: 24rpx;
.pageTitle {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
@ -728,6 +911,91 @@ export default {
box-sizing: border-box;
padding: 24rpx;
position: relative;
display: flex;
align-items: center;
.leftImgNew {
width: 200rpx;
height: 200rpx;
border-radius: 8rpx;
overflow: hidden;
margin-right: 16rpx;
.img {
width: 100%;
height: 100%;
}
}
.rightItem {
width: calc(100% - 200rpx);
height: 200rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
.title {
width: 100%;
font-family: "PingFangSC";
font-weight: 400;
font-size: 30rpx;
color: #130f05;
line-height: 36rpx;
text-align: left;
font-style: normal;
display: -webkit-box;
-webkit-line-clamp: 2; /* 设置显示的行数 */
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
.type {
font-size: 30rpx;
color: #d57a35;
margin-right: 12rpx;
}
.normal {
font-family: "PingFangSC";
font-weight: 400;
font-size: 30rpx;
color: #130f05;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
.light {
font-family: "PingFangSC";
font-weight: 400;
font-size: 30rpx;
color: #ba922f;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
}
.timeBox,
.placeBox,
.phone {
width: 100%;
font-family: "PingFangSC";
font-weight: 400;
font-size: 26rpx;
color: #716f69;
line-height: 32rpx;
text-align: left;
font-style: normal;
.label {
font-family: "PingFangSC";
font-weight: 400;
font-size: 26rpx;
color: #716f69;
line-height: 38rpx;
text-align: left;
font-style: normal;
margin-right: 12rpx;
width: 120rpx;
display: inline-block;
}
}
}
.title {
width: calc(100% - 72rpx);
// text-overflow: ellipsis;
@ -856,22 +1124,14 @@ export default {
}
.addNewPost {
height: 56px;
padding-bottom: 32rpx;
// display: inline-block;
// padding: 16rpx 24rpx;
// border-radius: 36rpx;
// background: #ba922f;
box-sizing: border-box;
// position: fixed;
// bottom: 20px;
// left: 50%;
width: calc(100% - 80rpx);
margin-left: 40rpx;
background: #ba922f;
border-radius: 6rpx;
display: flex;
align-items: center;
box-sizing: border-box;
justify-content: center;
// bottom: 40px;
// left: 50%;
// transform: translateX(-50%);
.newPostBox {
display: inline-block;
padding: 16rpx 24rpx;
@ -883,12 +1143,12 @@ export default {
margin-right: 8rpx;
}
.addText {
font-family: PingFangSC, PingFang SC;
font-family: "PingFangSC";
font-weight: 400;
font-size: 28rpx;
font-size: 32rpx;
color: #ffffff;
line-height: 40rpx;
text-align: justify;
line-height: 44rpx;
text-align: center;
font-style: normal;
}
}

View File

@ -3,7 +3,7 @@
<div class="content">
<div class="contentTop">
<div class="top">
<image class="couponIcon" src="/static/images/home/couponLogo.svg" />
<image class="couponIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/couponLogo.svg" />
<span class="couponText">满减券</span>
</div>
<div class="topContent">
@ -25,7 +25,7 @@
<div class="noticeBox">
<div class="noticeTitle">
<image class="noticeIcon" src="/static/images/home/noticeIcon.svg" />
<image class="noticeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/noticeIcon.svg" />
<span class="noticeText">领取说明</span>
</div>
<div class="noticeItem">
@ -93,7 +93,7 @@
<div class="coupon-box" v-show="isShow">
<view class="coupon-type flex align-center">
<image
src="/static/images/coupon/coupon-type.png"
src="https://eshangtech.com/wanmeiyizhanImg/coupon/coupon-type.png"
mode="aspectFill"
></image>
<text>{{

View File

@ -11,19 +11,19 @@
<span class="pageTitle">精选互动</span>
<!-- <image
class="backIcon"
src="/static/images/home/backArrow.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/backArrow.svg"
@click="handleBack"
/>
<div style="display: inline-block">
<view class="currentServiceBox" @click="goSelectServer">
<image class="pointIcon" src="/static/images/home/blackFixed.png" />
<image class="pointIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png" />
<span class="serviceName">{{
currentServiceMessage.SERVERPART_NAME || ""
}}</span>
<image
class="rightArrowIcon"
src="/static/images/home/rightArrowIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrowIcon.png"
/>
</view>
</div> -->
@ -33,13 +33,16 @@
<view class="selectService">
<div style="display: inline-block">
<view class="currentServiceBox" @click="goSelectServer">
<image class="pointIcon" src="/static/images/home/blackFixed.png" />
<image
class="pointIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png"
/>
<span class="serviceName">{{
currentServiceMessage.SERVERPART_NAME || ""
}}</span>
<image
class="rightArrowIcon"
src="/static/images/home/rightArrowIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrowIcon.png"
/>
</view>
</div>
@ -78,7 +81,7 @@
<view class="couponTime">
<image
class="timeIcon"
src="/static/images/home/timeIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/timeIcon.png"
/>
<span class="couponTimeText">
{{
@ -129,7 +132,7 @@
<view class="couponTime">
<image
class="timeIcon"
src="/static/images/home/timeIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/timeIcon.png"
/>
<span class="couponTimeText">
{{
@ -180,7 +183,7 @@
<view class="couponTime">
<image
class="timeIcon"
src="/static/images/home/timeIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/timeIcon.png"
/>
<span class="couponTimeText">
{{
@ -206,13 +209,16 @@
<!-- ; margin-left: 16rpx -->
<div style="display: inline-block; margin-top: 16rpx">
<view class="currentServiceBox" @click="goSelectServer">
<image class="pointIcon" src="/static/images/home/blackFixed.png" />
<image
class="pointIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png"
/>
<span class="serviceName">{{
currentServiceMessage.SERVERPART_NAME || ""
}}</span>
<image
class="rightArrowIcon"
src="/static/images/home/rightArrowIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrowIcon.png"
/>
</view>
</div>
@ -384,7 +390,7 @@
>
<image
class="orderIcon"
src="/static/images/home/goOrderIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/goOrderIcon.png"
/>
<span class="goOrderText">去点餐</span>
</div>
@ -547,7 +553,7 @@
>
<image
class="orderIcon"
src="/static/images/home/goOrderIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/goOrderIcon.png"
/>
<span class="goOrderText">去点餐</span>
</div>
@ -566,7 +572,7 @@
>
<image
class="couponIcon"
src="/static/images/home/useCoupon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/useCoupon.png"
/>
<span class="couponText">优惠券</span>
</div>
@ -623,7 +629,7 @@
<div class="couponTime">
<image
class="timeIcon"
src="/static/images/home/timeIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/timeIcon.png"
/>
<span class="couponTimeText">
{{
@ -699,7 +705,7 @@
<view class="labelItem" style="width: 40%">
<image
class="labelIcon"
src="/static/images/discovery/trade.png"
src="https://eshangtech.com/wanmeiyizhanImg/discovery/trade.png"
/>
<view class="labelName">{{
item.SHOPTRADE_TEXT || "品类"
@ -2918,7 +2924,8 @@ span.ico-t-count {
.icon-trade:before {
content: "";
background: url("/static/images/discovery/trade.png") no-repeat center;
background: url("https://eshangtech.com/wanmeiyizhanImg/discovery/trade.png")
no-repeat center;
background-size: contain;
width: 27rpx;
height: 24rpx;

View File

@ -2,6 +2,13 @@
<div class="main">
<div class="pageTitle">{{ detailObj.NOTICEINFO_TITLE || "" }}</div>
<div class="time">{{ detailObj.START_DATE || "-" }}</div>
<div class="jumpTo" v-if="detailObj.NOTICEINFO_TYPE === 2010">
<view class="jumpBox">
<div class="jumpItem" @click="handleGoCoupons">去领券</div>
</view>
</div>
<div
class="navList"
v-if="detailObj.ImageList && detailObj.ImageList.length > 0"
@ -29,6 +36,11 @@ export default {
}
},
methods: {
handleGoCoupons() {
uni.switchTab({
url: "/pages/discovery/index",
});
},
async hanldeGetDetail(id) {
const req = {
NOTICEINFOId: id,
@ -73,6 +85,26 @@ export default {
font-style: normal;
margin-top: 4rpx;
}
.jumpTo {
width: 100%;
box-sizing: border-box;
display: flex;
justify-content: flex-end;
.jumpBox {
padding: 10rpx 20rpx;
border-radius: 28rpx;
background: linear-gradient(90deg, #ffebe5 0%, #ffedd8 100%);
.jumpItem {
font-family: "PingFangSC";
font-weight: 400;
font-size: 26rpx;
color: #ff7040;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
}
}
.navList {
width: 100%;

View File

@ -75,28 +75,48 @@ export default {
},
// tab
async handleGetTabList() {
const data = await this.$api.$get(
"/EShangApiMain/FrameWork/GetFieldEnumTree",
{ FieldExplainField: "NOTICEINFO_TYPE" }
);
let list = this.$utils.wrapTreeNode(data.Result_Data.List);
let res = [];
if (list && list.length > 0) {
1040;
list.forEach((item) => {
if (item.children && item.children.length > 0) {
item.children.forEach((subItem) => {
if (subItem.value !== 1020 && subItem.value !== 1040) {
res.push(subItem);
}
});
}
});
}
// const data = await this.$api.$get(
// "/EShangApiMain/FrameWork/GetFieldEnumTree",
// { FieldExplainField: "NOTICEINFO_TYPE" }
// );
// let list = this.$utils.wrapTreeNode(data.Result_Data.List);
// let res = [];
// if (list && list.length > 0) {
// 1040;
// list.forEach((item) => {
// if (item.children && item.children.length > 0) {
// item.children.forEach((subItem) => {
// if (subItem.value !== 1020 && subItem.value !== 1040) {
// res.push(subItem);
// }
// });
// }
// });
// }
// this.tabList = res;
// console.log("tabList", res);
let res = [
{
ico: null,
index: 2010,
key: "2-2010",
label: "优惠促销",
type: 2,
value: 2010,
},
{
ico: null,
index: 1030,
key: "2-1030",
label: "路况信息",
type: 2,
value: 1030,
},
];
this.tabList = res;
console.log("tabList", res);
if (res && res.length > 0) {
this.selectTab = res[2].value;
this.selectTab = res[0].value;
}
this.handleGetHighwayHeadlines();
},

View File

@ -12,11 +12,17 @@
:style="{ paddingTop: menu.top + 'px', height: menu.height + 'px' }"
>
<div class="topLeft">
<image class="YDIcon" src="/static/images/home/YDIcon.png" />
<image
class="YDIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/YDIcon.png"
/>
<span class="pageTitle">皖美驿站</span>
</div>
<div class="topRight" @click="goSelectServer">
<image class="searchIcon" src="/static/images/home/searchIcon.png" />
<image
class="searchIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png"
/>
<span class="searchText">请输入服务区</span>
</div>
</div>
@ -31,11 +37,17 @@
>
<div class="topContent">
<div class="topLeft">
<image class="YDIcon" src="/static/images/home/YDIcon.png" />
<image
class="YDIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/YDIcon.png"
/>
<span class="pageTitle">皖美驿站</span>
</div>
<div class="topRight" @click="goSelectServer">
<image class="searchIcon" src="/static/images/home/searchIcon.png" />
<image
class="searchIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png"
/>
<span class="searchText">请输入服务区</span>
</div>
</div>
@ -108,7 +120,7 @@
>
<image
style="width: 40%; height: 40%"
src="/static/images/home/defaultUser.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/defaultUser.png"
/>
</div> -->
<button
@ -153,7 +165,10 @@
<div class="userCode" @click="isGo('/pages/homeFn/payfor/index')">
<!-- <div class="leftLine"></div> -->
<div class="codeBox">
<image class="codeImg" src="/static/images/home/codeIcon.png" />
<image
class="codeImg"
src="https://eshangtech.com/wanmeiyizhanImg/home/codeIcon.png"
/>
<span class="codeText">会员码</span>
</div>
</div>
@ -166,8 +181,8 @@
class="majorIcon"
:src="
pageStyle === 2
? '/static/images/home/orderNew.svg'
: '/static/images/home/order.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/orderNew.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/order.svg'
"
/>
<span class="majorTitle">点餐</span>
@ -180,13 +195,13 @@
class="majorIcon"
:src="
pageStyle === 2
? '/static/images/home/scanCodeToChargeNew.svg'
: '/static/images/home/scanCodeToCharge.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/scanCodeToChargeNew.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/scanCodeToCharge.svg'
"
/>
<span class="majorTitle">扫码充电</span>
<span class="majorDesc">快捷充电 免等待</span>
<!-- <image class="majorIcon" src="/static/images/home/store.svg" />
<!-- <image class="majorIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/store.svg" />
<span class="majorTitle">线上商城</span>
<span class="majorDesc">购特产 买周边</span> -->
</div>
@ -236,7 +251,7 @@
<div class="rightHead">
<image
class="moreIcon"
src="/static/images/home/rightArrow.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
</div>
@ -244,14 +259,14 @@
<div class="leftHead">
<image
class="leftImg"
src="/static/images/home/discountedActivities.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/discountedActivities.svg"
/>
<text class="leftTitle">优惠活动</text>
</div>
<div class="rightHead">
<image
class="moreIcon"
src="/static/images/home/rightArrow.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
</div>
@ -284,7 +299,12 @@
class="selectedMerchantsNew"
v-if="pageStyle === 2 && chaegeBoxList && chaegeBoxList.length > 0"
>
<charge-box :serviceAreaList="chaegeBoxList" pageType="scanCode" />
<charge-box
:showType="'horizontal'"
:serviceAreaList="chaegeBoxList"
pageType="scanCode"
:showStore="true"
/>
</div>
<!-- 精选商家 -->
@ -302,7 +322,7 @@
}}</span>
<image
class="moreIcon"
src="/static/images/home/rightArrow.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
</div>
@ -332,7 +352,7 @@
<!-- <div class="moreText">更多</div> -->
<image
class="moreIcon"
src="/static/images/home/rightArrow.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
</div>
@ -355,7 +375,7 @@
</div>
<image
class="shopIcon"
src="/static/images/home/shopIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/shopIcon.png"
/>
</div>
</div>
@ -393,61 +413,67 @@ export default {
// {
// label: "",
// value: 1,
// src: "/static/images/home/scanCodeToCharge.svg",
// noSrc: "/static/images/home/noScanCodeToCharge.svg",
// src: "https://eshangtech.com/wanmeiyizhanImg/home/scanCodeToCharge.svg",
// noSrc: "https://eshangtech.com/wanmeiyizhanImg/home/noScanCodeToCharge.svg",
// click: true,
// },
{
label: "出行导航",
value: 2,
src: "/static/images/home/travel.svg",
noSrc: "/static/images/home/noTravel.svg",
pageStyleSrc: "/static/images/home/travelNew.svg",
src: "https://eshangtech.com/wanmeiyizhanImg/home/travel.svg",
noSrc: "https://eshangtech.com/wanmeiyizhanImg/home/noTravel.svg",
pageStyleSrc:
"https://eshangtech.com/wanmeiyizhanImg/home/travelNew.svg",
click: true,
},
// {
// label: "",
// value: 3,
// src: "/static/images/home/community.svg",
// noSrc: "/static/images/home/noCommunity.svg",
// src: "https://eshangtech.com/wanmeiyizhanImg/home/community.svg",
// noSrc: "https://eshangtech.com/wanmeiyizhanImg/home/noCommunity.svg",
// click: true,
// },
{
label: "一键救援",
value: 4,
src: "/static/images/home/oneClickRescue.svg",
noSrc: "/static/images/home/noOneClickRescue.svg",
pageStyleSrc: "/static/images/home/oneClickRescueNew.svg",
src: "https://eshangtech.com/wanmeiyizhanImg/home/oneClickRescue.svg",
noSrc:
"https://eshangtech.com/wanmeiyizhanImg/home/noOneClickRescue.svg",
pageStyleSrc:
"https://eshangtech.com/wanmeiyizhanImg/home/oneClickRescueNew.svg",
click: true,
},
// {
// label: "",
// value: 5,
// src: "/static/images/home/communityInteraction.svg",
// noSrc: "/static/images/home/noCommunityInteraction.svg",
// src: "https://eshangtech.com/wanmeiyizhanImg/home/communityInteraction.svg",
// noSrc: "https://eshangtech.com/wanmeiyizhanImg/home/noCommunityInteraction.svg",
// click: true,
// },
{
label: "投诉反馈",
value: 6,
src: "/static/images/home/complaints.svg",
noSrc: "/static/images/home/noComplaints.svg",
pageStyleSrc: "/static/images/home/complaintsNew.svg",
src: "https://eshangtech.com/wanmeiyizhanImg/home/complaints.svg",
noSrc: "https://eshangtech.com/wanmeiyizhanImg/home/noComplaints.svg",
pageStyleSrc:
"https://eshangtech.com/wanmeiyizhanImg/home/complaintsNew.svg",
click: true,
},
// {
// label: "",
// value: 7,
// src: "/static/images/home/MEMBERBENEFITS.svg",
// noSrc: "/static/images/home/noMEMBERBENEFITS.svg",
// src: "https://eshangtech.com/wanmeiyizhanImg/home/MEMBERBENEFITS.svg",
// noSrc: "https://eshangtech.com/wanmeiyizhanImg/home/noMEMBERBENEFITS.svg",
// click: true,
// },
{
label: "失物招领",
value: 8,
src: "/static/images/home/lostAndfound.svg",
noSrc: "/static/images/home/nolostAndfound.svg",
pageStyleSrc: "/static/images/home/lostAndfoundNew.svg",
src: "https://eshangtech.com/wanmeiyizhanImg/home/lostAndfound.svg",
noSrc:
"https://eshangtech.com/wanmeiyizhanImg/home/nolostAndfound.svg",
pageStyleSrc:
"https://eshangtech.com/wanmeiyizhanImg/home/lostAndfoundNew.svg",
click: true,
},
], //
@ -648,10 +674,16 @@ export default {
let nearService = uni.getStorageSync("nearService");
if (nearService) {
this.nearPart = nearService;
this.chaegeBoxList = [nearService.ServerPart_Name];
} else {
this.handleGetNearService();
}
let nearThreeList = uni.getStorageSync("nearThreeList");
console.log("nearThreeList", nearThreeList);
if (nearThreeList) {
this.chaegeBoxList = nearThreeList;
}
this.handleGetHighwayHeadlines();
},
onHide() {
@ -676,10 +708,11 @@ export default {
let currentService = uni.getStorageSync("currentService");
console.log("currentService", currentService);
if (currentService) {
this.currentServicePart = currentService;
this.serverPart = currentService;
await this.getStore();
await this.getMall();
// this.currentServicePart = currentService;
// this.serverPart = currentService;
// await this.getStore();
// await this.getMall();
await this.getLocalServer();
} else {
if (this.loginType === "min") {
await this.getLocalServer();
@ -967,7 +1000,7 @@ export default {
NOTICEINFO_TYPES: 2010,
PROVINCE_CODE: this.user.PROVINCE_CODE,
NOTICEINFO_STATE: 1,
SERVERPART_IDS: this.nearPart.ServerPart_Id || "",
// SERVERPART_IDS: this.nearPart.ServerPart_Id || "",
},
PageIndex: 1,
PageSize: 6,
@ -1298,6 +1331,10 @@ export default {
async handleGetNearService(latitude, longitude) {
console.log("latitude", latitude);
console.log("longitude", longitude);
if (!latitude || !longitude) {
return;
}
let req = {
Province_Code: "340000",
longitude: longitude,
@ -1314,8 +1351,14 @@ export default {
console.log("data321312", data);
let _data = data.Result_Data.List;
let serverSelectList = [];
//
let nearThreeList = [];
console.log("nearThreeList", nearThreeList);
if (_data && _data.length > 0) {
_data.forEach((item) => {
_data.forEach((item, index) => {
if (index <= 2) {
nearThreeList.push(item.SERVERPART_NAME);
}
serverSelectList.push({
...item,
showName: item.SERVERPART_NAME,
@ -1346,12 +1389,14 @@ export default {
uni.hideLoading();
this.currentServicePart = obj;
this.serverPart = obj;
if (this.nearPart.ServerPart_Id) {
this.chaegeBoxList = [this.nearPart.ServerPart_Name];
}
console.log("this.chaegeBoxList2", this.chaegeBoxList);
// this.getStore();
// if (this.nearPart.ServerPart_Id) {
// this.chaegeBoxList = [this.nearPart.ServerPart_Name];
// }
this.chaegeBoxList = nearThreeList;
uni.setStorageSync("nearThreeList", nearThreeList); //
this.getStore();
this.getMall();
this.handleGetHighwayHeadlines();
} catch (error) {
@ -1484,7 +1529,8 @@ export default {
.main {
width: 100vw;
box-sizing: border-box;
padding-bottom: calc(90rpx + env(safe-area-inset-bottom));
padding-bottom: calc(110rpx + env(safe-area-inset-bottom));
padding-bottom: calc(110rpx + constant(safe-area-inset-bottom));
min-height: 100vh;
.backgroundBottom {
position: fixed;

View File

@ -103,7 +103,7 @@
<!-- </navigator>-->
<!-- 跳万佳的-->
<navigator class="model-c-menu" hover-class="navigator-hover" url="/pages/index/index" target="miniProgram" app-id="wx46686dbdd02eda15">
<i class="ico-menu"><image src="/static/images/discovery/logo.jpg" mode="aspectFit" style="width:43rpx;height:49rpx;"></image></i>
<i class="ico-menu"><image src="https://eshangtech.com/wanmeiyizhanImg/discovery/logo.jpg" mode="aspectFit" style="width:43rpx;height:49rpx;"></image></i>
<span>驿达万佳</span>
</navigator>
@ -845,7 +845,7 @@ export default {
background #fff
position relative
.hxing
background url(/static/images/hxing2.png) no-repeat center bottom
background url(https://eshangtech.com/wanmeiyizhanImg/hxing2.png) no-repeat center bottom
height 35rpx
background-size contain
position relative

View File

@ -31,7 +31,7 @@
<no-data :text="'暂无投诉建议'" :isShow="complaintsRecord.length" />
</div>
<div class="rate-box" @click="goNew">
<image src="/static/images/jianyi-ico.png" mode="aspectFit" class="yj-ico"/>
<image src="https://eshangtech.com/wanmeiyizhanImg/jianyi-ico.png" mode="aspectFit" class="yj-ico"/>
<div class="rate-ico">投诉建议</div>
</div>
</div>

View File

@ -39,7 +39,7 @@
>
<div class="markItem" v-for="(item, index) in showList" :key="index">
<div class="itemTitle">
<image class="titleIcon" src="/static/images/home/markIcon.svg" />
<image class="titleIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/markIcon.svg" />
<span class="label">{{ item.label || "-" }}获取</span>
<span class="value">{{ item.obtain || "-" }}</span>
<span class="label">已使用</span>

View File

@ -346,7 +346,7 @@ color999 = #999999;
.couponItem {
width: 100%;
height: 144rpx;
background: url('/static/images/home/validCoupons.png') no-repeat center;
background: url('https://eshangtech.com/wanmeiyizhanImg/home/validCoupons.png') no-repeat center;
background-size: contain;
box-sizing: border-box;
padding: 32rpx 0;
@ -449,7 +449,7 @@ color999 = #999999;
.couponItem {
width: 100%;
height: 144rpx;
background: url('/static/images/home/invalidCoupons.png') no-repeat center;
background: url('https://eshangtech.com/wanmeiyizhanImg/home/invalidCoupons.png') no-repeat center;
background-size: contain;
box-sizing: border-box;
padding: 32rpx 0;

View File

@ -8,7 +8,7 @@
</div>
<div class="messageText">21个车牌号仅允许被1个账号绑定</div>
</div>
<image class="carLogo" src="/static/images/home/carLogoBg.png" />
<image class="carLogo" src="https://eshangtech.com/wanmeiyizhanImg/home/carLogoBg.png" />
</div>
<!-- 输入车牌号的框 -->
@ -53,7 +53,7 @@
<swiper scroll-x="true" class="banner">
<swiper-item v-for="(item, o) in cards" :key="o" class="car-card">
<div class="car-card">
<image src="/static/images/car-card.png" mode="acspetFit" />
<image src="https://eshangtech.com/wanmeiyizhanImg/car-card.png" mode="acspetFit" />
<text class="card-title">{{ item.License_Plate }}</text>
</div>
</swiper-item>
@ -64,7 +64,7 @@
</div>
<div v-show="!isLoading && cards.length == 0">
<image
src="/static/images/car.png"
src="https://eshangtech.com/wanmeiyizhanImg/car.png"
mode="acspetFit"
class="pic-image"
></image>

View File

@ -433,7 +433,7 @@ export default {
margin-bottom 12rpx
width 42rpx
height 36rpx
background url(/static/images/pic.png) no-repeat center
background url(https://eshangtech.com/wanmeiyizhanImg/pic.png) no-repeat center
background-size contain
.address-content
display flex

View File

@ -3,7 +3,7 @@
<view class="centent-box">
<!-- <view class="top-images"> -->
<!-- <image
src="/static/images/cumulativeCode/vip-ico.png"
src="https://eshangtech.com/wanmeiyizhanImg/cumulativeCode/vip-ico.png"
mode="aspectFill"
></image> -->
<!-- </view> -->
@ -66,7 +66,7 @@
/>
</div>
<div class="refresh-box flex align-center" @click.stop="refreshCode()">
<image class="replayIcon" src="/static/images/home/replay.svg" />
<image class="replayIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/replay.svg" />
<span class="text-xs color9d">每分钟自动刷新</span>
</div>
<div
@ -76,7 +76,7 @@
<div class="flex align-center">
<div class="flex align-center">
<image
src="/static/images/home/couponLogo.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/couponLogo.png"
class="coupon-ico"
></image>
<view class="text-39">优惠券</view>
@ -99,7 +99,7 @@
}}</text>
<image
style="width: 24rpx; height: 24rpx"
src="/static/images/home/rightArrowIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrowIcon.png"
/>
</div>
</div>
@ -131,14 +131,14 @@
<view class="shipIconBox">
<image
class="shipIcon"
src="/static/images/home/alipayIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/alipayIcon.svg"
/>
</view> -->
<!-- <span class="shipTitle">支付宝</span> -->
<!-- </view> -->
<view class="shipItem" @click="handleRealGoPay(2)">
<view class="shipIconBox">
<image class="shipIcon" src="/static/images/home/wxPay.svg" />
<image class="shipIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/wxPay.svg" />
</view>
<!-- <span class="shipTitle">微信</span> -->
</view>
@ -319,9 +319,9 @@ export default {
_this.qrcodeHeight,
_this.qrcodeHeight,
null,
"../../../static/images/home/YDIconWhiteBg.png"
"../../..https://eshangtech.com/wanmeiyizhanImg/home/YDIconWhiteBg.png"
);
// _this.$utils.qrc('qrcode2', code, _this.qrcodeHeight2, _this.qrcodeHeight2, null, '../../../static/images/gsuyiw.png')
// _this.$utils.qrc('qrcode2', code, _this.qrcodeHeight2, _this.qrcodeHeight2, null, '../../..https://eshangtech.com/wanmeiyizhanImg/gsuyiw.png')
_this.showCode = code.substring(0, 4) + " " + "*".repeat("6");
wx.canvasToTempFilePath({
@ -685,7 +685,7 @@ canvas {
// content ''
// width 34rpx
// height 15rpx
// background url(/static/images/cumulativeCode/border-radius.png) no-repeat
// background url(https://eshangtech.com/wanmeiyizhanImg/cumulativeCode/border-radius.png) no-repeat
// background-size contain
// display block
// position absolute
@ -697,7 +697,7 @@ canvas {
// content ''
// width 34rpx
// height 15rpx
// background url(/static/images/cumulativeCode/border-radius.png) no-repeat
// background url(https://eshangtech.com/wanmeiyizhanImg/cumulativeCode/border-radius.png) no-repeat
// background-size contain
// position absolute
// right 50%
@ -788,7 +788,7 @@ canvas {
.couponItem {
width: 100%;
height: 144rpx;
background: url('/static/images/home/validCoupons.png') no-repeat center;
background: url('https://eshangtech.com/wanmeiyizhanImg/home/validCoupons.png') no-repeat center;
background-size: contain;
box-sizing: border-box;
padding: 32rpx 0;

View File

@ -12,7 +12,7 @@
<div class="searchBox">
<div class="searchTop">
<image class="searchIcon" src="/static/images/home/"/>
<image class="searchIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/"/>
</div>
</div>
</div>

View File

@ -20,7 +20,7 @@
<div class="messageBox">
<div class="phoneBox">
<image class="phoneIcon" src="/static/images/home/detailPhone.png" />
<image class="phoneIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/detailPhone.png" />
<input
class="phoneText"
placeholder="请输入手机号"
@ -31,7 +31,7 @@
</div>
<div class="phoneError">{{ errorMessage }}</div>
<div class="codeBox" v-if="loginType === 1">
<image class="codeIcon" src="/static/images/home/passwordICon.svg" />
<image class="codeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/passwordICon.svg" />
<input
v-model="password"
class="passwordText"
@ -40,7 +40,7 @@
/>
</div>
<div class="codeBox" v-if="loginType === 2">
<image class="codeIcon" src="/static/images/home/codeIcon.svg" />
<image class="codeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/codeIcon.svg" />
<input
v-model="code"
class="codeText"

View File

@ -5,7 +5,7 @@
<div class="messageBox">
<div class="phoneBox">
<image class="phoneIcon" src="/static/images/home/detailPhone.png" />
<image class="phoneIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/detailPhone.png" />
<input
class="phoneText"
placeholder="请输入手机号"
@ -16,7 +16,7 @@
</div>
<div class="phoneError">{{ errorMessage }}</div>
<div class="codeBox">
<image class="codeIcon" src="/static/images/home/passwordICon.svg" />
<image class="codeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/passwordICon.svg" />
<input
v-model="password"
class="passwordText"
@ -25,7 +25,7 @@
/>
</div>
<div class="codeBox">
<image class="codeIcon" src="/static/images/home/codeIcon.svg" />
<image class="codeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/codeIcon.svg" />
<input
v-model="code"
class="codeText"

View File

@ -2,14 +2,14 @@
<view class="main">
<view class="contentItem">
<view class="itemTitle">
<image class="pointIcon" src="/static/images/home/firstPoints.svg" />
<image class="pointIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/firstPoints.svg" />
<span class="titleText">会员权益设计</span>
</view>
<view class="itemContent">
<view class="smallTitle">
<span class="label">普通会员</span>
<image class="labelIcon" src="/static/images/home/normalUser.svg" />
<image class="labelIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/normalUser.svg" />
</view>
<view class="value"> 享受基础服务折扣如餐饮购物等 </view>
</view>
@ -17,7 +17,7 @@
<view class="itemContent" style="margin-top: 24rpx">
<view class="smallTitle">
<span class="label">银卡会员</span>
<image class="labelIcon" src="/static/images/home/silverCard.svg" />
<image class="labelIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/silverCard.svg" />
</view>
<view class="value">
在普通会员基础上提高相应折扣提供更高商品折扣及个性化服务如休息室使用定点服务区咖啡品尝等
@ -27,7 +27,7 @@
<view class="contentItem" style="margin-top: 48rpx">
<view class="itemTitle">
<image class="pointIcon" src="/static/images/home/secondPoint.svg" />
<image class="pointIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/secondPoint.svg" />
<span class="titleText">会员积分获取</span>
</view>
@ -69,7 +69,7 @@
<view class="contentItem" style="margin-top: 48rpx">
<view class="itemTitle">
<image class="pointIcon" src="/static/images/home/activityPoints.svg" />
<image class="pointIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/activityPoints.svg" />
<span class="titleText">活动积分</span>
</view>
<view class="contentBox">
@ -97,7 +97,7 @@
<view class="itemTitle">
<image
class="pointIcon"
src="/static/images/home/specialIntegral.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/specialIntegral.svg"
/>
<span class="titleText">特殊积分</span>
</view>

View File

@ -160,7 +160,7 @@ export default {
margin-bottom 12rpx
width 42rpx
height 36rpx
background url(../../../../static/images/pic.png) no-repeat center
background url(../../../..https://eshangtech.com/wanmeiyizhanImg/pic.png) no-repeat center
background-size contain
hr
margin 24rpx 32rpx

View File

@ -583,7 +583,7 @@ export default {
margin-bottom: 12rpx;
width: 42rpx;
height: 36rpx;
background: url("/static/images/pic.png") no-repeat center;
background: url("https://eshangtech.com/wanmeiyizhanImg/pic.png") no-repeat center;
background-size: contain;
}
}
@ -767,7 +767,7 @@ export default {
margin-bottom: 12rpx;
width: 42rpx;
height: 36rpx;
background: url("/static/images/pic.png") no-repeat center;
background: url("https://eshangtech.com/wanmeiyizhanImg/pic.png") no-repeat center;
background-size: contain;
}
}

View File

@ -13,7 +13,7 @@
show-location
></map>
<!-- <view class="ydBox" @click="handleClickYD">-->
<!-- <image class="ydIcon" src="/static/images/tabBar/company_active.png"/>-->
<!-- <image class="ydIcon" src="https://eshangtech.com/wanmeiyizhanImg/tabBar/company_active.png"/>-->
<!-- </view>-->
</view>
<!-- <view v-else class="map"></view>-->
@ -60,94 +60,121 @@
class="serviceList"
:style="{ height: isMoveUp ? `calc(100vh - 130px)` : '' }"
>
<!-- -->
<div
class="serviceItem"
v-for="(item, index) in serviceList"
:key="index"
@click="handleGoDetail(item.SERVERPART_ID, item)"
>
<div class="topItem">
<view class="leftItem">
<p class="title">{{ item.SERVERPART_NAME }}</p>
<view class="typeBox">{{
item.SERVERPART_TYPE ? serviceTypeObj[item.SERVERPART_TYPE] : ""
}}</view>
</view>
<div class="box">
<div class="imgBox">
<image class="icon" src="/static/images/home/phone.png"></image>
</div>
<div
class="imgBox"
style="margin-right: 0px"
@click.stop="handleGomap(item)"
>
<image class="icon" src="/static/images/home/map.png"></image>
<div v-if="false">
<div
class="serviceItem"
v-for="(item, index) in serviceList"
:key="index"
@click="handleGoDetail(item.SERVERPART_ID, item)"
>
<div class="topItem">
<view class="leftItem">
<p class="title">{{ item.SERVERPART_NAME }}</p>
<view class="typeBox" v-if="false">{{
item.SERVERPART_TYPE
? serviceTypeObj[item.SERVERPART_TYPE]
: ""
}}</view>
</view>
<div class="box">
<div class="imgBox">
<image
class="icon"
src="https://eshangtech.com/wanmeiyizhanImg/home/phone.png"
></image>
</div>
<div
class="imgBox"
style="margin-right: 0px"
@click.stop="handleGomap(item)"
>
<image
class="icon"
src="https://eshangtech.com/wanmeiyizhanImg/home/map.png"
></image>
</div>
</div>
</div>
</div>
<!-- <p class="distance">
<!-- <p class="distance">
距您 <text class="number">{{ item.SERVERPART_DISTANCE }}</text> km
</p> -->
<div class="info">
<image
class="infoIcon"
src="/static/images/home/address.svg"
></image>
<div class="addressBox">
<span class="distance">{{ item.SERVERPART_DISTANCE }}km</span>
<div class="line"></div>
<span class="address">{{ item.SERVERPART_ADDRESS }}</span>
<div class="info">
<image
class="infoIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/address.svg"
></image>
<div class="addressBox">
<span class="distance">{{ item.SERVERPART_DISTANCE }}km</span>
<div class="line"></div>
<span class="address">{{ item.SERVERPART_ADDRESS }}</span>
</div>
</div>
<div class="info" v-if="item.STARTDATE">
<image
class="infoIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/time.png"
></image>
<p class="time">{{ item.STARTDATE }}</p>
</div>
<view class="centerItem">
<view
class="centerConfigItemNew"
v-for="(subItem, index) in item.imgList.slice(0, 12)"
:key="index"
>
<image class="configImg" :src="subItem.url" />
<text class="configText">{{ subItem.title || "" }}</text>
</view>
</view>
<div class="typeList" v-if="false">
<image
class="typeItem"
:src="
item.HASCHARGE
? 'https://eshangtech.com/wanmeiyizhanImg/home/Charging.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/noCharging.svg'
"
></image>
<image
class="typeItem"
:src="
item.HASPILOTLOUNGE
? 'https://eshangtech.com/wanmeiyizhanImg/home/jinCar.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/noJinCar.svg'
"
></image>
<image
class="typeItem"
:src="
item.SERVERPART_TYPE
? 'https://eshangtech.com/wanmeiyizhanImg/home/health.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/noHealth.svg'
"
></image>
<image
class="typeItem"
:src="
item.HASMOTHER
? 'https://eshangtech.com/wanmeiyizhanImg/home/baby.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/nobaby.svg'
"
></image>
<image
class="typeItem"
:src="
item.HASGUESTROOM
? 'https://eshangtech.com/wanmeiyizhanImg/home/hotel.svg'
: 'https://eshangtech.com/wanmeiyizhanImg/home/nohotel.svg'
"
></image>
</div>
</div>
<div class="info" v-if="item.STARTDATE">
<image class="infoIcon" src="/static/images/home/time.png"></image>
<p class="time">{{ item.STARTDATE }}</p>
</div>
<div class="typeList">
<image
class="typeItem"
:src="
item.HASCHARGE
? '/static/images/home/Charging.svg'
: '/static/images/home/noCharging.svg'
"
></image>
<image
class="typeItem"
:src="
item.HASPILOTLOUNGE
? '/static/images/home/jinCar.svg'
: '/static/images/home/noJinCar.svg'
"
></image>
<image
class="typeItem"
:src="
item.SERVERPART_TYPE
? '/static/images/home/health.svg'
: '/static/images/home/noHealth.svg'
"
></image>
<image
class="typeItem"
:src="
item.HASMOTHER
? '/static/images/home/baby.svg'
: '/static/images/home/nobaby.svg'
"
></image>
<image
class="typeItem"
:src="
item.HASGUESTROOM
? '/static/images/home/hotel.svg'
: '/static/images/home/nohotel.svg'
"
></image>
</div>
</div>
<div v-if="chaegeBoxList && chaegeBoxList.length > 0">
<charge-box :serviceAreaList="chaegeBoxList" :pageType="'newMap'" :comeForm="comeForm" />
</div>
</div>
</div>
@ -160,7 +187,9 @@ import {
handleHavePointInApp,
hanldeHavePointInIos,
} from "../../../utils/publicMethods";
import ChargeBox from "../../../components/chargeBox.vue";
export default {
components: { ChargeBox },
data() {
return {
menu: {}, //
@ -183,6 +212,7 @@ export default {
seatInfo: {}, //
loginType: "", //
comeForm: "",
chaegeBoxList: [], //
};
},
async onLoad(option) {
@ -314,6 +344,7 @@ export default {
//
longitude: this.seatInfo.longitude,
latitude: this.seatInfo.latitude,
ShowService: true,
// longitude: this.currentServiceMessage.ServerPart_X || "",
// latitude: this.currentServiceMessage.ServerPart_Y || "",
};
@ -321,7 +352,177 @@ export default {
"/CommercialApi/BaseInfo/GetServerpartList",
req
);
this.serviceList = data.Result_Data.List;
let list = data.Result_Data.List;
let nameList = [];
if (list && list.length > 0) {
list.forEach((item) => {
nameList.push(item.SERVERPART_NAME);
//
let LIAUTOCHARGESum = 0;
//
let STATEGRIDCHARGESum = 0;
//
let GACENERGYCHARGESum = 0;
let HASPANTRY = 0; //
let HASWIFI = 0; //
let MICROWAVEOVEN = 0; //
let WASHERCOUNT = 0; //
let HASPILOTLOUNGE = false; //
let HASCHILD = false; //
let SMALLPARKING = 0; // 轿
let PACKING = 0; //
let TRUCKPACKING = 0; //
let DANPACKING = 0; //
let DININGROOMCOUNT = 0; //
let HASBACKGROUNDRADIO = 0; // 便
let POINTCONTROLCOUNT = 0; //
let REFUELINGGUN92 = 0; // 92
let REFUELINGGUN95 = 0; // 95
let REFUELINGGUN0 = 0; // 0
if (item.RegionInfo && item.RegionInfo.length > 0) {
item.RegionInfo.forEach((subItem) => {
HASPANTRY += subItem.HASPANTRY;
HASWIFI += subItem.HASPANTRY;
MICROWAVEOVEN += subItem.MICROWAVEOVEN;
WASHERCOUNT += subItem.WASHERCOUNT;
SMALLPARKING += subItem.SMALLPARKING;
PACKING += subItem.PACKING;
TRUCKPACKING += subItem.TRUCKPACKING;
DANPACKING += subItem.DANPACKING;
DININGROOMCOUNT += subItem.DININGROOMCOUNT;
HASBACKGROUNDRADIO += subItem.HASBACKGROUNDRADIO;
POINTCONTROLCOUNT += subItem.POINTCONTROLCOUNT;
REFUELINGGUN92 += subItem.REFUELINGGUN92;
REFUELINGGUN95 += subItem.REFUELINGGUN95;
REFUELINGGUN0 += subItem.REFUELINGGUN0;
if (subItem.HASPILOTLOUNGE) {
HASPILOTLOUNGE = true;
}
if (subItem.HASCHILD) {
HASCHILD = true;
}
});
}
item.imgList = [
{
url:
HASPANTRY > 0 || HASWIFI > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/WC.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noWC.svg",
isShow: HASPANTRY > 0,
title: "卫生间",
},
{
url:
HASPANTRY > 0 || HASWIFI > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/motherAndBaby.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/nomotherAndBaby.svg",
isShow: HASPANTRY > 0 || HASWIFI > 0,
title: "母婴室",
},
{
url:
HASPILOTLOUNGE > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/HASPILOTLOUNGE.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noHASPILOTLOUNGE.svg",
isShow: HASPILOTLOUNGE > 0,
title: "司机之家",
},
{
url:
SMALLPARKING > 0 ||
PACKING > 0 ||
TRUCKPACKING > 0 ||
DANPACKING > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/SMALLPARKING.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noSMALLPARKING.svg",
isShow:
SMALLPARKING > 0 ||
PACKING > 0 ||
TRUCKPACKING > 0 ||
DANPACKING > 0,
title: "停车场",
},
{
url:
REFUELINGGUN92 > 0 || REFUELINGGUN95 > 0 || REFUELINGGUN0 > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/REFUELINGGUN.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noREFUELINGGUN.svg",
isShow:
REFUELINGGUN92 > 0 || REFUELINGGUN95 > 0 || REFUELINGGUN0 > 0,
title: "加油站",
},
{
url:
LIAUTOCHARGESum > 0 ||
STATEGRIDCHARGESum > 0 ||
GACENERGYCHARGESum > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/chargingStation.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/nochargingStation.svg",
isShow:
LIAUTOCHARGESum > 0 ||
STATEGRIDCHARGESum > 0 ||
GACENERGYCHARGESum > 0,
title: "充电桩",
},
{
url:
DININGROOMCOUNT > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/DININGROOMCOUNT.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noDININGROOMCOUNT.svg",
isShow: DININGROOMCOUNT > 0,
title: "餐饮",
},
{
url:
HASBACKGROUNDRADIO > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/HASBACKGROUNDRADIO.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noHASBACKGROUNDRADIO.svg",
isShow: HASBACKGROUNDRADIO > 0,
title: "便利店",
},
{
url: HASCHILD
? "https://eshangtech.com/minTestImg/chargeImgNew/HASCHILD.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noHASCHILD.svg",
isShow: SMALLPARKING,
title: "车辆维修",
},
{
url:
POINTCONTROLCOUNT > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/POINTCONTROLCOUNT.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noPOINTCONTROLCOUNT.svg",
isShow: POINTCONTROLCOUNT > 0,
title: "客房",
},
{
url:
WASHERCOUNT > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/WASHERCOUNT.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noWASHERCOUNT.svg",
isShow: WASHERCOUNT > 0,
title: "洗衣机",
},
{
url:
MICROWAVEOVEN > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/MICROWAVEOVEN.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noMICROWAVEOVEN.svg",
isShow: MICROWAVEOVEN > 0,
title: "微波炉",
},
];
});
}
this.chaegeBoxList = nameList;
this.serviceList = list;
console.log("this.serviceList", this.serviceList);
await this.getServiceDetail(this.serviceList[0].SERVERPART_ID);
},
@ -396,18 +597,188 @@ export default {
},
//
async handleSearch() {
this.chaegeBoxList = [];
let req = {
// longitude: this.longitude,
Province_Code: "340000",
longitude: this.seatInfo.longitude,
latitude: this.seatInfo.latitude,
Serverpart_Name: this.searchText,
ShowService: true,
};
const data = await this.$api.$get(
"/CommercialApi/BaseInfo/GetServerpartList",
req
);
this.serviceList = data.Result_Data.List;
let list = data.Result_Data.List;
let nameList = [];
if (list && list.length > 0) {
list.forEach((item) => {
nameList.push(item.SERVERPART_NAME);
//
let LIAUTOCHARGESum = 0;
//
let STATEGRIDCHARGESum = 0;
//
let GACENERGYCHARGESum = 0;
let HASPANTRY = 0; //
let HASWIFI = 0; //
let MICROWAVEOVEN = 0; //
let WASHERCOUNT = 0; //
let HASPILOTLOUNGE = false; //
let HASCHILD = false; //
let SMALLPARKING = 0; // 轿
let PACKING = 0; //
let TRUCKPACKING = 0; //
let DANPACKING = 0; //
let DININGROOMCOUNT = 0; //
let HASBACKGROUNDRADIO = 0; // 便
let POINTCONTROLCOUNT = 0; //
let REFUELINGGUN92 = 0; // 92
let REFUELINGGUN95 = 0; // 95
let REFUELINGGUN0 = 0; // 0
if (item.RegionInfo && item.RegionInfo.length > 0) {
item.RegionInfo.forEach((subItem) => {
HASPANTRY += subItem.HASPANTRY;
HASWIFI += subItem.HASPANTRY;
MICROWAVEOVEN += subItem.MICROWAVEOVEN;
WASHERCOUNT += subItem.WASHERCOUNT;
SMALLPARKING += subItem.SMALLPARKING;
PACKING += subItem.PACKING;
TRUCKPACKING += subItem.TRUCKPACKING;
DANPACKING += subItem.DANPACKING;
DININGROOMCOUNT += subItem.DININGROOMCOUNT;
HASBACKGROUNDRADIO += subItem.HASBACKGROUNDRADIO;
POINTCONTROLCOUNT += subItem.POINTCONTROLCOUNT;
REFUELINGGUN92 += subItem.REFUELINGGUN92;
REFUELINGGUN95 += subItem.REFUELINGGUN95;
REFUELINGGUN0 += subItem.REFUELINGGUN0;
if (subItem.HASPILOTLOUNGE) {
HASPILOTLOUNGE = true;
}
if (subItem.HASCHILD) {
HASCHILD = true;
}
});
}
item.imgList = [
{
url:
HASPANTRY > 0 || HASWIFI > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/WC.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noWC.svg",
isShow: HASPANTRY > 0,
title: "卫生间",
},
{
url:
HASPANTRY > 0 || HASWIFI > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/motherAndBaby.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/nomotherAndBaby.svg",
isShow: HASPANTRY > 0 || HASWIFI > 0,
title: "母婴室",
},
{
url:
HASPILOTLOUNGE > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/HASPILOTLOUNGE.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noHASPILOTLOUNGE.svg",
isShow: HASPILOTLOUNGE > 0,
title: "司机之家",
},
{
url:
SMALLPARKING > 0 ||
PACKING > 0 ||
TRUCKPACKING > 0 ||
DANPACKING > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/SMALLPARKING.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noSMALLPARKING.svg",
isShow:
SMALLPARKING > 0 ||
PACKING > 0 ||
TRUCKPACKING > 0 ||
DANPACKING > 0,
title: "停车场",
},
{
url:
REFUELINGGUN92 > 0 || REFUELINGGUN95 > 0 || REFUELINGGUN0 > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/REFUELINGGUN.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noREFUELINGGUN.svg",
isShow:
REFUELINGGUN92 > 0 || REFUELINGGUN95 > 0 || REFUELINGGUN0 > 0,
title: "加油站",
},
{
url:
LIAUTOCHARGESum > 0 ||
STATEGRIDCHARGESum > 0 ||
GACENERGYCHARGESum > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/chargingStation.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/nochargingStation.svg",
isShow:
LIAUTOCHARGESum > 0 ||
STATEGRIDCHARGESum > 0 ||
GACENERGYCHARGESum > 0,
title: "充电桩",
},
{
url:
DININGROOMCOUNT > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/DININGROOMCOUNT.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noDININGROOMCOUNT.svg",
isShow: DININGROOMCOUNT > 0,
title: "餐饮",
},
{
url:
HASBACKGROUNDRADIO > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/HASBACKGROUNDRADIO.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noHASBACKGROUNDRADIO.svg",
isShow: HASBACKGROUNDRADIO > 0,
title: "便利店",
},
{
url: HASCHILD
? "https://eshangtech.com/minTestImg/chargeImgNew/HASCHILD.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noHASCHILD.svg",
isShow: SMALLPARKING,
title: "车辆维修",
},
{
url:
POINTCONTROLCOUNT > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/POINTCONTROLCOUNT.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noPOINTCONTROLCOUNT.svg",
isShow: POINTCONTROLCOUNT > 0,
title: "客房",
},
{
url:
WASHERCOUNT > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/WASHERCOUNT.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noWASHERCOUNT.svg",
isShow: WASHERCOUNT > 0,
title: "洗衣机",
},
{
url:
MICROWAVEOVEN > 0
? "https://eshangtech.com/minTestImg/chargeImgNew/MICROWAVEOVEN.svg"
: "https://eshangtech.com/minTestImg/chargeImgNew/noMICROWAVEOVEN.svg",
isShow: MICROWAVEOVEN > 0,
title: "微波炉",
},
];
});
}
this.serviceList = list;
this.chaegeBoxList = nameList;
console.log("this.chaegeBoxList", this.chaegeBoxList);
},
},
};
@ -698,6 +1069,63 @@ export default {
margin-right: 16rpx;
}
}
.centerItem {
width: 100%;
box-sizing: border-box;
margin-top: 24rpx;
display: flex;
align-items: center;
flex-wrap: wrap;
.centerConfigItem {
width: calc((100% / 5));
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-bottom: 24rpx;
.configImg {
width: 32rpx;
height: 32rpx;
// margin-right: 8rpx;
margin-bottom: 8rpx;
}
.configText {
font-family: 'PingFang SC', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif;
font-weight: 400;
font-size: 24rpx;
color: #130f05;
line-height: 40rpx;
}
}
.centerConfigItemNew {
width: calc((100% / 6));
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-bottom: 24rpx;
.configImg {
width: 48rpx;
height: 48rpx;
// margin-right: 8rpx;
margin-bottom: 8rpx;
}
.configText {
font-family: 'PingFang SC', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif;
font-weight: 400;
font-size: 24rpx;
color: #130f05;
line-height: 40rpx;
}
}
}
}
}
}

View File

@ -2,7 +2,7 @@
<template>
<view class="main">
<view class="noDataBox">
<image class="waitIcon" src="/static/images/home/funWaitIcon.svg" />
<image class="waitIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/funWaitIcon.svg" />
<text class="waitText">模块开发中...</text>
</view>
</view>

View File

@ -12,7 +12,15 @@
</div>
<div class="content">
<div class="contentFirst" v-if="selectTab === 1 || selectTab === 2">
<div
class="contentFirst"
v-if="
selectTab === 1 ||
selectTab === 2 ||
selectTab === 4 ||
selectTab === 5
"
>
<div class="orderList" v-if="orderList && orderList.length > 0">
<div
class="orderItem"
@ -41,12 +49,23 @@
</div>
<div class="shopList">
<div class="shopLeftList">
<div class="leftShopItem">
<image class="leftShopImg" />
<span class="shopName"></span>
<scroll-view class="shopLeftList" :scroll-x="true">
<div
class="leftShopItem"
v-for="(item, index) in item.GOODSList"
:key="index"
>
<image
class="leftShopImg"
:src="
item.IMAGE_URL ||
'https://eshangtech.com/ShopICO/no-picture.png'
"
/>
<span class="shopName">{{ item.COMMODITY_NAME }}</span>
</div>
</div>
</scroll-view>
<div class="shopRightList">
<div class="priceBox">
<span class="unit">¥</span>
@ -60,7 +79,11 @@
<div
class="commentItem"
@click.stop="goEvaluate(item)"
v-if="item.COMMENT_STATE === 0 && item.SALEBILL_STATE !== 1010 && item.SALEBILL_STATE > 3000"
v-if="
item.COMMENT_STATE === 0 &&
item.SALEBILL_STATE !== 1010 &&
item.SALEBILL_STATE > 3000
"
>
评价得积分
</div>
@ -95,7 +118,7 @@
<div class="evaluateRight">
<image
class="deleteIcon"
src="/static/images/home/deleteIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/deleteIcon.png"
/>
</div>
</div>
@ -226,13 +249,27 @@ export default {
},
orderList: [],
tabList: [
{ label: "全部", value: 1 },
{ label: "待评价", value: 2 },
{ label: "我的评价", value: 3 },
{
label: "全部",
value: 1,
},
{
label: "待付款",
value: 2,
},
{
label: "待收货",
value: 4,
},
{
label: "已完成",
value: 5,
},
],
allList: [], // [0] [1] //
selectTab: 1,
myEvaluation: [], //
searchType: "",
};
},
components: {
@ -248,7 +285,20 @@ export default {
}),
handleChangeSelectTab(value) {
this.selectTab = value;
this.orderList = this.allList[this.selectTab - 1];
this.orderList = [];
let type =
this.selectTab === 1
? ""
: this.selectTab === 2
? "1005"
: this.selectTab === 3
? "1010"
: this.selectTab === 4
? "2000"
: this.selectTab === 5
? ""
: "";
this.handleGetOrderList(type);
},
getorderList() {
let _this = this;
@ -348,12 +398,50 @@ export default {
console.log("handleGetOurEvaluateList", res);
});
},
//
async handleGetOrderList(status) {
let _this = this;
uni.showLoading({
title: "加载中...",
});
const req = {
action_type: "GetOrderList",
salebillType: 6000,
salebillState: status || "",
PageIndex: this.pageMsg.pageIndex,
pageSize: this.pageMsg.pageSize,
ownerUnitId: 911,
requestType: "application/x-www-form-urlencoded",
};
const res = await this.$api.postCoop(req);
if (res.ResultCode === "100") {
if (_this.pageMsg.pageIndex === 1) {
_this.orderList = res.Data.List;
} else {
_this.orderList = _this.orderList.concat(res.Data.List);
}
if (res.Data.TotalCount > _this.orderList.length) {
_this.pageMsg.isLoadMore = true;
} else {
_this.pageMsg.isLoadMore = false;
}
} else {
_this.orderList = [];
}
console.log("_this.orderList", _this.orderList);
this.setIsLoading(false);
uni.hideLoading();
},
},
onPullDownRefresh() {
// this.orderList = []
this.pageMsg.pageIndex = 1;
// this.setIsLoading(true)
this.getorderList();
// this.getorderList();
setTimeout(function () {
uni.stopPullDownRefresh();
}, 1000);
@ -361,16 +449,34 @@ export default {
onShow() {
// this.orderList = []
this.pageMsg.pageIndex = 1;
this.getorderList();
// this.getorderList();
this.setIsLoading(true);
this.handleGetOurEvaluateList();
// this.handleGetOurEvaluateList();
},
onLoad(query) {
if (query.type) {
this.searchType = query.type;
this.selectTab = Number(this.searchType);
}
let type =
this.selectTab === 1
? ""
: this.selectTab === 2
? "1005"
: this.selectTab === 3
? "1010"
: this.selectTab === 4
? "2000"
: this.selectTab === 5
? ""
: "";
//
this.handleGetOrderList(type);
// this.orderList = []
// this.pageMsg.pageIndex = 1
// this.setIsLoading(true)
// this.getorderList()
},
// onLoad () {
// this.orderList = []
// this.pageMsg.pageIndex = 1
// this.setIsLoading(true)
// this.getorderList()
// },
onReachBottom() {
if (this.pageMsg.isLoadMore) {
this.pageMsg.pageIndex += 1;
@ -514,15 +620,17 @@ export default {
align-items: center;
.shopLeftList {
width: calc(100% - 112rpx);
overflow-x: auto;
white-space: nowrap;
.leftShopItem {
display: inline-block;
width: 136rpx;
margin-right: 16rpx;
.leftShopImg {
width: 136rpx;
height: 136rpx;
width: 168rpx;
height: 128rpx;
border-radius: 6rpx;
margin-bottom: 8rpx;
margin-right: 16rpx;
}
.shopName {
font-family: PingFangSC, PingFang SC;

View File

@ -1,5 +1,10 @@
<template>
<div class="order" v-if="isorder">
<div class="foodCode">
<div class="codeNumber">{{ orderInfo.TAKE_NUMBER || "-" }}</div>
<div class="codeText">取餐码</div>
</div>
<div class="order-status">
<div class="order-success">
{{
@ -194,7 +199,7 @@
<div class="logoBox">
<image
class="logoIcon"
src="/static/images/home/alipayIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/alipayIcon.png"
/>
</div>
<text>支付宝支付</text>
@ -212,7 +217,10 @@
>
<div class="radioLeft">
<div class="logoBox">
<image class="logoIcon" src="/static/images/home/wxPay.png" />
<image
class="logoIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/wxPay.png"
/>
</div>
<text>微信支付</text>
</div>
@ -345,7 +353,7 @@ export default {
// debugger
let oldTime = new Date(_this.orderTime).getTime() / 1000 + 15 * 60;
let nowTime = new Date().getTime() / 1000;
let timediff = parseInt(oldTime - nowTime);
let timediff = parseInt(oldTime - nowTime);
if (timediff > 0) {
_this.minutes =
"(" + parseInt(timediff / 60) + "分" + (timediff % 60) + "秒)";
@ -386,17 +394,18 @@ export default {
// }
let _this = this;
//
let mchid = "1672298991";
let mchid = "1707624624";
let timeStamp = Math.ceil(new Date().getTime() / 1000);
let nonceStr = Math.random().toString(36).substring(2, 8);
let serial_no = "5BA7C0F427FC042DB5BF299E35B373D5EFCECD35";
let serial_no = "5904E3BF9EDC8B2AA3F99E51440B34FB7FFA6EDA";
// let out_trade_no = this.generateOutTradeNo(32)
let out_trade_no = obj.SALEBILL_CODE;
console.log("obj", obj);
let req = {
appid: "wxee018fb96955552a", // ID
mchid: "1672298991", //
description: "彩云驿商城", //
appid: "wx4c497eddcec4a0e7", // ID
mchid: "1707624624", //
description: "安徽省驿达高速公路服务区经营管理有限公司", //
out_trade_no: out_trade_no, //
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", //
@ -419,6 +428,7 @@ export default {
"\n" +
JSON.stringify(req) +
"\n",
provinceCode: _this.provinceCode || "340000",
};
console.log(
"POST\n/v3/pay/transactions/jsapi\n" +
@ -446,18 +456,21 @@ export default {
"Content-Type": "application/json",
},
success: async (res) => {
console.log("res", res);
console.log(res.data.prepay_id);
this.text = "request success";
let paySign = "";
let reqSign = {
parameters:
"wxee018fb96955552a\n" +
"wx4c497eddcec4a0e7\n" +
timeStamp +
"\n" +
nonceStr +
"\nprepay_id=" +
res.data.prepay_id +
"\n",
provinceCode: _this.provinceCode || "340000",
};
const data = await this.$api.$get("/WeChat/GenerateSign", reqSign);
paySign = data.Result_Data;
@ -477,7 +490,7 @@ export default {
},
complete(res) {
uni.redirectTo({
url: `/pages/order/orderdetail/index?orderInternal=${obj.SALEBILL_ID}`,
url: `/pages/orders/orderdetail/index?orderInternal=${obj.SALEBILL_ID}`,
});
},
});
@ -874,6 +887,27 @@ page {
box-sizing: border-box;
height: 100%;
}
.foodCode {
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
background: #2fa4ff;
padding-top: 24rpx;
.codeNumber {
font-size: 36rpx;
font-weight: 600;
color: #fff;
}
.codeText {
font-family: "PingFangSC";
font-weight: 400;
font-size: 28rpx;
color: #7e5314;
line-height: 36rpx;
}
}
.order-status {
padding: 32rpx 32rpx 56rpx 32rpx;

View File

@ -115,7 +115,7 @@
<div style="width: 16px; height: 16px">
<image
style="width: 16px; height: 16px"
src="/static/images/home/share.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/share.svg"
/>
</div>
<div>分享</div>

View File

@ -79,8 +79,8 @@
</div>
<!-- <div class="bottom-content">
<image class="logo1" src="../../static/images/logo.png"></image>
<image class="logo2" src="../../static/images/yifu_logo.png"></image>
<image class="logo1" src="../..https://eshangtech.com/wanmeiyizhanImg/logo.png"></image>
<image class="logo2" src="../..https://eshangtech.com/wanmeiyizhanImg/yifu_logo.png"></image>
</div> -->
<div style="width: 100%; display: flex; justify-content: center">
<view class="login-tip-text">

View File

@ -10,23 +10,35 @@
<div class="topContent">
<image
class="backIcon"
src="/static/images/home/backArrow.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/backArrow.svg"
@click="handleBack"
/>
<div class="first" @click="goSelectServer">
<image class="addressIcon" src="/static/images/home/blackFixed.png" />
<image
class="addressIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png"
/>
<div class="text">{{ serverPart.SERVERPART_NAME || "" }}</div>
<image class="moreIcon" src="/static/images/home/rightArrow.png" />
<image
class="moreIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
</div>
</div>
<div class="pageTop" v-if="false">
<div class="first" @click="goSelectServer">
<image class="addressIcon" src="/static/images/home/blackFixed.png" />
<image
class="addressIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png"
/>
<div class="text">{{ serverPart.SERVERPART_NAME || "" }}</div>
<image class="moreIcon" src="/static/images/home/rightArrow.png" />
<image
class="moreIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
<div class="second">
距您{{ serverPart.SERVERPART_DISTANCE || "-" }}km
@ -127,7 +139,7 @@
<view class="couponIconBox">
<image
class="couponIcon"
src="/static/images/home/useCoupon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/useCoupon.svg"
/>
</view>
<span class="couponText">优惠券</span>
@ -142,7 +154,7 @@
>
<image
class="orderIcon"
src="/static/images/home/goOrderIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/goOrderIcon.svg"
/>
<span class="goOrderText">去点餐</span>
</div>
@ -161,7 +173,7 @@
>
<image
class="couponIcon"
src="/static/images/home/useCoupon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/useCoupon.png"
/>
<span class="couponText">优惠券</span>
</div> -->
@ -303,9 +315,9 @@ export default {
let shopList = [];
if (list && list.length > 0) {
list.forEach((item) => {
if (item.SCANCODE_ORDER === 1) {
// if (item.SCANCODE_ORDER === 1) {
shopList.push(item);
}
// }
});
}
_this.handleSortShopList(shopList);
@ -377,12 +389,12 @@ export default {
if (this.user.MEMBERSHIP_MOBILEPHONE) {
let id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`,
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`,
});
} else {
let id = item.SERVERPARTSHOP_IDS.split(",")[0];
uni.navigateTo({
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`,
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`,
});
this.isLogin = true;
}

View File

@ -29,7 +29,7 @@
backgroundImage: `url(${
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: '/static/images/discovery/defaultIcon.png'
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
})`,
}"
></view>
@ -38,7 +38,7 @@
:src="
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: '/static/images/discovery/defaultIcon.png'
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
"
/> -->
</view>
@ -94,7 +94,7 @@
<div class="distanceLeft">
<image
class="distanceIcon"
src="/static/images/home/address.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/address.png"
/>
<span class="distanceNumber"
>{{
@ -242,7 +242,7 @@
<view class="chargeIconBox">
<image
class="chargeIcon"
src="/static/images/home/sunIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
/>
</view>
<view class="chargeTitle">交控新能源</view>
@ -307,7 +307,7 @@
class="chargeIcon"
src="https://eshangtech.com/minTestImg/WLIcon.png"
/>
<image class="chargeIcon" src="/static/images/home/sunIcon.svg" />
<image class="chargeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" />
<image
class="chargeIcon"
src="https://eshangtech.com/minTestImg/stateGridIcon.png"
@ -343,7 +343,7 @@
<div class="popupDetailBox">
<div class="popupTitle">
<div class="closeIcon" @click="handleClosePopup">
<image class="img" src="/static/images/home/closeIcon.svg" />
<image class="img" src="https://eshangtech.com/wanmeiyizhanImg/home/closeIcon.svg" />
</div>
<div clsas="title">电桩详情</div>
<div class="closeIcon"></div>
@ -398,17 +398,17 @@
}"
>
<!-- item.Status === 0
? '/static/images/home/offGrid.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/offGrid.svg'
: item.Status === 1
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 2
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 3
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 4
? '/static/images/home/occupy.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/occupy.svg'
: item.Status === 255
? '/static/images/home/offGrid.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/offGrid.svg'
: '' -->
<div
@ -550,11 +550,11 @@
class="chargeIcon"
:src="
item.Power >= 240
? '/static/images/home/fast.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/fast.svg'
: item.Power <= 130 && item.Power > 60
? '/static/images/home/normal.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/normal.svg'
: item.Power < 60
? '/static/images/home/slow.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/slow.svg'
: ''
"
/>

View File

@ -32,7 +32,7 @@
backgroundImage: `url(${
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: '/static/images/discovery/defaultIcon.png'
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
})`,
}"
>
@ -43,7 +43,7 @@
:src="
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: '/static/images/discovery/defaultIcon.png'
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
"
/> -->
</view>
@ -56,7 +56,7 @@
<view class="topRight" @click.stop="handleToMap(item)">
<image
class="navigationIcon"
src="/static/images/home/map.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/map.png"
/>
</view>
</view>
@ -65,7 +65,7 @@
<div class="distanceLeft">
<image
class="distanceIcon"
src="/static/images/home/address.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/address.png"
/>
<span class="distanceNumber"
>{{ item.SERVERPART_DISTANCE || "-" }}km</span
@ -115,7 +115,7 @@
<view class="itemLeft">
<image
class="imgIcon"
src="/static/images/home/sunIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.png"
/>
<span class="chargeTypeName">交控新能源</span>
</view>
@ -203,7 +203,7 @@
<view class="chargeIconBox">
<image
class="chargeIcon"
src="/static/images/home/sunIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
/>
</view>
<view class="chargeInfo">
@ -256,7 +256,7 @@
</scroll-view>
<div class="pageBottom" :style="{ height: 60 + bottomSafeArea + 'px' }">
<div class="textBox" @click="handleScan">
<image class="codeIcon" src="/static/images/home/scanCodeIcon.svg" />
<image class="codeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/scanCodeIcon.svg" />
<span class="codeText">扫码充电</span>
</div>
</div>
@ -271,7 +271,7 @@
<div class="popupDetailBox">
<div class="popupTitle">
<div class="closeIcon" @click="handleClosePopup">
<image class="img" src="/static/images/home/closeIcon.svg" />
<image class="img" src="https://eshangtech.com/wanmeiyizhanImg/home/closeIcon.svg" />
</div>
<div clsas="title">电桩详情</div>
<div class="closeIcon"></div>
@ -326,17 +326,17 @@
}"
>
<!-- item.Status === 0
? '/static/images/home/offGrid.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/offGrid.svg'
: item.Status === 1
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 2
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 3
? '/static/images/home/idle.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/idle.svg'
: item.Status === 4
? '/static/images/home/occupy.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/occupy.svg'
: item.Status === 255
? '/static/images/home/offGrid.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/offGrid.svg'
: '' -->
<div
@ -478,11 +478,11 @@
class="chargeIcon"
:src="
item.Power >= 240
? '/static/images/home/fast.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/fast.svg'
: item.Power <= 130 && item.Power > 60
? '/static/images/home/normal.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/normal.svg'
: item.Power < 60
? '/static/images/home/slow.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/slow.svg'
: ''
"
/>

View File

@ -8,7 +8,7 @@
}}</view>
<image
class="reachIcon"
src="/static/images/home/reachIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/reachIcon.png"
@click="handleChangeStartEnd"
/>
<view class="endItem" @click="handleChangeService(endObj)">{{
@ -38,7 +38,7 @@
>
</view>
<view class="rightTop" @click="handleToMap(currentService)">
<view class="rightTop" @click="handleToMap(endObj)">
<image
class="navigationIcon"
src="https://eshangtech.com/ShopICO/discovery/navigationIcon.png"
@ -51,7 +51,7 @@
<view class="roadTop">
<image
class="stateIcon"
src="/static/images/home/trafficState1.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/trafficState1.png"
/>
<span class="stateText" :style="{ color: '#01a157' }"
>该路线全线畅通</span
@ -117,7 +117,7 @@
backgroundImage: `url(${
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: '/static/images/discovery/defaultIcon.png'
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
})`,
}"
></view>
@ -126,7 +126,7 @@
:src="
item.ImageLits && item.ImageLits.length > 0
? item.ImageLits[0]
: '/static/images/discovery/defaultIcon.png'
: 'https://eshangtech.com/wanmeiyizhanImg/discovery/defaultIcon.png'
"
/> -->
</view>
@ -148,7 +148,7 @@
<div class="distanceLeft">
<image
class="distanceIcon"
src="/static/images/home/address.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/address.png"
/>
<span class="distanceNumber"
>{{ item.SERVERPART_DISTANCEGD || "-" }}km</span
@ -191,7 +191,7 @@
<view class="itemLeft">
<image
class="imgIcon"
src="@/static/images/home/https://eshangtech.com/minTestImg/lixiangIcon.png"
src="@https://eshangtech.com/wanmeiyizhanImg/home/https://eshangtech.com/minTestImg/lixiangIcon.png"
/>
<span class="chargeTypeName">理想</span>
</view>
@ -210,7 +210,7 @@
<view class="itemLeft">
<image
class="imgIcon"
src="@/static/images/home/sunIcon.png"
src="@https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.png"
/>
<span class="chargeTypeName">交控新能源</span>
</view>
@ -315,7 +315,7 @@
<view class="chargeIconBox">
<image
class="chargeIcon"
src="/static/images/home/sunIcon.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
/>
</view>
<view class="chargeInfo">
@ -394,7 +394,10 @@
<div class="appRight">
<span class="search">查看</span>
<image class="searchIcon" src="/static/images/home/rightArrow.png" />
<image
class="searchIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
/>
</div>
</view>
@ -412,7 +415,10 @@
>
<view class="selectPointBox">
<view class="searchBox">
<image class="searchIcon" src="/static/images/home/searchIcon.png" />
<image
class="searchIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png"
/>
<input
class="inputBox"
v-model="searchPoint"
@ -434,7 +440,10 @@
>
<view class="topItem">
<view class="topLeft">
<image class="listIcon" src="/static/images/home/address.png" />
<image
class="listIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/address.png"
/>
<span class="listName">{{ item.name || "" }}</span>
</view>
<view class="rightDistance">{{
@ -530,56 +539,76 @@ export default {
//
let res = uni.getStorageSync("currentService");
//
if (res) {
//
if (res.SERVERPART_ID !== this.endObj.SERVERPART_ID) {
let res = uni.getStorageSync("currentService");
// if (res) {
// //
// if (res.SERVERPART_ID !== this.endObj.SERVERPART_ID) {
// let res = uni.getStorageSync("currentService");
this.currentService = res;
console.log("res", res);
// this.currentService = res;
// console.log("res", res);
this.seatInfo = JSON.parse(uni.getStorageSync("seatInfo"));
// this.seatInfo = JSON.parse(uni.getStorageSync("seatInfo"));
this.userObj = {
...this.userObj,
longitude: this.seatInfo.longitude,
latitude: this.seatInfo.latitude,
};
// this.userObj = {
// ...this.userObj,
// longitude: this.seatInfo.longitude,
// latitude: this.seatInfo.latitude,
// };
this.endPointObj = {
...res,
longitude: res.SERVERPART_X,
latitude: res.SERVERPART_Y,
name: res.SERVERPART_NAME,
};
console.log("seatInfo", this.seatInfo);
//
this.startObj = this.userObj;
this.endObj = this.endPointObj;
// this.endPointObj = {
// ...res,
// longitude: res.SERVERPART_X,
// latitude: res.SERVERPART_Y,
// name: res.SERVERPART_NAME,
// };
// console.log("seatInfo", this.seatInfo);
// //
// this.startObj = this.userObj;
// this.endObj = this.endPointObj;
this.handleTrafficSearch();
}
// this.handleTrafficSearch();
// }
// } else {
// if (this.loginType === "min") {
// } else if (this.loginType === "android") {
// plus.geolocation.getCurrentPosition(
// async function (position) {
// let res = position.coords;
// let seatInfo = {
// latitude: res.latitude,
// longitude: res.longitude,
// };
// uni.setStorageSync("seatInfo", JSON.stringify(seatInfo));
// uni.setStorageSync("actualLocation", JSON.stringify(seatInfo));
// _this.seat = seatInfo;
// _this.handleGetOnLoad();
// },
// function (error) {
// // handleHavePointInApp();
// console.error(":", error.message);
// }
// );
// }
// }
let seatInfo = uni.getStorageSync("seatInfo");
if (seatInfo) {
this.seatInfo = JSON.parse(seatInfo);
}
this.userObj = {
...this.userObj,
longitude: this.seatInfo.longitude,
latitude: this.seatInfo.latitude,
};
if (this.endObj.longitude && this.endObj.latitude) {
} else {
if (this.loginType === "min") {
} else if (this.loginType === "android") {
plus.geolocation.getCurrentPosition(
async function (position) {
let res = position.coords;
let seatInfo = {
latitude: res.latitude,
longitude: res.longitude,
};
uni.setStorageSync("seatInfo", JSON.stringify(seatInfo));
uni.setStorageSync("actualLocation", JSON.stringify(seatInfo));
_this.seat = seatInfo;
_this.handleGetOnLoad();
},
function (error) {
// handleHavePointInApp();
console.error("获取位置失败:", error.message);
}
);
}
this.endPointObj = {
name: "请选择目的地",
};
this.startObj = this.userObj;
this.endObj = this.endPointObj;
}
let userInfo = uni.getStorageSync("userInfo");
@ -1014,6 +1043,11 @@ export default {
// console.log("", res);
// });
// console.log("1111");
console.log("this.endObj", this.endObj);
if (!this.endObj.longitude || !this.endObj.latitude) {
return;
}
let _this = this;
@ -1250,108 +1284,108 @@ export default {
//
subItem.imgList = [
{
url: "/static/images/home/manWCIcon.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/manWCIcon.svg",
isShow: HASPANTRY > 0,
},
{
url: "/static/images/home/womanWCIcon.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/womanWCIcon.svg",
isShow: HASWIFI > 0,
},
{
url: "/static/images/home/tideToiletSeat.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/tideToiletSeat.svg",
isShow: TOILETCOUNT > 0,
},
{
url: "/static/images/home/showerRoom.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/showerRoom.svg",
isShow: HASSHOWERROOM > 0,
},
{
url: "/static/images/home/waterBoiler.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/waterBoiler.svg",
isShow: HASWATERROOM > 0,
},
{
url: "/static/images/home/microwave.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/microwave.svg",
isShow: MICROWAVEOVEN > 0,
},
{
url: "/static/images/home/washingMachine.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/washingMachine.svg",
isShow: WASHERCOUNT > 0,
},
// {
// url:"/static/images/home/washingMachine.svg",
// url:"https://eshangtech.com/wanmeiyizhanImg/home/washingMachine.svg",
// isShow: SLEEPINGPODS>0
// },
// {
// url:"/static/images/home/washingMachine.svg",
// url:"https://eshangtech.com/wanmeiyizhanImg/home/washingMachine.svg",
// isShow: HASPILOTLOUNGE>0
// },
{
url: "/static/images/home/showerRoom.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/showerRoom.svg",
isShow: SHOWERROOM > 0,
},
,
// {
// url:"/static/images/home/showerRoom.svg",
// url:"https://eshangtech.com/wanmeiyizhanImg/home/showerRoom.svg",
// isShow: HASCHILD>0
// },
{
url: "/static/images/home/carIcon.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/carIcon.svg",
isShow: SMALLPARKING > 0,
},
{
url: "/static/images/home/bus.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/bus.svg",
isShow: PACKING > 0,
},
{
url: "/static/images/home/train.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/train.svg",
isShow: TRUCKPACKING > 0,
},
{
url: "/static/images/home/chemicals.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/chemicals.svg",
isShow: DANPACKING > 0,
},
// {
// url:"/static/images/home/chemicals.svg",
// url:"https://eshangtech.com/wanmeiyizhanImg/home/chemicals.svg",
// isShow: DININGROOMCOUNT>0
// },
// {
// url:"/static/images/home/chemicals.svg",
// url:"https://eshangtech.com/wanmeiyizhanImg/home/chemicals.svg",
// isShow: HASBACKGROUNDRADIO>0
// },
// {
// url:"/static/images/home/chemicals.svg",
// url:"https://eshangtech.com/wanmeiyizhanImg/home/chemicals.svg",
// isShow: POINTCONTROLCOUNT>0
// },
{
url: "/static/images/home/toiletPaperTowels.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/toiletPaperTowels.svg",
isShow: TOILET_PAPER > 0,
},
{
url: "/static/images/home/waterDispenser.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/waterDispenser.svg",
isShow: MABROOMWATER_DISPENSER > 0,
},
{
url: "/static/images/home/nursingTable.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/nursingTable.svg",
isShow: NURSING_TABLE > 0,
},
{
url: "/static/images/home/crib.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/crib.svg",
isShow: BABY_COT > 0,
},
{
url: "/static/images/home/changingTable.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/changingTable.svg",
isShow: BABY_COT > 0,
},
{
url: "/static/images/home/waterBoiler.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/waterBoiler.svg",
isShow: DROOMWATER_DISPENSER > 0,
},
{
url: "/static/images/home/urea.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/urea.svg",
isShow: UREA_COUNT > 0,
},
{
url: "/static/images/home/watering.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/watering.svg",
isShow: VEHICLEWATERFILLING > 0,
},
];

File diff suppressed because it is too large Load Diff

View File

@ -3,13 +3,13 @@
<view class="header">
<div style="display: inline-block; margin-top: 16rpx; margin-left: 16rpx">
<view class="currentServiceBox" @click="goSelectServer">
<image class="pointIcon" src="/static/images/home/blackFixed.png" />
<image class="pointIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png" />
<span class="serviceName">{{
currentServiceMessage.SERVERPART_NAME || ""
}}</span>
<image
class="rightArrowIcon"
src="/static/images/home/rightArrowIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrowIcon.png"
/>
</view>
</div>
@ -184,7 +184,7 @@
>
<image
class="orderIcon"
src="/static/images/home/goOrderIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/goOrderIcon.png"
/>
<span class="goOrderText">去点餐</span>
</div>
@ -193,7 +193,7 @@
class="couponBox"
v-if="item.CouponList && item.CouponList.length > 0"
>
<image class="couponIcon" src="/static/images/home/useCoupon.png" />
<image class="couponIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/useCoupon.png" />
<span class="couponText">优惠券</span>
</div>
</div>
@ -431,7 +431,7 @@
<view class="labelItem" style="width: 40%">
<image
class="labelIcon"
src="/static/images/discovery/trade.png"
src="https://eshangtech.com/wanmeiyizhanImg/discovery/trade.png"
/>
<view class="labelName">{{
item.SHOPTRADE_TEXT || "品类"
@ -2269,7 +2269,7 @@ span.ico-t-count {
.icon-trade:before {
content: "";
background: url("/static/images/discovery/trade.png") no-repeat center;
background: url("https://eshangtech.com/wanmeiyizhanImg/discovery/trade.png") no-repeat center;
background-size: contain;
width: 27rpx;
height: 24rpx;

View File

@ -2,9 +2,9 @@
<div class="main">
<!-- <div class="pageTop">
<div class="first" @click="goSelectServer">
<image class="addressIcon" src="/static/images/home/blackFixed.png" />
<image class="addressIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/blackFixed.png" />
<div class="text">{{ serverPart.SERVERPART_NAME || "" }}</div>
<image class="moreIcon" src="/static/images/home/rightArrow.png" />
<image class="moreIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png" />
</div>
<div class="second">
距您{{ serverPart.SERVERPART_DISTANCE || "-" }}km
@ -94,7 +94,7 @@
>
<image
class="orderIcon"
src="/static/images/home/goOrderIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/goOrderIcon.png"
/>
<span class="goOrderText">去点餐</span>
</div>
@ -159,7 +159,7 @@
>
<image
class="orderIcon"
src="/static/images/home/goOrderIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/goOrderIcon.png"
/>
<span class="goOrderText">去点餐</span>
</div>
@ -178,7 +178,7 @@
>
<image
class="couponIcon"
src="/static/images/home/useCoupon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/useCoupon.png"
/>
<span class="couponText">优惠券</span>
</div>

View File

@ -142,7 +142,10 @@
@click="handleAgainPosition"
v-if="hideAgainIcon"
>
<image class="icon" src="/static/images/home/repositioning.svg" />
<image
class="icon"
src="https://eshangtech.com/wanmeiyizhanImg/home/repositioning.svg"
/>
</view>
</div>
<div class="sellement-apponit-unit" v-if="active === 1">
@ -339,7 +342,7 @@
<div class="logoBox">
<image
class="logoIcon"
src="/static/images/home/alipayIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/alipayIcon.png"
/>
</div>
<text>支付宝支付</text>
@ -357,7 +360,10 @@
>
<div class="radioLeft">
<div class="logoBox">
<image class="logoIcon" src="/static/images/home/wxPay.png" />
<image
class="logoIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/wxPay.png"
/>
</div>
<text>微信支付</text>
</div>
@ -1384,22 +1390,22 @@ bodyColor = #CAA97F;
}
.yy-img {
background: url('/static/images/yy.png') no-repeat;
background: url('https://eshangtech.com/wanmeiyizhanImg/yy.png') no-repeat;
background-size: contain;
}
.yy-img-active {
background: url('/static/images/yy-a.png') no-repeat;
background: url('https://eshangtech.com/wanmeiyizhanImg/yy-a.png') no-repeat;
background-size: contain;
}
.ts-img {
background: url('/static/images/md.png') no-repeat;
background: url('https://eshangtech.com/wanmeiyizhanImg/md.png') no-repeat;
background-size: contain;
}
.ts-img-active {
background: url('/static/images/md-a.png') no-repeat;
background: url('https://eshangtech.com/wanmeiyizhanImg/md-a.png') no-repeat;
background-size: contain;
}
}
@ -1772,7 +1778,7 @@ bodyColor = #CAA97F;
}
.icon-coupon {
background: url('/static/images/settlement-coupon.png') no-repeat center;
background: url('https://eshangtech.com/wanmeiyizhanImg/settlement-coupon.png') no-repeat center;
background-size: contain;
width: 33rpx;
height: 55rpx;

View File

@ -127,7 +127,7 @@
<span class="price">{{ good.COMMODITY_CURRPRICE }}</span>
</view>
<!-- 右边的加减器 -->
<view class="rightPrice">
<view class="rightPrice" v-if="buyType === 1">
<image
v-show="
shoppingCart[
@ -145,7 +145,7 @@
'_' +
good.USERDEFINEDTYPE_ID
"
src="/static/images/home/reduce.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/reduce.png"
/>
<text class="acount" v-if="good.id">{{
@ -165,7 +165,7 @@
good.USERDEFINEDTYPE_ID
"
class="icon"
src="/static/images/home/add.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/add.png"
/>
</view>
</view>
@ -247,7 +247,7 @@
<view class="logo-wrapper">
<img
class="shopCarIcon"
src="/static/images/home/shopCarIconActive.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/shopCarIconActive.svg"
/>
<view class="num" v-if="totalNum">{{ totalNum }}</view>
</view>
@ -391,7 +391,7 @@
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/MERCHANTSDESC.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/MERCHANTSDESC.png"
/>
</div>
@ -407,7 +407,7 @@
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/onlineTime.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/onlineTime.png"
/>
</div>
@ -423,7 +423,7 @@
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/detailPhone.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/detailPhone.png"
/>
</div>
@ -439,7 +439,7 @@
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/addressIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/addressIcon.png"
/>
</div>
@ -670,6 +670,7 @@ export default {
],
storeMsg: {},
loginType: "", // min app
buyType: "", // 1
};
},
computed: {
@ -1195,6 +1196,9 @@ export default {
console.log("type", type);
this.loginType = type;
console.log("optionsshop", options);
if (options.buyType) {
this.buyType = Number(options.buyType);
}
this.stroreId = options.id;
// this.merchatsMsg.MERCHANTS_ID = options.mid
this.getShop(options.mid, options.type || 0); //
@ -1321,7 +1325,7 @@ export default {
.couponItem {
width: 686rpx;
height: 168rpx;
background-image: url("/static/images/home/validCoupons.png");
background-image: url("https://eshangtech.com/wanmeiyizhanImg/home/validCoupons.png");
background-size: 100% 100%;
box-sizing: border-box;
padding: 24rpx 0;
@ -1665,7 +1669,8 @@ export default {
i {
width: 44rpx;
height: 42rpx;
background: url("/static/images/rate.png") no-repeat center;
background: url("https://eshangtech.com/wanmeiyizhanImg/rate.png") no-repeat
center;
background-size: contain;
margin-right: 16rpx;
}
@ -1699,7 +1704,7 @@ export default {
}
// .hot-ico {
// background: url('../../../../static/images/shop/hot.png') no-repeat;
// background: url('../../../..https://eshangtech.com/wanmeiyizhanImg/shop/hot.png') no-repeat;
// width: 36rpx;
// height: 36rpx;
// background-size: contain;
@ -1708,7 +1713,7 @@ export default {
// }
// .recommend-ico {
// background: url('../../../../static/images/shop/recommend.png') no-repeat;
// background: url('../../../..https://eshangtech.com/wanmeiyizhanImg/shop/recommend.png') no-repeat;
// width: 36rpx;
// height: 36rpx;
// background-size: contain;

View File

@ -344,7 +344,7 @@ hr
}
.title-ico
background url(/static/images/shoplist/kyy.png) no-repeat
background url(https://eshangtech.com/wanmeiyizhanImg/shoplist/kyy.png) no-repeat
width 80rpx
height 34rpx
background-size contain
@ -368,7 +368,7 @@ hr
align-items center
.icon-trade:before
content ''
background url(/static/images/trade.png) no-repeat center
background url(https://eshangtech.com/wanmeiyizhanImg/trade.png) no-repeat center
background-size contain
width 27rpx
height 24rpx

View File

@ -238,7 +238,7 @@
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/MERCHANTSDESC.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/MERCHANTSDESC.png"
/>
</div>
@ -254,7 +254,7 @@
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/onlineTime.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/onlineTime.png"
/>
</div>
@ -270,7 +270,7 @@
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/detailPhone.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/detailPhone.png"
/>
</div>
@ -286,7 +286,7 @@
<div class="imgBox">
<image
class="storeIcon"
src="/static/images/home/addressIcon.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/addressIcon.png"
/>
</div>
@ -912,7 +912,7 @@ color999 = #999;
width: calc(100% - 64rpx);
margin-left: 32rpx;
height: 144rpx;
background: url('/static/images/home/validCoupons.png') no-repeat center;
background: url('https://eshangtech.com/wanmeiyizhanImg/home/validCoupons.png') no-repeat center;
background-size: contain;
box-sizing: border-box;
padding: 32rpx 0;
@ -1144,7 +1144,7 @@ color999 = #999;
// i
// width 44rpx
// height 42rpx
// background url(../../../static/images/rate.png) no-repeat center
// background url(../../..https://eshangtech.com/wanmeiyizhanImg/rate.png) no-repeat center
// background-size contain
// margin-right 16rpx
.rate-box {
@ -1180,7 +1180,7 @@ color999 = #999;
i {
width: 44rpx;
height: 42rpx;
background: url('/static/images/rate.png') no-repeat center;
background: url('https://eshangtech.com/wanmeiyizhanImg/rate.png') no-repeat center;
background-size: contain;
margin-right: 16rpx;
}

View File

@ -28,18 +28,25 @@
class="userType"
:src="
user.MEMBERSHIP_LEVEL === 1000
? '/static/images/home/normalUser.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/normalUser.svg'
: user.MEMBERSHIP_LEVEL === 2000
? '/static/images/home/silverCard.svg'
? 'https://eshangtech.com/wanmeiyizhanImg/home/silverCard.svg'
: ''
"
/>
</view>
<view class="userBottom">
{{ phone || "-" }}
</view>
</view>
</view>
<view class="userInfoRight" @click="handleSign">
<image class="sginIcon" src="/static/images/home/signInIcon.png" />
<image
class="sginIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/signInIcon.png"
/>
<span class="sginText">{{
toDayHaveSign ? "今日已签到" : "签到"
}}</span>
@ -48,25 +55,54 @@
<view class="balanceBox">
<view class="balanceTop">
<view class="leftTop">
<!-- <view class="leftTop">
<view class="balanceValue">0.00</view>
<view class="balanceUnit">余额</view>
</view> -->
<view class="leftTopNew">
<view
class="bottomItem"
@click="isGo('/pages/homeFn/myCoupon/index')"
>
<view class="itemContent">
<view class="bottomValue">{{ user.COUPON_COUNT || 0 }}</view>
<view class="bottomUnit">优惠券</view>
</view>
</view>
<view
class="bottomItem"
@click="isGo('/pages/homeFn/integral/index')"
>
<view class="itemContent">
<view class="bottomValue">{{
user.MEMBERSHIP_POINT || 0
}}</view>
<view class="bottomUnit">积分</view>
</view>
</view>
</view>
<view class="rightTop" @click="handleGoUserCode">
<image
class="codeIcon"
src="/static/images/home/userInfoCode.svg"
src="https://eshangtech.com/wanmeiyizhanImg/home/userInfoCode.svg"
/>
</view>
</view>
<view class="balanceBottom">
<view class="bottomItem">
<view class="balanceBottom" v-if="false">
<view
class="bottomItem"
@click="isGo('/pages/homeFn/myCoupon/index')"
>
<view class="bottomValue">{{ user.COUPON_COUNT || 0 }}</view>
<view class="bottomUnit">优惠券</view>
</view>
<view class="bottomItem">
<view
class="bottomItem"
@click="isGo('/pages/homeFn/integral/index')"
>
<view class="bottomValue">{{ user.MEMBERSHIP_POINT || 0 }}</view>
<view class="bottomUnit">积分</view>
</view>
@ -141,7 +177,7 @@
>
<image
style="width: 40%; height: 40%"
src="/static/images/home/defaultUser.png"
src="https://eshangtech.com/wanmeiyizhanImg/home/defaultUser.png"
/>
</div> -->
<button
@ -164,7 +200,10 @@
</div>
<div class="codeBox" @click="isGo('/pages/homeFn/payfor/index')">
<image class="codeImg" src="/static/images/home/codeIcon.png" />
<image
class="codeImg"
src="https://eshangtech.com/wanmeiyizhanImg/home/codeIcon.png"
/>
<span class="codeText">会员码</span>
</div>
</div>
@ -196,40 +235,61 @@
<div class="funListBox">
<div class="funItem" @click="isGo('/pages/orders/order/index')">
<image class="funIcon" src="/static/images/home/foodIcon.svg" />
<image
class="funIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/foodIcon.svg"
/>
<div class="funName">我的点餐</div>
</div>
<div class="funItem" @click="isGo('/pages/homeFn/myCoupon/index')">
<image class="funIcon" src="/static/images/home/couponLogo.png" />
<image
class="funIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/couponLogo.png"
/>
<div class="funName">优惠券</div>
</div>
<div class="funItem" @click="isGo('/pages/homeFn/mycar/index')">
<image class="funIcon" src="/static/images/home/carLogo.png" />
<image
class="funIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/carLogo.png"
/>
<div class="funName">绑定车辆</div>
</div>
<div class="funItem" @click="isGo('/pages/myAddress/address/index')">
<image class="funIcon" src="/static/images/home/addressUser.png" />
<image
class="funIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/addressUser.png"
/>
<div class="funName">我的地址</div>
</div>
<div class="funItem" @click="isGo('/pages/community/myPost')">
<image class="funIcon" src="/static/images/home/post.png" />
<image
class="funIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/post.png"
/>
<div class="funName">我的发帖</div>
</div>
<div class="funItem" @click="isGo('/pages/contact/index')">
<image class="funIcon" src="/static/images/home/lostAndfound.png" />
<image
class="funIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/lostAndfound.png"
/>
<div class="funName">失物招领</div>
</div>
<!-- <div class="funItem" @click="isGo('/pages/noDataPage/index')">
<image class="funIcon" src="/static/images/home/customerService.svg" />
<image class="funIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/customerService.svg" />
<div class="funName">客户服务</div>
</div> -->
<div class="funItem" @click="handleCallPhone">
<image class="funIcon" src="/static/images/home/serviceHotline.svg" />
<image
class="funIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/serviceHotline.svg"
/>
<div class="funName">服务热线</div>
</div>
<!-- <div
@ -237,11 +297,14 @@
v-if="loginType && loginType !== 'min'"
@click="handleLoginoOut"
>
<image class="funIcon" src="/static/images/home/closeLogin.png" />
<image class="funIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/closeLogin.png" />
<div class="funName">退出登录</div>
</div> -->
<div class="funItem">
<image class="funIcon" src="/static/images/home/iLike.svg" />
<image
class="funIcon"
src="https://eshangtech.com/wanmeiyizhanImg/home/iLike.svg"
/>
<div class="funName gray">我的关注</div>
</div>
</div>
@ -360,57 +423,61 @@ export default {
{
label: "待付款",
value: 1,
url: "/static/images/home/obligation.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/obligation.svg",
},
{
label: "待收货",
value: 2,
url: "/static/images/home/receiptOfGoods.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/receiptOfGoods.svg",
},
{
label: "待评价",
value: 3,
url: "https://eshangtech.com/wanmeiyizhanImg/home/evaluated.svg",
},
{ label: "待评价", value: 3, url: "/static/images/home/evaluated.svg" },
{
label: "售后/退货",
value: 4,
url: "/static/images/home/afterSales.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/afterSales.svg",
},
],
oftenList: [
{
label: "绑定车辆",
value: 1,
url: "/static/images/home/bindCarIcon.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/bindCarIcon.svg",
},
{
label: "失物招领",
value: 2,
url: "/static/images/home/lostFoundIcon.svg",
},
{
label: "我的发帖",
value: 3,
url: "/static/images/home/userMessage.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/lostFoundIcon.svg",
},
// {
// label: "",
// value: 3,
// url: "https://eshangtech.com/wanmeiyizhanImg/home/userMessage.svg",
// },
],
otherList: [
{
label: "我的地址",
value: 1,
url: "/static/images/home/addressManager.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/addressManager.svg",
},
{
label: "客户服务",
value: 2,
url: "/static/images/home/customerServiceIcon.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/customerServiceIcon.svg",
},
{
label: "服务热线",
value: 3,
url: "/static/images/home/hostPhone.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/hostPhone.svg",
},
{
label: "账户设置",
value: 4,
url: "/static/images/home/userConfig.svg",
url: "https://eshangtech.com/wanmeiyizhanImg/home/userConfig.svg",
},
],
toDayHaveSign: false, //
@ -441,7 +508,11 @@ export default {
},
onShow() {
let signTime = uni.getStorageSync("signTime");
signTime = new Date(signTime).getTime();
if (signTime) {
signTime = new Date(signTime).getTime();
} else {
signTime = 0;
}
let now = new Date().getTime();
console.log("signTime", signTime);
console.log("now", now);
@ -501,6 +572,7 @@ export default {
title: "今日已签到!",
icon: "none",
});
uni.setStorageSync("signTime", nowDay);
} else {
uni.showModal({
content: res.ResultDesc,
@ -525,16 +597,21 @@ export default {
//
handleGoOrder(obj) {
console.log("obj", obj);
let type = "";
if (obj.value === 1) {
//
type = 2;
} else if (obj.value === 2) {
//
type = 4;
} else if (obj.value === 3) {
//
type = 5;
} else if (obj.value === 4) {
//
type = 5;
}
uni.navigateTo({ url: `/pages/orders/order/index` });
uni.navigateTo({ url: `/pages/orders/order/index?type=${type}` });
},
//
handleOften(obj) {
@ -898,6 +975,11 @@ export default {
}
}
.userInfoBox {
display: flex;
flex-direction: column;
justify-content: space-between;
box-sizing: border-box;
padding: 10rpx 0;
.userTop {
display: flex;
align-items: center;
@ -916,6 +998,15 @@ export default {
margin-left: 8rpx;
}
}
.userBottom {
font-family: "PingFangSC";
font-weight: 400;
font-size: 28rpx;
color: #716f69;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
}
}
.userInfoRight {
@ -962,10 +1053,10 @@ export default {
.leftTop {
.balanceValue {
font-family: "DINAlternate";
font-weight: bold;
font-size: 48rpx;
font-weight: 400;
font-size: 40rpx;
color: #ecdfbf;
line-height: 56rpx;
line-height: 50rpx;
text-align: left;
font-style: normal;
}
@ -979,6 +1070,47 @@ export default {
font-style: normal;
}
}
.leftTopNew {
width: calc(100% - 64rpx);
display: flex;
align-items: center;
.bottomItem {
width: 50%;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
.itemContent {
width: 100rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.bottomValue {
font-family: "DINAlternate";
font-weight: 400;
font-size: 36rpx;
color: #ecdfbf;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
.bottomUnit {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #bdb08f;
line-height: 36rpx;
text-align: left;
font-style: normal;
margin-top: 4rpx;
}
}
}
}
.rightTop {
width: 64rpx;
height: 64rpx;
@ -1007,10 +1139,10 @@ export default {
justify-content: center;
.bottomValue {
font-family: "DINAlternate";
font-weight: bold;
font-size: 40rpx;
font-weight: 400;
font-size: 36rpx;
color: #130f05;
line-height: 48rpx;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
@ -1078,7 +1210,7 @@ export default {
display: flex;
align-items: center;
.oftenItem {
width: calc(100% / 3);
width: calc(100% / 4);
display: flex;
flex-direction: column;
align-items: center;

View File

@ -7,21 +7,21 @@
<text class="phoneText">{{
phone || "-"
}}</text>
<image class="rightImg" src="/static/images/home/rightArrow.svg" />
<image class="rightImg" src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.svg" />
</view>
</view>
<view class="configItem" v-if="loginType !== 'min'">
<view class="itemLabel">切换账号</view>
<view class="itemRight">
<image class="rightImg" src="/static/images/home/rightArrow.svg" />
<image class="rightImg" src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.svg" />
</view>
</view>
<view class="configItem" v-if="loginType !== 'min'">
<view class="itemLabel">隐私管理</view>
<view class="itemRight">
<image class="rightImg" src="/static/images/home/rightArrow.svg" />
<image class="rightImg" src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.svg" />
</view>
</view>
</view>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 764 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 772 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 764 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 895 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 554 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 882 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 931 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 801 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 945 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 949 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 521 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 878 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 792 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 851 B

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>服务区/地址备份_2@2x</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.699999988">
<g id="服务区信息" transform="translate(-124.000000, -2015.000000)">
<g id="image-fill" transform="translate(124.000000, 2015.000000)">
<polygon id="路径" points="0 0 16 0 16 16 0 16"></polygon>
<path d="M13.3333333,3.33333333 L2.66666667,3.33333333 L2.66666667,12.6666667 L8.86133333,6.47066667 C9.12166657,6.21041204 9.54366677,6.21041204 9.804,6.47066667 L13.3333333,10.0066667 L13.3333333,3.33333333 Z M1.33333333,2.662 C1.33587188,2.2977037 1.63037311,2.0029056 1.99466667,2 L14.0053333,2 C14.3706667,2 14.6666667,2.29666667 14.6666667,2.662 L14.6666667,13.338 C14.6641281,13.7022963 14.3696269,13.9970944 14.0053333,14 L1.99466667,14 C1.62931454,13.9996321 1.33333333,13.7033523 1.33333333,13.338 L1.33333333,2.662 Z M5.33333333,7.33333333 C4.59695367,7.33333333 4,6.73637967 4,6 C4,5.26362033 4.59695367,4.66666667 5.33333333,4.66666667 C6.069713,4.66666667 6.66666667,5.26362033 6.66666667,6 C6.66666667,6.73637967 6.069713,7.33333333 5.33333333,7.33333333 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 954 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 902 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 B

Some files were not shown because too many files have changed in this diff Show More