update
This commit is contained in:
ylj20011123
parent
5debd249dd
commit
aa11dce29f
@ -386,18 +386,18 @@ subItem, subIndex
|
||||
|
||||
<view class="centerConfigItemNew" v-for="(subItem, index) in item.imgList.slice(
|
||||
0,
|
||||
item.noMore ? 5 : 12
|
||||
item.noMore ? 12 : 12
|
||||
)" :key="index">
|
||||
<image class="configImg" :src="subItem.url" />
|
||||
<text class="configText">{{ subItem.title || "" }}</text>
|
||||
<!-- <text class="configText">{{ subItem.title || "" }}</text> -->
|
||||
</view>
|
||||
|
||||
<view class="centerConfigItemNew" @click.stop="handleGetMore(item)">
|
||||
<!-- <view class="centerConfigItemNew" @click.stop="handleGetMore(item)">
|
||||
<image class="configImg" src="https://eshangtech.com/minTestImg/chargeImgNew/getMore.svg" />
|
||||
<text class="configText">{{
|
||||
item.noMore ? "更多" : "收起"
|
||||
}}</text>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
<view v-if="styleType === 1" class="bottomItem" @click.stop="handleOpenDetail(item)">
|
||||
@ -838,6 +838,14 @@ export default {
|
||||
},
|
||||
// #endif
|
||||
methods: {
|
||||
// 加油的数据
|
||||
async handleGetOilData(idList) {
|
||||
const data = await this.$api.$javaGet2("/oil-price/getListByServerPartIds", {
|
||||
serverpartIds: idList.toString(),
|
||||
});
|
||||
let oilData = data.Result_Data.List
|
||||
return oilData
|
||||
},
|
||||
preventTouchMove(e) {
|
||||
return false; // 阻止默认行为，避免滚动穿透
|
||||
},
|
||||
@ -984,13 +992,26 @@ export default {
|
||||
uni.setStorageSync("serviceList", JSON.stringify(serviceList));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
let serverpart = {};
|
||||
let idList = []
|
||||
console.log('serviceListserviceListserviceListserviceListserviceListserviceList', serviceList);
|
||||
|
||||
if (serviceList && serviceList.length > 0) {
|
||||
serviceList.forEach((item) => {
|
||||
serverpart[item.SERVERPART_NAME] = item.SERVERPART_ID;
|
||||
idList.push(item.SERVERPART_ID)
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
let oilData = await this.handleGetOilData(idList)
|
||||
// let oilData = []
|
||||
|
||||
|
||||
|
||||
let _this = this;
|
||||
console.log('_this.serviceAreaList_this.serviceAreaList_this.serviceAreaList', _this.serviceAreaList);
|
||||
|
||||
@ -1674,7 +1695,43 @@ export default {
|
||||
this.$emit("allChargeData", { res: newRes });
|
||||
}
|
||||
|
||||
|
||||
console.log('newResnewResnewResnewResnewResnewResnewRes', newRes);
|
||||
|
||||
|
||||
// 通过对接的四个品牌数据 来点亮是否有充电桩的图标 2025-05-14
|
||||
if (newRes && newRes.length > 0) {
|
||||
newRes.forEach((item) => {
|
||||
if (item.imgList && item.imgList.length > 0) {
|
||||
let haveOil = false
|
||||
let oilList = oilData.filter((filterItem => item.SERVERPART_ID === filterItem.serverpartId))
|
||||
if (oilList && oilList.length > 0) {
|
||||
haveOil = true
|
||||
}
|
||||
|
||||
|
||||
item.imgList.forEach((subItem) => {
|
||||
if (subItem.title === '充电桩') {
|
||||
let isHave = false
|
||||
if (newRes[0].GWDetail.GWSum > 0 || newRes[0].JKDetail.JKSum > 0 || newRes[0].LXDetail.LXSum > 0 || newRes[0].WLDetail.WLSum > 0) {
|
||||
isHave = true
|
||||
}
|
||||
subItem.url = isHave ? "https://eshangtech.com/minTestImg/chargeImgNew/chargingStation.svg"
|
||||
: "https://eshangtech.com/minTestImg/chargeImgNew/nochargingStation.svg"
|
||||
} else if (subItem.title === '加油站' && haveOil) {
|
||||
subItem.url = haveOil ? "https://eshangtech.com/minTestImg/REFUELINGGUN.svg"
|
||||
: "https://eshangtech.com/minTestImg/noREFUELINGGUN.svg"
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
this.detailObj.servicePart = newRes;
|
||||
|
||||
|
||||
// uni.hideLoading();
|
||||
this.isLoading = false;
|
||||
},
|
||||
@ -2652,7 +2709,8 @@ export default {
|
||||
}
|
||||
|
||||
if (this.comeForm === "home") {
|
||||
uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
|
||||
// uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
|
||||
uni.navigateTo({ url: "/pages/serviceDetail/index" });
|
||||
} else {
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
@ -3189,7 +3247,7 @@ export default {
|
||||
}
|
||||
|
||||
.centerConfigItemNew {
|
||||
width: calc(100% / 6);
|
||||
width: calc(100% / 11);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
"name" : "驿佳",
|
||||
"appid" : "__UNI__F870657",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.13",
|
||||
"versionCode" : 1013,
|
||||
"versionName" : "1.0.14",
|
||||
"versionCode" : 1014,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
||||
@ -40,12 +40,14 @@
|
||||
<view class="newContent">
|
||||
<view class="topBanner">
|
||||
<!-- <image class="bannerImg" src="https://eshangtech.com/wanmeiyizhanImg/home/wanmeiyizhanNewIndex.png" /> -->
|
||||
<image class="bannerImg" src="https://eshangtech.com/wanmeiyizhanImg/home/wmyzIndexBg.png" />
|
||||
|
||||
<image class="bannerImg" src="https://eshangtech.com/wanmeiyizhanImg/home/wmyzIndexBg.jpg" />
|
||||
|
||||
</view>
|
||||
|
||||
<view style="box-sizing: border-box; padding: 0 32rpx">
|
||||
<view :style="{ marginTop: 638 + 'rpx', boxSizing: 'border-box', padding: '0 32rpx 64rpx' }">
|
||||
<!-- transform: translateY(-90rpx); -->
|
||||
<!-- :style="{ marginTop: menu.bottom + 8 + 'px' }" -->
|
||||
<!-- style="box-sizing: border-box; padding: 0 32rpx;" -->
|
||||
<view class="funBox">
|
||||
<view class="funItem" v-for="(item, index) in funList" :key="index"
|
||||
:style="{ marginBottom: index <= 3 ? '32rpx' : '' }" @click="handleGoFun(item)">
|
||||
@ -67,8 +69,9 @@
|
||||
</scroll-view>
|
||||
|
||||
<view v-if="chaegeBoxList && chaegeBoxList.length > 0" style="background-color: #fff; margin-top: 24rpx">
|
||||
<ChargeBox :showType="'horizontal'" :serviceAreaList="chaegeBoxList" pageType="scanCode" :showStore="true"
|
||||
:comeForm="'home'" :showPadding="true" />
|
||||
<ChargeBox :serviceAreaList="chaegeBoxList" pageType="scanCode" :comeForm="'home'" :showPadding="true" />
|
||||
<!-- :showType="'horizontal'" -->
|
||||
<!-- :showStore="true" -->
|
||||
</view>
|
||||
|
||||
<view class="carouselBox" @click="handleGoDiscovery" v-if="showBanner">
|
||||
@ -84,8 +87,8 @@
|
||||
<view class="foodBox">
|
||||
<view class="foodTop">
|
||||
<view class="topLeft">
|
||||
<!-- <image class="foodTopIcon" /> -->
|
||||
<span class="stationFood">驿站美食</span>
|
||||
<image class="foodTopIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/yzFoodTitle.png" />
|
||||
<!-- <span class="stationFood">驿站美食</span> -->
|
||||
<span class="foodDesc">提前点餐 无需排队</span>
|
||||
</view>
|
||||
<view class="topRight" @click="handleGoFoodOrder">
|
||||
@ -130,11 +133,11 @@
|
||||
</view>
|
||||
|
||||
<!-- 皖美特产 -->
|
||||
<view class="productBox">
|
||||
<view class="productBox" v-if="false">
|
||||
<view class="foodTop">
|
||||
<view class="topLeft">
|
||||
<!-- <image class="foodTopIcon" /> -->
|
||||
<span class="stationFood">皖美农品</span>
|
||||
<image class="foodTopIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/tcTitle.png" />
|
||||
<!-- <span class="stationFood">皖美农品</span> -->
|
||||
<span class="foodDesc">本地特产 特色农品</span>
|
||||
</view>
|
||||
<view class="topRight" @click="handleGoFoodOrder">
|
||||
@ -239,7 +242,7 @@
|
||||
|
||||
<div class="useBtn">
|
||||
<span class="useBtnText" v-if="!item.takeState" @click="handleDistributeCoupons(item)">去兑换</span>
|
||||
<span class="useBtnText" @click="handleGoCouponsList" v-else-if="item.takeState">查看</span>
|
||||
<span class="useBtnText" @click="handleGoCouponsList(item)" v-else-if="item.takeState">查看</span>
|
||||
<!-- <span class="useBtnText" v-else>{{
|
||||
item.CouponStateText
|
||||
}}</span> -->
|
||||
@ -374,7 +377,7 @@ export default {
|
||||
this.isLoading = false;
|
||||
},
|
||||
onHide() {
|
||||
this.showBanner = true;
|
||||
this.showBanner = false;
|
||||
},
|
||||
// 下拉刷新
|
||||
async onPullDownRefresh() {
|
||||
@ -560,11 +563,32 @@ export default {
|
||||
},
|
||||
// 拿当前距离最近的服务区 去发放优惠券
|
||||
async handleDistributeCoupons(obj) {
|
||||
if (!this.user && !this.user.MEMBERSHIP_ID) {
|
||||
let _this = this;
|
||||
uni.showModal({
|
||||
title: "温馨提示",
|
||||
content: "请您授权登录后再操作。",
|
||||
success(res) {
|
||||
if (res.confirm) {
|
||||
if (_this.loginType === "min") {
|
||||
uni.navigateTo({ url: "/pages/register/index" });
|
||||
} else {
|
||||
uni.navigateTo({ url: "/pages/login/index" });
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
console.log('objobj', obj);
|
||||
console.log('this.chaegeBoxList[0]this.chaegeBoxList[0]', this.chaegeBoxList[0]);
|
||||
|
||||
|
||||
let nearThreeList = uni.getStorageSync("nearThreeList");
|
||||
const req = {
|
||||
serverpartName: this.chaegeBoxList[0],
|
||||
serverpartName: nearThreeList[0],
|
||||
couponId: obj.CouponId
|
||||
}
|
||||
const data = await this.$api.$javaGet2("/third-party/sendCoupon", req);
|
||||
@ -576,13 +600,24 @@ export default {
|
||||
icon: "none",
|
||||
duration: 5000
|
||||
})
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: data.Result_Data,
|
||||
icon: "none",
|
||||
})
|
||||
|
||||
}
|
||||
},
|
||||
// 跳转卡包
|
||||
handleGoCouponsList() {
|
||||
handleGoCouponsList(obj) {
|
||||
console.log('objobj', obj);
|
||||
uni.navigateTo({
|
||||
url: '/pages/homeFn/myCoupon/index'
|
||||
})
|
||||
url: `/pages/homeFn/payfor/index?cid=${obj.CouponId}`,
|
||||
});
|
||||
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/homeFn/myCoupon/index'
|
||||
// })
|
||||
},
|
||||
// 拿到当前服务区的点餐数据
|
||||
async handleGetCurrentService() {
|
||||
@ -773,9 +808,9 @@ export default {
|
||||
left: 0;
|
||||
z-index: 3;
|
||||
// background-image: url("https://eshangtech.com/wanmeiyizhanImg/home/wanmeiyizhanNewIndex.png");
|
||||
background-image: url("https://eshangtech.com/wanmeiyizhanImg/home/wmyzIndexBg.png");
|
||||
background-image: url("https://eshangtech.com/wanmeiyizhanImg/home/wmyzIndexBg.jpg");
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 400rpx;
|
||||
background-size: 100% 728rpx;
|
||||
|
||||
.topContent {
|
||||
width: 100%;
|
||||
@ -857,9 +892,9 @@ export default {
|
||||
left: 0;
|
||||
z-index: 3;
|
||||
// background-image: url("https://eshangtech.com/wanmeiyizhanImg/home/wanmeiyizhanNewIndex.png");
|
||||
background-image: url("https://eshangtech.com/wanmeiyizhanImg/home/wmyzIndexBg.png");
|
||||
background-image: url("https://eshangtech.com/wanmeiyizhanImg/home/wmyzIndexBg.jpg");
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 400rpx;
|
||||
background-size: 100% 728rpx;
|
||||
|
||||
.topContent {
|
||||
width: 100%;
|
||||
@ -938,19 +973,21 @@ export default {
|
||||
box-sizing: border-box;
|
||||
// padding: 0 32rpx 180rpx;
|
||||
padding: 0 0 140rpx;
|
||||
// position: absolute;
|
||||
position: absolute;
|
||||
background-color: #f5f6f8;
|
||||
// z-index: 2;
|
||||
// top: 0;
|
||||
// left: 0;
|
||||
z-index: 2;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
||||
.topBanner {
|
||||
width: 100%;
|
||||
height: 400rpx;
|
||||
// position: absolute;
|
||||
// z-index: 1;
|
||||
// top: 0;
|
||||
// left: 0;
|
||||
height: 728rpx;
|
||||
|
||||
// height: 400rpx;
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
||||
.bannerImg {
|
||||
width: 100%;
|
||||
@ -969,8 +1006,8 @@ export default {
|
||||
// margin-top: 360rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
// position: relative;
|
||||
// z-index: 2;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
|
||||
.funItem {
|
||||
width: 25%;
|
||||
@ -1007,6 +1044,7 @@ export default {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
flex-wrap: nowrap;
|
||||
|
||||
.tabItem {
|
||||
@ -1019,7 +1057,7 @@ export default {
|
||||
|
||||
.title {
|
||||
font-family: "PingFang SC";
|
||||
font-weight: bold;
|
||||
font-weight: 600;
|
||||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
line-height: 40rpx;
|
||||
@ -1042,7 +1080,7 @@ export default {
|
||||
|
||||
.selectTitle {
|
||||
font-family: "PingFang SC";
|
||||
font-weight: bold;
|
||||
font-weight: 600;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
line-height: 45rpx;
|
||||
@ -1100,7 +1138,8 @@ export default {
|
||||
box-shadow: 0rpx 8rpx 12rpx 1rpx rgba(176, 223, 238, 0.07),
|
||||
inset 0rpx 3rpx 6rpx 1rpx #ffffff;
|
||||
box-sizing: border-box;
|
||||
padding: 16rpx 16rpx 8rpx;
|
||||
padding: 4rpx;
|
||||
// padding: 16rpx 16rpx 8rpx;
|
||||
|
||||
.topLeft {
|
||||
display: flex;
|
||||
@ -1116,7 +1155,7 @@ export default {
|
||||
font-weight: 600;
|
||||
font-size: 30rpx;
|
||||
color: #000;
|
||||
margin-left: 16rpx;
|
||||
// margin-left: 16rpx;
|
||||
}
|
||||
|
||||
.foodDesc {
|
||||
@ -1159,6 +1198,8 @@ export default {
|
||||
|
||||
.foodContent {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 0 16rpx;
|
||||
|
||||
.foodList {
|
||||
width: 100%;
|
||||
@ -1285,6 +1326,7 @@ export default {
|
||||
}
|
||||
|
||||
.foodItemNew {
|
||||
width: 270rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 16rpx 26rpx;
|
||||
box-shadow: 0rpx 0rpx 5rpx 0rpx rgba(0, 0, 0, 0.1);
|
||||
@ -1391,7 +1433,8 @@ export default {
|
||||
box-shadow: 0rpx 8rpx 12rpx 1rpx rgba(176, 223, 238, 0.07),
|
||||
inset 0rpx 3rpx 6rpx 1rpx #ffffff;
|
||||
box-sizing: border-box;
|
||||
padding: 16rpx 16rpx 8rpx;
|
||||
padding: 4rpx;
|
||||
// padding: 16rpx 16rpx 8rpx;
|
||||
|
||||
.topLeft {
|
||||
display: flex;
|
||||
@ -1407,7 +1450,7 @@ export default {
|
||||
font-weight: 600;
|
||||
font-size: 30rpx;
|
||||
color: #000;
|
||||
margin-left: 16rpx;
|
||||
// margin-left: 16rpx;
|
||||
}
|
||||
|
||||
.foodDesc {
|
||||
@ -1557,6 +1600,7 @@ export default {
|
||||
}
|
||||
|
||||
.foodItemNew {
|
||||
width: 270rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 16rpx 26rpx;
|
||||
box-shadow: 0rpx 0rpx 5rpx 0rpx rgba(0, 0, 0, 0.1);
|
||||
|
||||
@ -15,14 +15,27 @@
|
||||
<div class="codeBox">
|
||||
<!-- 切换一下 是燃油车 还是 新能源 -->
|
||||
<div class="carTypeChange" @click="handleChangeCar">
|
||||
<image class="changeIcon" src="/static/home/changeIcon.svg" />
|
||||
<span class="carType">{{ carType === 1 ? '燃油车' : carType === 2 ? '新能源' : '' }}</span>
|
||||
<view class="carTypeLeft">
|
||||
<span class="typeName">{{ carType === 1 ? '燃油车牌' : carType === 2 ? '新能源牌' : '' }}</span>
|
||||
</view>
|
||||
|
||||
<view class="carTypeRight">
|
||||
<image class="changeIcon"
|
||||
:src="carType === 1 ? '/static/home/newChangeCarType.svg' : '/static/home/normalChargeIcon.svg'" />
|
||||
<span class="carType" :style="{ color: carType === 1 ? '#50D000' : '#0077FF' }">{{ carType === 1 ? '新能源' :
|
||||
carType === 2 ? '燃油车' :
|
||||
'' }}</span>
|
||||
</view>
|
||||
</div>
|
||||
|
||||
<div class="input-box">
|
||||
<div :class="haveCode ? 'input-f cccBg' : nowIndex === i ? 'input-f orangeRedBorder' : 'input-f'"
|
||||
v-for="(item, i) in normalLen" :key="i" @tap="focusInput(i)">
|
||||
<div calss="show-input">{{ saveCarText[i] }}</div>
|
||||
<div :class="i === 7 && carType === 1 ? 'show-input disabledBox' : 'show-input'">
|
||||
<image style="width: 38rpx;height: 38rpx;" class="disabledIcon" v-if="i === 7 && carType === 1"
|
||||
src="/static/home/disabledCode.svg" />
|
||||
<span v-else>{{ saveCarText[i] }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="input-f lastBox" @tap="handleChangeCarType">
|
||||
<div calss="show-input">
|
||||
@ -32,18 +45,38 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bindTypeBox" v-if="!haveCode">
|
||||
<!-- <div class="bindTypeBox" v-if="!haveCode">
|
||||
<span class="bindTrain" @click="handleChangeBindType">{{
|
||||
bindCarType === 1 ? "绑定货车" : "绑定轿车"
|
||||
}}</span>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<!-- 货车的内容 -->
|
||||
<view v-if="bindCarType === 2">
|
||||
<view>
|
||||
<div class="bindPopup">
|
||||
<div class="popupTitle">绑定车辆</div>
|
||||
|
||||
|
||||
<div class="fileItem">
|
||||
<div class="itemTitle">身份证<span style="color: red">*</span></div>
|
||||
<div class="uploadImgBox" v-if="bindCarType === 2">
|
||||
<div class="itemTitle">身份证<span style="color: red;margin-left: 8rpx;">*</span></div>
|
||||
<div class="newUploadImgBox">
|
||||
<div class="imgItem" style="margin-bottom: 28rpx;" @click=handleShowUplodaPopup(1)>
|
||||
<view class="leftText">{{ codeImgObj.frontIDCard ? '身份证人像面' : '请上传身份证人像面' }}</view>
|
||||
<view class="rightBox">
|
||||
<span class="rightText">{{ codeImgObj.frontIDCard ? '上传成功' : '点击上传' }}</span>
|
||||
<image class="rightIcon" src="/static/home/rightRow.svg" />
|
||||
</view>
|
||||
</div>
|
||||
|
||||
<div class="imgItem" @click=handleShowUplodaPopup(2)>
|
||||
<view class="leftText">{{ codeImgObj.reverseIDcard ? '身份证国徽面' : '请上传身份证国徽面' }}</view>
|
||||
<view class="rightBox">
|
||||
<span class="rightText">{{ codeImgObj.reverseIDcard ? '上传成功' : '点击上传' }}</span>
|
||||
<image class="rightIcon" src="/static/home/rightRow.svg" />
|
||||
</view>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="uploadImgBox">
|
||||
<div class="submitImgBox" v-if="!codeImgObj.frontIDCard" @click="submitImg('1', '1')">
|
||||
<image class="addIcon" src="/static/home/addImageIcon.svg" />
|
||||
<span class="submitText">请上传身份证人像面</span>
|
||||
@ -52,13 +85,6 @@
|
||||
<image :src="codeImgObj.frontIDCard" @click="submitImg('1', '1')" mode="aspectFill" />
|
||||
</div>
|
||||
|
||||
<!-- <div class="imgItem" v-for="(item, index) in IDCardImgList" :key="index">
|
||||
<image :src="item" @click="showImg2(index, IDCardImgList)" mode="aspectFill" />
|
||||
<div class="closeBox" @click.stop="deleteImgFuncResponse(IDCardImgList, index)" v-if="!haveCode">
|
||||
<image class="closeIcon" src="/static/home/closeIcon.svg" />
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="submitImgBox" v-if="!codeImgObj.reverseIDcard" @click="submitImg('1', '2')">
|
||||
<image class="addIcon" src="/static/home/addImageIcon.svg" />
|
||||
<span class="submitText">请上传身份证国徽面</span>
|
||||
@ -66,12 +92,30 @@
|
||||
<div class="imgItem" v-else>
|
||||
<image :src="codeImgObj.reverseIDcard" @click="submitImg('1', '2')" mode="aspectFill" />
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
<div class="fileItem">
|
||||
<div class="itemTitle">驾驶证</div>
|
||||
<div class="uploadImgBox" v-if="bindCarType === 2">
|
||||
<div class="itemTitle">驾驶证<span style="color: red;margin-left: 8rpx;">*</span></div>
|
||||
<div class="newUploadImgBox">
|
||||
<div class="imgItem" style="margin-bottom: 28rpx;" @click=handleShowUplodaPopup(3)>
|
||||
<view class="leftText">{{ codeImgObj.frontDriverCard ? '驾驶证主页' : '请上传驾驶证主页' }}</view>
|
||||
<view class="rightBox">
|
||||
<span class="rightText">{{ codeImgObj.frontDriverCard ? '上传成功' : '点击上传' }}</span>
|
||||
<image class="rightIcon" src="/static/home/rightRow.svg" />
|
||||
</view>
|
||||
</div>
|
||||
|
||||
<div class="imgItem" @click=handleShowUplodaPopup(4)>
|
||||
<view class="leftText">{{ codeImgObj.reverseDriverCard ? '驾驶证副页' : '请上传驾驶证副页' }}</view>
|
||||
<view class="rightBox">
|
||||
<span class="rightText">{{ codeImgObj.reverseDriverCard ? '上传成功' : '点击上传' }}</span>
|
||||
<image class="rightIcon" src="/static/home/rightRow.svg" />
|
||||
</view>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="uploadImgBox">
|
||||
<div class="submitImgBox" v-if="!codeImgObj.frontDriverCard" @click="submitImg('2', '1')">
|
||||
<image class="addIcon" src="/static/home/addImageIcon.svg" />
|
||||
<span class="submitText"><span style="color: red">*</span>请上传驾驶证主页</span>
|
||||
@ -87,19 +131,34 @@
|
||||
<div class="imgItem" v-else>
|
||||
<image :src="codeImgObj.reverseDriverCard" @click="submitImg('2', '2')" mode="aspectFill" />
|
||||
</div>
|
||||
|
||||
<!-- <div class="imgItem" v-for="(item, index) in driverLicenseList" :key="index">
|
||||
<image :src="item" @click="showImg2(index, driverLicenseList)" mode="aspectFill" />
|
||||
<div class="closeBox" @click.stop="deleteImgFuncResponse(driverLicenseList, index)" v-if="!haveCode">
|
||||
<image class="closeIcon" src="/static/home/closeIcon.svg" />
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
<div class="fileItem">
|
||||
<div class="itemTitle">行驶证</div>
|
||||
<div class="uploadImgBox" v-if="bindCarType === 2">
|
||||
<div class="itemTitle">行驶证<span style="color: red;margin-left: 8rpx;">*</span></div>
|
||||
|
||||
<div class="newUploadImgBox">
|
||||
<div class="imgItem" style="margin-bottom: 28rpx;" @click=handleShowUplodaPopup(5)>
|
||||
<view class="leftText">{{ codeImgObj.frontLicenseCard ? '行驶证主页' : '请上传行驶证主页' }}</view>
|
||||
<view class="rightBox">
|
||||
<span class="rightText">{{ codeImgObj.frontLicenseCard ? '上传成功' : '点击上传' }}</span>
|
||||
<image class="rightIcon" src="/static/home/rightRow.svg" />
|
||||
</view>
|
||||
</div>
|
||||
|
||||
<div class="imgItem" @click=handleShowUplodaPopup(6)>
|
||||
<view class="leftText">{{ codeImgObj.reverseLicenseCard ? '行驶证副页' : '请上传行驶证副页' }}</view>
|
||||
<view class="rightBox">
|
||||
<span class="rightText">{{ codeImgObj.reverseLicenseCard ? '上传成功' : '点击上传' }}</span>
|
||||
<image class="rightIcon" src="/static/home/rightRow.svg" />
|
||||
</view>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- <div class="uploadImgBox">
|
||||
<div class="submitImgBox" v-if="!codeImgObj.frontLicenseCard" @click="submitImg('3', '1')">
|
||||
<image class="addIcon" src="/static/home/addImageIcon.svg" />
|
||||
<span class="submitText"><span style="color: red">*</span>请上传行驶证主页</span>
|
||||
@ -115,14 +174,7 @@
|
||||
<div class="imgItem" v-else>
|
||||
<image :src="codeImgObj.reverseLicenseCard" @click="submitImg('3', '2')" mode="aspectFill" />
|
||||
</div>
|
||||
|
||||
<!-- <div class="imgItem" v-for="(item, index) in drivingLicenseList" :key="index">
|
||||
<image :src="item" @click="showImg2(index, drivingLicenseList)" mode="aspectFill" />
|
||||
<div class="closeBox" @click.stop="deleteImgFuncResponse(drivingLicenseList, index)" v-if="!haveCode">
|
||||
<image class="closeIcon" src="/static/home/closeIcon.svg" />
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</view>
|
||||
@ -136,6 +188,34 @@
|
||||
解绑车辆
|
||||
</div>
|
||||
|
||||
<uni-popup ref="uploadPopup" :show="showPopup" :safe-area="false" :mask-click="false" :is-mask-click="false">
|
||||
<view class="uploadBox">
|
||||
<image class="closeIcon" src="/static/home/newCloseIcon.svg" @click="handleHideUplodaPopup" />
|
||||
<div class="uploadTitle">{{
|
||||
popupType === 1 ? '身份证人像面' :
|
||||
popupType === 2 ? '身份证国徽面' :
|
||||
popupType === 3 ? '驾驶证主页' :
|
||||
popupType === 4 ? '驾驶证副页' :
|
||||
popupType === 5 ? '行驶证主页' :
|
||||
popupType === 6 ? '行驶证副页' : ''
|
||||
}}</div>
|
||||
|
||||
<div class="imgBox" :style="{
|
||||
backgroundImage: `url(${popupType === 1 ? codeImgObj.frontIDCard :
|
||||
popupType === 2 ? codeImgObj.reverseIDcard :
|
||||
popupType === 3 ? codeImgObj.frontDriverCard :
|
||||
popupType === 4 ? codeImgObj.reverseDriverCard :
|
||||
popupType === 5 ? codeImgObj.frontLicenseCard :
|
||||
popupType === 6 ? codeImgObj.reverseLicenseCard : '#E8E8E8'
|
||||
})`
|
||||
}" @click="handlePriview"></div>
|
||||
|
||||
<div class="uploadAgain" @click="handleUploadAgain">重新上传</div>
|
||||
|
||||
|
||||
</view>
|
||||
</uni-popup>
|
||||
|
||||
<!-- 货车司机 -->
|
||||
<!-- <div class="confirmBox" style="margin-top: 26rpx" @click="handleBindTruck">
|
||||
绑定货车
|
||||
@ -217,7 +297,7 @@ export default {
|
||||
return {
|
||||
cards: [],
|
||||
// isLoading: true,
|
||||
normalLen: 7,
|
||||
normalLen: 8,
|
||||
nowIndex: -1,
|
||||
isShow: false,
|
||||
saveCarText: ["皖", "A", "", "", "", "", "", ""],
|
||||
@ -250,6 +330,7 @@ export default {
|
||||
frontLicenseCard: "", // 行驶证正面
|
||||
reverseLicenseCard: "", // 行驶证反面
|
||||
}, // 三证的图片数据
|
||||
popupType: 0,// 上传证件类型
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -262,14 +343,104 @@ export default {
|
||||
CustomLoading,
|
||||
},
|
||||
methods: {
|
||||
// 重新上传
|
||||
handleUploadAgain() {
|
||||
// 身份证正面
|
||||
if (this.popupType === 1) {
|
||||
this.submitImg('1', '1')
|
||||
} else if (this.popupType === 2) {
|
||||
// 身份证反面
|
||||
this.submitImg('1', '2')
|
||||
} else if (this.popupType === 3) {
|
||||
// 驾驶证主页
|
||||
this.submitImg('2', '1')
|
||||
} else if (this.popupType === 4) {
|
||||
// 驾驶证副页
|
||||
this.submitImg('2', '2')
|
||||
} else if (this.popupType === 5) {
|
||||
// 行驶证主页
|
||||
this.submitImg('3', '1')
|
||||
} else if (this.popupType === 6) {
|
||||
// 行驶证副页
|
||||
this.submitImg('3', '2')
|
||||
}
|
||||
},
|
||||
// 预览图片
|
||||
handlePriview() {
|
||||
uni.previewImage({
|
||||
current: 0, // 当前显示图片的http链接
|
||||
urls: [this.popupType === 1 ? this.codeImgObj.frontIDCard :
|
||||
this.popupType === 2 ? this.codeImgObj.reverseIDcard :
|
||||
this.popupType === 3 ? this.codeImgObj.frontDriverCard :
|
||||
this.popupType === 4 ? this.codeImgObj.reverseDriverCard :
|
||||
this.popupType === 5 ? this.codeImgObj.frontLicenseCard :
|
||||
this.popupType === 6 ? this.codeImgObj.reverseLicenseCard : ""], // 需要预览的图片http链接列表
|
||||
});
|
||||
},
|
||||
// 点击立即上传 唤起悬浮框
|
||||
handleShowUplodaPopup(value) {
|
||||
console.log('valuevaluevaluevalue', value);
|
||||
// this.popupType = value
|
||||
// this.$refs.uploadPopup.open('center')
|
||||
|
||||
// 判断是否显示编辑的抽屉
|
||||
let isShowDetail = false
|
||||
if (value === 1 && this.codeImgObj.frontIDCard) {
|
||||
isShowDetail = true
|
||||
} else if (value === 2 && this.codeImgObj.reverseIDcard) {
|
||||
isShowDetail = true
|
||||
} else if (value === 3 && this.codeImgObj.frontDriverCard) {
|
||||
isShowDetail = true
|
||||
} else if (value === 4 && this.codeImgObj.reverseDriverCard) {
|
||||
isShowDetail = true
|
||||
} else if (value === 5 && this.codeImgObj.frontLicenseCard) {
|
||||
isShowDetail = true
|
||||
} else if (value === 6 && this.codeImgObj.reverseLicenseCard) {
|
||||
isShowDetail = true
|
||||
}
|
||||
if (isShowDetail) {
|
||||
this.popupType = value
|
||||
this.$refs.uploadPopup.open('center')
|
||||
} else {
|
||||
// 身份证正面
|
||||
if (value === 1) {
|
||||
this.submitImg('1', '1')
|
||||
} else if (value === 2) {
|
||||
// 身份证反面
|
||||
this.submitImg('1', '2')
|
||||
} else if (value === 3) {
|
||||
// 驾驶证主页
|
||||
this.submitImg('2', '1')
|
||||
} else if (value === 4) {
|
||||
// 驾驶证副页
|
||||
this.submitImg('2', '2')
|
||||
} else if (value === 5) {
|
||||
// 行驶证主页
|
||||
this.submitImg('3', '1')
|
||||
} else if (value === 6) {
|
||||
// 行驶证副页
|
||||
this.submitImg('3', '2')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
console.log('this.codeInfo', this.codeInfo);
|
||||
console.log('this.codeImgObj', this.codeImgObj);
|
||||
|
||||
},
|
||||
//
|
||||
handleHideUplodaPopup() {
|
||||
this.popupType = 0
|
||||
this.$refs.uploadPopup.close()
|
||||
},
|
||||
// 切换汽车类型 会增加会减少车牌号
|
||||
handleChangeCar() {
|
||||
if (this.carType === 1) {
|
||||
this.carType = 2
|
||||
this.normalLen = 8
|
||||
// this.normalLen = 8
|
||||
} else {
|
||||
this.carType = 1
|
||||
this.normalLen = 7
|
||||
// this.normalLen = 7
|
||||
}
|
||||
this.$forceUpdate();
|
||||
},
|
||||
@ -435,6 +606,10 @@ export default {
|
||||
// );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
console.log('_this.codeImgObj', _this.codeImgObj);
|
||||
|
||||
// _this.$forceUpdate();
|
||||
},
|
||||
fail(error) {
|
||||
@ -522,6 +697,7 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
console.log('_this.codeImgObj', _this.codeImgObj);
|
||||
// _this.$forceUpdate();
|
||||
},
|
||||
fail(error) {
|
||||
@ -533,6 +709,7 @@ export default {
|
||||
fail: function (err) { },
|
||||
});
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
// 根据车辆类型返回需要的准驾车型
|
||||
@ -603,7 +780,7 @@ export default {
|
||||
? "行驶证"
|
||||
: ""
|
||||
}识别失败！请重新上传`,
|
||||
icon: "none",
|
||||
icon: "error",
|
||||
});
|
||||
this.isLoading = false;
|
||||
return false;
|
||||
@ -635,7 +812,7 @@ export default {
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: "身份证识别失败，请重新上传！",
|
||||
icon: "none",
|
||||
icon: "error",
|
||||
});
|
||||
this.isLoading = false;
|
||||
return false;
|
||||
@ -658,7 +835,7 @@ export default {
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: "身份证识别失败，请重新上传！",
|
||||
icon: "none",
|
||||
icon: "error",
|
||||
});
|
||||
this.isLoading = false;
|
||||
return false;
|
||||
@ -690,7 +867,7 @@ export default {
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: "驾驶证识别失败，请重新上传！",
|
||||
icon: "none",
|
||||
icon: "error",
|
||||
});
|
||||
this.isLoading = false;
|
||||
return false;
|
||||
@ -707,7 +884,7 @@ export default {
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: "驾驶证识别失败，请重新上传！",
|
||||
icon: "none",
|
||||
icon: "error",
|
||||
});
|
||||
_this.isLoading = false;
|
||||
return false;
|
||||
@ -743,7 +920,7 @@ export default {
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: "行驶证识别失败，请重新上传！",
|
||||
icon: "none",
|
||||
icon: "error",
|
||||
});
|
||||
this.isLoading = false;
|
||||
return false;
|
||||
@ -758,7 +935,7 @@ export default {
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: "行驶证识别失败，请重新上传！",
|
||||
icon: "none",
|
||||
icon: "error",
|
||||
});
|
||||
this.isLoading = false;
|
||||
return false;
|
||||
@ -766,6 +943,10 @@ export default {
|
||||
}
|
||||
}
|
||||
this.isLoading = false;
|
||||
|
||||
|
||||
|
||||
|
||||
return true;
|
||||
// 到这里说明已经拿到了 识别到的数据了 然后去调用一下 存储的接口
|
||||
// 三证分别是三个不同的接口
|
||||
@ -897,134 +1078,133 @@ export default {
|
||||
}
|
||||
console.log('carTextcarTextcarTextcarTextcarText', carText);
|
||||
|
||||
return
|
||||
let isOk = true;
|
||||
if (this.bindCarType === 2) {
|
||||
// 暂时把非身份证的副页 都设置为不必填
|
||||
if (!this.codeImgObj.frontIDCard || !this.codeImgObj.reverseIDcard) {
|
||||
uni.showModal({
|
||||
title: "温馨提示",
|
||||
content: "请上传身份证！",
|
||||
showCancel: false,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!this.codeImgObj.frontDriverCard) {
|
||||
// || !this.codeImgObj.reverseDriverCard
|
||||
uni.showModal({
|
||||
title: "温馨提示",
|
||||
content: "请上传身份证！",
|
||||
showCancel: false,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!this.codeImgObj.frontLicenseCard) {
|
||||
// || !this.codeImgObj.reverseLicenseCard
|
||||
uni.showModal({
|
||||
title: "温馨提示",
|
||||
content: "请上传身份证！",
|
||||
showCancel: false,
|
||||
});
|
||||
return;
|
||||
}
|
||||
// if (this.bindCarType === 2) {
|
||||
// // 暂时把非身份证的副页 都设置为不必填
|
||||
// if (!this.codeImgObj.frontIDCard || !this.codeImgObj.reverseIDcard) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传身份证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!this.codeImgObj.frontDriverCard) {
|
||||
// // || !this.codeImgObj.reverseDriverCard
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传身份证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!this.codeImgObj.frontLicenseCard) {
|
||||
// // || !this.codeImgObj.reverseLicenseCard
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传身份证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
|
||||
// // 判断身份证和驾驶证 身份证号、名字 是否一致
|
||||
// if (this.codeInfo.cardInfoCode.IDCARDINFO_CODE && this.codeInfo.drivingInfo.LICENSE_NUMBER && this.codeInfo.drivingInfo.LICENSE_NUMBER === this.codeInfo.cardInfoCode.IDCARDINFO_CODE ||
|
||||
// this.codeInfo.cardInfoCode.IDCARDINFO_NAME && this.codeInfo.drivingInfo.IDCARDINFO_CODE && this.codeInfo.drivingInfo.IDCARDINFO_CODE === this.codeInfo.cardInfoCode.IDCARDINFO_NAME) {
|
||||
// } else {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "驾驶证和身份证信息不一致，请重新上传",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return false;
|
||||
// }
|
||||
// // // 判断身份证和驾驶证 身份证号、名字 是否一致
|
||||
// // if (this.codeInfo.cardInfoCode.IDCARDINFO_CODE && this.codeInfo.drivingInfo.LICENSE_NUMBER && this.codeInfo.drivingInfo.LICENSE_NUMBER === this.codeInfo.cardInfoCode.IDCARDINFO_CODE ||
|
||||
// // this.codeInfo.cardInfoCode.IDCARDINFO_NAME && this.codeInfo.drivingInfo.IDCARDINFO_CODE && this.codeInfo.drivingInfo.IDCARDINFO_CODE === this.codeInfo.cardInfoCode.IDCARDINFO_NAME) {
|
||||
// // } else {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: "驾驶证和身份证信息不一致，请重新上传",
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return false;
|
||||
// // }
|
||||
|
||||
// // 比较 驾驶证的准驾车型 和 行驶证的车辆类型 是否一致
|
||||
// const vehicleType = this.codeInfo.vehicleInfo.VEHICLE_TYPE || '';
|
||||
// const approvedType = this.codeInfo.drivingInfo.LICENSE_TYPE || '';
|
||||
// // // 比较 驾驶证的准驾车型 和 行驶证的车辆类型 是否一致
|
||||
// // const vehicleType = this.codeInfo.vehicleInfo.VEHICLE_TYPE || '';
|
||||
// // const approvedType = this.codeInfo.drivingInfo.LICENSE_TYPE || '';
|
||||
|
||||
// const requiredLicenseTypes = this.getRequiredLicenseTypes(vehicleType);
|
||||
// // const requiredLicenseTypes = this.getRequiredLicenseTypes(vehicleType);
|
||||
|
||||
// if (requiredLicenseTypes && requiredLicenseTypes.length > 0) {
|
||||
// if (!requiredLicenseTypes.includes(approvedType)) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: `驾驶证准驾车型（${approvedType}）不符合驾驶车辆（${vehicleType}）的要求`,
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return false;
|
||||
// }
|
||||
// } else {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: `未知车型！`,
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return false;
|
||||
// }
|
||||
// // if (requiredLicenseTypes && requiredLicenseTypes.length > 0) {
|
||||
// // if (!requiredLicenseTypes.includes(approvedType)) {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: `驾驶证准驾车型（${approvedType}）不符合驾驶车辆（${vehicleType}）的要求`,
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return false;
|
||||
// // }
|
||||
// // } else {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: `未知车型！`,
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return false;
|
||||
// // }
|
||||
|
||||
if (
|
||||
this.codeInfo.vehicleInfo.PLATE_NUMBER !==
|
||||
this.saveCarText.toString().replace(/,/g, "")
|
||||
) {
|
||||
uni.showModal({
|
||||
title: "温馨提示",
|
||||
content: `行驶证车牌号与绑定车牌号不一致！`,
|
||||
showCancel: false,
|
||||
});
|
||||
return false;
|
||||
}
|
||||
// if (
|
||||
// this.codeInfo.vehicleInfo.PLATE_NUMBER !==
|
||||
// this.saveCarText.toString().replace(/,/g, "")
|
||||
// ) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: `行驶证车牌号与绑定车牌号不一致！`,
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return false;
|
||||
// }
|
||||
|
||||
// if (!(this.IDCardImgList && this.IDCardImgList.length > 0)) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传身份证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// // if (!(this.IDCardImgList && this.IDCardImgList.length > 0)) {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: "请上传身份证！",
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return;
|
||||
// // }
|
||||
|
||||
// if (!(this.driverLicenseList && this.driverLicenseList.length > 0)) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传驾驶证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!(this.drivingLicenseList && this.drivingLicenseList.length > 0)) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传行驶证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
this.isLoading = true;
|
||||
// // if (!(this.driverLicenseList && this.driverLicenseList.length > 0)) {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: "请上传驾驶证！",
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return;
|
||||
// // }
|
||||
// // if (!(this.drivingLicenseList && this.drivingLicenseList.length > 0)) {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: "请上传行驶证！",
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return;
|
||||
// // }
|
||||
// this.isLoading = true;
|
||||
|
||||
console.log("this.codeInfothis.codeInfothis.codeInfo", this.codeInfo);
|
||||
isOk = await this.handleSaveAllCarInfo();
|
||||
} else {
|
||||
let code = this.saveCarText.toString().replace(/,/g, "");
|
||||
const vehicleInfo = await this.$api.$post(
|
||||
"/EShangApiMain/Member/SynchroVEHICLELICENSE",
|
||||
{
|
||||
PLATE_NUMBER: code,
|
||||
STAFF_NAME: "", //
|
||||
VEHICLELICENSE_STATE: 1,
|
||||
OPERATE_DATE: this.$moment.now().format("YYYY-MM-DD HH:mm:ss"), //
|
||||
}
|
||||
);
|
||||
if (vehicleInfo.Result_Code !== 100) {
|
||||
uni.showToast({
|
||||
title: "存储失败！",
|
||||
icon: "none",
|
||||
});
|
||||
isOk = false;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// console.log("this.codeInfothis.codeInfothis.codeInfo", this.codeInfo);
|
||||
// isOk = await this.handleSaveAllCarInfo();
|
||||
// } else {
|
||||
// let code = this.saveCarText.toString().replace(/,/g, "");
|
||||
// const vehicleInfo = await this.$api.$post(
|
||||
// "/EShangApiMain/Member/SynchroVEHICLELICENSE",
|
||||
// {
|
||||
// PLATE_NUMBER: code,
|
||||
// STAFF_NAME: "", //
|
||||
// VEHICLELICENSE_STATE: 1,
|
||||
// OPERATE_DATE: this.$moment.now().format("YYYY-MM-DD HH:mm:ss"), //
|
||||
// }
|
||||
// );
|
||||
// if (vehicleInfo.Result_Code !== 100) {
|
||||
// uni.showToast({
|
||||
// title: "存储失败！",
|
||||
// icon: "none",
|
||||
// });
|
||||
// isOk = false;
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
|
||||
// 图片的上传对象格式
|
||||
// let imgObj = {
|
||||
@ -1075,7 +1255,6 @@ export default {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
this.isLoading = false;
|
||||
},
|
||||
|
||||
@ -1316,6 +1495,9 @@ export default {
|
||||
},
|
||||
focusInput(value) {
|
||||
console.log('focusInputfocusInputfocusInputfocusInputfocusInput', value);
|
||||
if (value === 7 && this.carType === 1) {
|
||||
return
|
||||
}
|
||||
|
||||
// 判断第一个 有没有值 有值了的话 就显示数字键盘 没值的话 就显示中文键盘
|
||||
if (value === 0) {
|
||||
@ -1509,33 +1691,52 @@ export default {
|
||||
width: calc(100% - 64rpx);
|
||||
height: 206rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 6rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-left: 32rpx;
|
||||
transform: translateY(-60rpx);
|
||||
box-sizing: border-box;
|
||||
padding: 40rpx 26rpx;
|
||||
padding: 28rpx 32rpx;
|
||||
|
||||
.carTypeChange {
|
||||
width: 100%;
|
||||
height: 30rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
justify-content: space-between;
|
||||
|
||||
.changeIcon {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
margin-right: 8rpx;
|
||||
.carTypeLeft {
|
||||
.typeName {
|
||||
font-weight: 400;
|
||||
font-size: 30rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
.carType {
|
||||
color: #ba922f;
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
.carTypeRight {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
|
||||
.changeIcon {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
|
||||
.carType {
|
||||
color: #ba922f;
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #0077FF;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
.input-box {
|
||||
@ -1561,6 +1762,16 @@ export default {
|
||||
font-size: 34rpx;
|
||||
}
|
||||
|
||||
.disabledBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.disabled {
|
||||
background-color: #F6F6F6;
|
||||
}
|
||||
|
||||
.text-sm {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -1587,7 +1798,7 @@ export default {
|
||||
}
|
||||
|
||||
.orangeRedBorder {
|
||||
border: 1px solid orange;
|
||||
border: 1px solid #07C160;
|
||||
}
|
||||
|
||||
.lastBox {
|
||||
@ -1606,15 +1817,16 @@ export default {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
height: 88rpx;
|
||||
// height: 88rpx;
|
||||
padding: 14rpx 0;
|
||||
color: #ffffff;
|
||||
line-height: 44rpx;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
width: calc(100% - 64rpx);
|
||||
margin-left: 32rpx;
|
||||
background: #ba922f;
|
||||
border-radius: 6rpx;
|
||||
background: #07C160;
|
||||
border-radius: 10rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@ -1648,19 +1860,79 @@ export default {
|
||||
border-top-right-radius: 32rpx;
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
|
||||
.popupTitle {
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
|
||||
.fileItem {
|
||||
margin-bottom: 24rpx;
|
||||
background-color: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 26rpx 32rpx;
|
||||
border-radius: 10rpx;
|
||||
|
||||
.itemTitle {
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
font-size: 28rpx;
|
||||
line-height: 44rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.newUploadImgBox {
|
||||
|
||||
.imgItem {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 20rpx 22rpx;
|
||||
background: #F6F6F6;
|
||||
border-radius: 6rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.leftText {
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: rgba(0, 0, 0, 0.3);
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
.rightBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.rightText {
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #07C160;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
.rightIcon {
|
||||
width: 20rpx;
|
||||
height: 20rpx;
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
.uploadImgBox {
|
||||
width: 100%;
|
||||
margin-top: 16rpx;
|
||||
@ -1827,4 +2099,57 @@ page {
|
||||
justify-content: center;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.uploadBox {
|
||||
width: calc(100vw - 64rpx);
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 10rpx;
|
||||
position: relative;
|
||||
|
||||
.closeIcon {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
position: absolute;
|
||||
top: 20rpx;
|
||||
right: 20rpx;
|
||||
}
|
||||
|
||||
.uploadTitle {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #000000;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
.imgBox {
|
||||
width: 100%;
|
||||
height: calc(100vw - 64rpx);
|
||||
border-radius: 10rpx;
|
||||
margin-top: 42rpx;
|
||||
// background: #E8E8E8;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
|
||||
}
|
||||
|
||||
.uploadAgain {
|
||||
width: 100%;
|
||||
border-radius: 10rpx;
|
||||
background-color: #07C160;
|
||||
box-sizing: border-box;
|
||||
padding: 14rpx;
|
||||
font-weight: 400;
|
||||
font-size: 30rpx;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
margin-top: 36rpx;
|
||||
}
|
||||
|
||||
}
|
||||
</style>
|
||||
@ -11,8 +11,7 @@
|
||||
<!-- <h3 class="text-title">会员积分码</h3> -->
|
||||
|
||||
<div class="userImgBox">
|
||||
<div
|
||||
style="
|
||||
<div style="
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
@ -20,37 +19,25 @@
|
||||
align-items: center;
|
||||
background: #eaecee;
|
||||
border-radius: 50%;
|
||||
"
|
||||
>
|
||||
<image
|
||||
style="width: 100%; height: 100%"
|
||||
:src="WXProfile || user.MEMBERSHIP_HEADIMAGEURL"
|
||||
/>
|
||||
">
|
||||
<image style="width: 100%; height: 100%" :src="WXProfile || user.MEMBERSHIP_HEADIMAGEURL" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="checkPay">
|
||||
<div style="position: relative; text-align: center">
|
||||
<div v-if="!barcodeImg">
|
||||
<canvas
|
||||
canvas-id="barcode"
|
||||
style="height: 120rpx; width: 480rpx; margin: 0 0 14rpx 0"
|
||||
/>
|
||||
<canvas canvas-id="barcode" style="height: 120rpx; width: 480rpx; margin: 0 0 14rpx 0" />
|
||||
</div>
|
||||
|
||||
<image
|
||||
v-if="barcodeImg"
|
||||
style="height: 120rpx; width: 480rpx; margin: 0 0 14rpx 0"
|
||||
:src="barcodeImg"
|
||||
/>
|
||||
<image v-if="barcodeImg" style="height: 120rpx; width: 480rpx; margin: 0 0 14rpx 0" :src="barcodeImg" />
|
||||
</div>
|
||||
<view class="code-box">
|
||||
<text class="code-text">{{
|
||||
isShowAllCode ? allCode : showCode
|
||||
}}</text>
|
||||
|
||||
<text class="text-blue" @tap="isShowAllCode = !isShowAllCode"
|
||||
>{{ isShowAllCode ? "关闭查看" : "查看数字" }}
|
||||
<text class="text-blue" @tap="isShowAllCode = !isShowAllCode">{{ isShowAllCode ? "关闭查看" : "查看数字" }}
|
||||
</text>
|
||||
</view>
|
||||
|
||||
@ -59,51 +46,28 @@
|
||||
<canvas canvas-id="qrcode" style="height: 360rpx; width: 360rpx" />
|
||||
</div>
|
||||
|
||||
<image
|
||||
v-if="qrcodeImg"
|
||||
style="height: 360rpx; width: 360rpx"
|
||||
:src="qrcodeImg"
|
||||
/>
|
||||
<image v-if="qrcodeImg" style="height: 360rpx; width: 360rpx" :src="qrcodeImg" />
|
||||
</div>
|
||||
<div class="refresh-box flex align-center" @click.stop="refreshCode()">
|
||||
<image
|
||||
class="replayIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/replay.svg"
|
||||
/>
|
||||
<image class="replayIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/replay.svg" />
|
||||
<span class="text-xs color9d">每分钟自动刷新</span>
|
||||
</div>
|
||||
<div
|
||||
class="flex justify-between coupon-box align-center"
|
||||
@tap="isShow = true"
|
||||
>
|
||||
<div class="flex justify-between coupon-box align-center" @tap="isShow = true">
|
||||
<div class="flex align-center">
|
||||
<div class="flex align-center">
|
||||
<image
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/couponLogo.png"
|
||||
class="coupon-ico"
|
||||
></image>
|
||||
<image src="https://eshangtech.com/wanmeiyizhanImg/home/couponLogo.png" class="coupon-ico"></image>
|
||||
<view class="text-39">优惠券</view>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
@click="handleSelectCoupon"
|
||||
style="display: flex; align-items: center"
|
||||
>
|
||||
<text
|
||||
class="text-sm color9d"
|
||||
style="margin-right: 8rpx"
|
||||
v-if="couponlist.length == 0"
|
||||
>暂无可使用的优惠券</text
|
||||
>
|
||||
<div @click="handleSelectCoupon" style="display: flex; align-items: center">
|
||||
<text class="text-sm color9d" style="margin-right: 8rpx" v-if="couponlist.length == 0">暂无可使用的优惠券</text>
|
||||
<text class="text-sm color9d" v-else>{{
|
||||
cid && choeseCouponIndex != null
|
||||
? couponlist[choeseCouponIndex].CouponName
|
||||
: "选择要使用的优惠券"
|
||||
}}</text>
|
||||
<image
|
||||
style="width: 24rpx; height: 24rpx"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrowIcon.png"
|
||||
/>
|
||||
<image style="width: 24rpx; height: 24rpx"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrowIcon.png" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -111,8 +75,7 @@
|
||||
<p class="pay-end">支付成功</p>
|
||||
<p class="pay-door">{{ payDoor }}</p>
|
||||
<div class="pay-price">
|
||||
<span>{{ payPrice }}</span
|
||||
>元
|
||||
<span>{{ payPrice }}</span>元
|
||||
</div>
|
||||
<div class="pay-btn" @tap="payEnd">完成</div>
|
||||
</div>
|
||||
@ -141,10 +104,7 @@
|
||||
<!-- </view> -->
|
||||
<view class="shipItem" @click="handleRealGoPay(2)">
|
||||
<view class="shipIconBox">
|
||||
<image
|
||||
class="shipIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/wxPay.svg"
|
||||
/>
|
||||
<image class="shipIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/wxPay.svg" />
|
||||
</view>
|
||||
<!-- <span class="shipTitle">微信</span> -->
|
||||
</view>
|
||||
@ -152,35 +112,19 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<UniPopup
|
||||
ref="popup"
|
||||
closeable
|
||||
position="bottom"
|
||||
:show="isShow"
|
||||
custom-style="height: 760rpx;"
|
||||
:safe-area="false"
|
||||
>
|
||||
<UniPopup ref="popup" closeable position="bottom" :show="isShow" custom-style="height: 760rpx;" :safe-area="false">
|
||||
<view class="couponPopup">
|
||||
<view class="body-title"> 选择优惠券 </view>
|
||||
|
||||
<view class="pop-body">
|
||||
<scroll-view scroll-y style="height: 680rpx">
|
||||
<view
|
||||
class="couponItem"
|
||||
v-for="(item, i) in couponlist"
|
||||
:key="i"
|
||||
@tap="selectCoupon"
|
||||
:data-key="i"
|
||||
>
|
||||
<view class="couponItem" v-for="(item, i) in couponlist" :key="i" @tap="selectCoupon" :data-key="i">
|
||||
<div class="itemleft">
|
||||
<div>
|
||||
<span class="leftUnit">¥</span>
|
||||
<span class="money">{{ item.UseAmount }}</span>
|
||||
</div>
|
||||
<div
|
||||
v-if="!item.CouponSendId && item.CouponPoint"
|
||||
class="condition"
|
||||
>
|
||||
<div v-if="!item.CouponSendId && item.CouponPoint" class="condition">
|
||||
{{ item.CouponPoint }}积分兑换
|
||||
</div>
|
||||
<div v-else class="condition">
|
||||
@ -195,12 +139,8 @@
|
||||
<div>
|
||||
<div class="couponName">{{ item.CouponName }}</div>
|
||||
<div class="timeText">
|
||||
<span class="coupon-date" v-if="item.CouponSendId"
|
||||
>有效期至{{ item.EndTime }}</span
|
||||
>
|
||||
<span class="coupon-date" v-else
|
||||
>活动至{{ item.EndTime }}</span
|
||||
>
|
||||
<span class="coupon-date" v-if="item.CouponSendId">有效期至{{ item.EndTime }}</span>
|
||||
<span class="coupon-date" v-else>活动至{{ item.EndTime }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -209,11 +149,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</UniPopup>
|
||||
<CustomLoading
|
||||
:visible="isLoading"
|
||||
v-if="isLoading"
|
||||
@update:visible="(val) => (isLoading = val)"
|
||||
/>
|
||||
<CustomLoading :visible="isLoading" v-if="isLoading" @update:visible="(val) => (isLoading = val)" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -332,7 +268,7 @@ export default {
|
||||
_this.qrcodeHeight,
|
||||
_this.qrcodeHeight,
|
||||
null,
|
||||
"../../..https://eshangtech.com/wanmeiyizhanImg/home/YDIconWhiteBg.png"
|
||||
"https://eshangtech.com/wanmeiyizhanImg/home/YDIconWhiteBg.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");
|
||||
@ -435,13 +371,24 @@ export default {
|
||||
.then((res) => {
|
||||
if (res.Result_Code === 100) {
|
||||
_this.couponlist = res.Result_Data.List;
|
||||
console.log('_this.couponlist_this.couponlist_this.couponlist', _this.couponlist);
|
||||
|
||||
if (_this.cid) {
|
||||
let id = Number(_this.cid);
|
||||
let index = res.Result_Data.List.findIndex(
|
||||
(n) => id === n.CouponSendId
|
||||
);
|
||||
_this.choeseCouponIndex = index;
|
||||
res.Result_Data.List.forEach((item, index) => {
|
||||
if (item.CouponId === id) {
|
||||
_this.choeseCouponIndex = index;
|
||||
}
|
||||
})
|
||||
|
||||
// let index = res.Result_Data.List.findIndex(
|
||||
// (n) => id === n.CouponSendId
|
||||
// );
|
||||
|
||||
}
|
||||
|
||||
console.log('_this.choeseCouponIndex_this.choeseCouponIndex_this.choeseCouponIndex_this.choeseCouponIndex', _this.choeseCouponIndex);
|
||||
|
||||
}
|
||||
this.isLoading = false;
|
||||
});
|
||||
|
||||
@ -2,19 +2,9 @@
|
||||
<div class="page-body">
|
||||
<div class="product-image">
|
||||
<block v-if="good.List">
|
||||
<swiper
|
||||
scroll-x="true"
|
||||
circular="true"
|
||||
class="banner"
|
||||
@change="swiperChange"
|
||||
:current="pageMsg.current"
|
||||
>
|
||||
<swiper scroll-x="true" circular="true" class="banner" @change="swiperChange" :current="pageMsg.current">
|
||||
<swiper-item v-for="(img, i) in good.List" :key="i">
|
||||
<image
|
||||
mode="aspectFill"
|
||||
lazy-load="true"
|
||||
:src="img.IMAGE_URL"
|
||||
></image>
|
||||
<image mode="aspectFill" lazy-load="true" :src="img.IMAGE_URL"></image>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
<div class="swiper-dots" v-if="pageMsg.imgeCount > 0">
|
||||
@ -24,23 +14,17 @@
|
||||
</div>
|
||||
</block>
|
||||
<block v-else>
|
||||
<image
|
||||
mode="aspectFill"
|
||||
lazy-load="true"
|
||||
:src="good.DEFAULT_IMG"
|
||||
></image>
|
||||
<image mode="aspectFill" lazy-load="true" :src="good.DEFAULT_IMG"></image>
|
||||
</block>
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
<div class="product-info">
|
||||
<div
|
||||
style="
|
||||
<div style="
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
justify-content: space-between;
|
||||
"
|
||||
>
|
||||
">
|
||||
<div class="price-box">
|
||||
<block v-if="good.PAY_METHOD !== 1000">
|
||||
<span style="font-weight: bold">{{ good.COMMODITY_POINT }}</span>
|
||||
@ -49,21 +33,17 @@
|
||||
<block v-if="good.PAY_METHOD == 1000">
|
||||
<div class="vip-price">
|
||||
<span style="font-weight: bold">
|
||||
{{ good.COMMODITY_MEMBERPRICE }}</span
|
||||
>
|
||||
{{ good.COMMODITY_MEMBERPRICE }}</span>
|
||||
<span class="colorRed">元</span>
|
||||
</div>
|
||||
<!-- <span class="vip-card-ico">会员</span> -->
|
||||
</block>
|
||||
<block v-else-if="good.PAY_METHOD == 2000">
|
||||
<div
|
||||
class="vip-price"
|
||||
style="
|
||||
<div class="vip-price" style="
|
||||
color: #999;
|
||||
font-size: 24rpx;
|
||||
text-decoration: line-through;
|
||||
"
|
||||
>
|
||||
">
|
||||
<span> {{ good.COMMODITY_MEMBERPRICE }}</span>
|
||||
<span style="color: #666; font-size: 24rpx">元</span>
|
||||
</div>
|
||||
@ -80,8 +60,7 @@
|
||||
<span class="sale-count">
|
||||
{{
|
||||
good.COMMODITY_STOCK > 0 ? "库存 " + good.COMMODITY_STOCK : "售罄"
|
||||
}}</span
|
||||
>
|
||||
}}</span>
|
||||
<span class="sale-count">已售 {{ good.SALE_COUNT }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -93,11 +72,7 @@
|
||||
</div>
|
||||
<div class="vip-des">专属优惠券、商品折扣</div>
|
||||
</div>
|
||||
<navigator
|
||||
hover-class="navigator-hover"
|
||||
class="vip-right"
|
||||
url="/pages/register/index"
|
||||
>
|
||||
<navigator hover-class="navigator-hover" class="vip-right" url="/pages/register/index">
|
||||
加入会员
|
||||
<van-icon name="arrow" size="24rpx" color="#333" />
|
||||
</navigator>
|
||||
@ -107,16 +82,11 @@
|
||||
</div>
|
||||
<div class="product-brand">
|
||||
<!-- <image mode="aspectFit" lazy-load="true" :src="good.IMAGE_PATH || 'https://eshangtech.com/ShopICO/no-picture.png'"></image> -->
|
||||
<span v-show="good.SUPPLIER_NAME"
|
||||
>供应商：{{ good.SUPPLIER_NAME }}</span
|
||||
>
|
||||
<span v-show="good.SUPPLIER_NAME">供应商：{{ good.SUPPLIER_NAME }}</span>
|
||||
<button class="share-btn" @tap="handleShowPopup">
|
||||
<!-- <van-icon name="share" color="#ea3323" size="20px" /> -->
|
||||
<div style="width: 16px; height: 16px">
|
||||
<image
|
||||
style="width: 16px; height: 16px"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/share.svg"
|
||||
/>
|
||||
<image style="width: 16px; height: 16px" src="https://eshangtech.com/wanmeiyizhanImg/home/share.svg" />
|
||||
</div>
|
||||
<div>分享</div>
|
||||
</button>
|
||||
@ -136,12 +106,7 @@
|
||||
</div>
|
||||
<div class="rate-desc" @click="goRate" v-show="pageMsg.rateTotal > 0">
|
||||
<span>共{{ pageMsg.rateTotal }}条评论</span>
|
||||
<van-icon
|
||||
name="arrow"
|
||||
size="20rpx"
|
||||
color="#262626"
|
||||
custom-style="margin-left: 8rpx;"
|
||||
/>
|
||||
<van-icon name="arrow" size="20rpx" color="#262626" custom-style="margin-left: 8rpx;" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="rate-box" v-if="rateList.length > 0">
|
||||
@ -155,123 +120,65 @@
|
||||
<span class="detail-title desc-ico">商品详情</span>
|
||||
</div>
|
||||
<div class="detail-image-box">
|
||||
<block
|
||||
v-for="(img, i) in good.ContentImgList"
|
||||
:key="i"
|
||||
v-show="detailImgList[i]"
|
||||
>
|
||||
<image
|
||||
mode="aspectFill"
|
||||
lazy-load="true"
|
||||
:src="img.IMAGE_URL"
|
||||
@load="loadDetailImg($event, i)"
|
||||
:style="
|
||||
'width:' +
|
||||
detailImgList[i].width +
|
||||
'rpx; height:' +
|
||||
detailImgList[i].height +
|
||||
'rpx;'
|
||||
"
|
||||
></image>
|
||||
<block v-for="(img, i) in good.ContentImgList" :key="i" v-show="detailImgList[i]">
|
||||
<image mode="aspectFill" lazy-load="true" :src="img.IMAGE_URL" @load="loadDetailImg($event, i)" :style="'width:' +
|
||||
detailImgList[i].width +
|
||||
'rpx; height:' +
|
||||
detailImgList[i].height +
|
||||
'rpx;'
|
||||
"></image>
|
||||
</block>
|
||||
</div>
|
||||
</block>
|
||||
</div>
|
||||
|
||||
<!-- 分享商品页面 -->
|
||||
<van-popup
|
||||
:show="showSharePro"
|
||||
closeable
|
||||
close-icon-position="top-left"
|
||||
position="bottom"
|
||||
:custom-style="'height:' + (windowMsg.height + 280) + 'rpx'"
|
||||
@close="showSharePro = false"
|
||||
>
|
||||
<van-popup :show="showSharePro" closeable close-icon-position="top-left" position="bottom"
|
||||
:custom-style="'height:' + (windowMsg.height + 280) + 'rpx'" @close="showSharePro = false">
|
||||
<div class="share-pop-body" catchtouchmove="function(){return;}">
|
||||
<canvas
|
||||
canvas-id="pro"
|
||||
class="canvas-content"
|
||||
:style="{
|
||||
width: windowMsg.width + 'rpx',
|
||||
height: windowMsg.height + 'rpx',
|
||||
}"
|
||||
disable-scroll="true"
|
||||
bindtouchstart=""
|
||||
bindtouchmove=""
|
||||
bindtouchend=""
|
||||
></canvas>
|
||||
<canvas canvas-id="pro" class="canvas-content" :style="{
|
||||
width: windowMsg.width + 'rpx',
|
||||
height: windowMsg.height + 'rpx',
|
||||
}" disable-scroll="true" bindtouchstart="" bindtouchmove="" bindtouchend=""></canvas>
|
||||
|
||||
<view class="down-img-btn">
|
||||
<van-button
|
||||
icon="down"
|
||||
round
|
||||
color="linear-gradient(to right, #1f1f1f, #62605f)"
|
||||
custom-style="width:300rpx;padding:32rpx auto;"
|
||||
@click="saveImage"
|
||||
>保存到本地</van-button
|
||||
>
|
||||
<van-button icon="down" round color="linear-gradient(to right, #1f1f1f, #62605f)"
|
||||
custom-style="width:300rpx;padding:32rpx auto;" @click="saveImage">保存到本地</van-button>
|
||||
</view>
|
||||
</div>
|
||||
</van-popup>
|
||||
|
||||
<div class="product-btn-box">
|
||||
<navigator class="home-btn" url="/pages/home/index" open-type="switchTab"
|
||||
>首页</navigator
|
||||
>
|
||||
<navigator class="home-btn" url="/pages/home/index" open-type="switchTab">首页</navigator>
|
||||
<!-- <div class="shopcart-btn" @click="goShop">购物车<span class="shopcart-count" v-if="totalNum>0">{{totalNum}}</span></div> -->
|
||||
<div
|
||||
class="buynow-btn"
|
||||
@click="getMemberPoint(1)"
|
||||
v-if="good.COMMODITY_STOCK > 0 && good.PAY_METHOD !== 1000"
|
||||
>
|
||||
<div class="buynow-btn" @click="getMemberPoint(1)" v-if="good.COMMODITY_STOCK > 0 && good.PAY_METHOD !== 1000">
|
||||
立即兑换
|
||||
</div>
|
||||
<!-- @click="addGoodToCartFn" -->
|
||||
<div
|
||||
class="join-shopCart"
|
||||
@click="getMemberPoint(2)"
|
||||
v-if="good.COMMODITY_STOCK > 0 && good.PAY_METHOD !== 2000"
|
||||
>
|
||||
<div class="join-shopCart" @click="getMemberPoint(2)" v-if="good.COMMODITY_STOCK > 0 && good.PAY_METHOD !== 2000">
|
||||
立即购买
|
||||
</div>
|
||||
<div
|
||||
class="buynow-btn"
|
||||
style="background: #eee; color: #999"
|
||||
v-if="good.COMMODITY_STOCK < 1"
|
||||
>
|
||||
<div class="buynow-btn" style="background: #eee; color: #999" v-if="good.COMMODITY_STOCK < 1">
|
||||
已售罄
|
||||
</div>
|
||||
<!-- <div class="buynow-btn" @click="isShowCount = true">立即购买</div> -->
|
||||
</div>
|
||||
<van-popup
|
||||
:show="isShowCount == 1 || isShowCount == 2"
|
||||
position="bottom"
|
||||
overlay="false"
|
||||
@close="isShowCount = 0"
|
||||
>
|
||||
<van-popup :show="isShowCount == 1 || isShowCount == 2" position="bottom" overlay="false" @close="isShowCount = 0">
|
||||
<div class="popup-box">
|
||||
<div
|
||||
style="
|
||||
<div style="
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
"
|
||||
>
|
||||
">
|
||||
<div>购买数量：</div>
|
||||
<view class="cartcontrol">
|
||||
<span
|
||||
@click="
|
||||
pageMsg.buyCount > 1
|
||||
? pageMsg.buyCount--
|
||||
: (pageMsg.buyCount = 1)
|
||||
"
|
||||
class="cart-decrease"
|
||||
></span>
|
||||
<span @click="
|
||||
pageMsg.buyCount > 1
|
||||
? pageMsg.buyCount--
|
||||
: (pageMsg.buyCount = 1)
|
||||
" class="cart-decrease"></span>
|
||||
<span class="cart-count">{{ pageMsg.buyCount }}</span>
|
||||
<span
|
||||
@click="pageMsg.buyCount++"
|
||||
class="cart-add icon-add_circle"
|
||||
></span>
|
||||
<span @click="pageMsg.buyCount++" class="cart-add icon-add_circle"></span>
|
||||
</view>
|
||||
</div>
|
||||
<div style="margin-top: 20rpx" v-if="isShowCount == 1">
|
||||
@ -281,13 +188,7 @@
|
||||
<div class="buy-it-btn" @click="buyNow">确认购买</div>
|
||||
</div>
|
||||
</van-popup>
|
||||
<UniPopup
|
||||
:show="showShareBox"
|
||||
position="bottom"
|
||||
overlay="false"
|
||||
@close="handleClosePopup"
|
||||
ref="popup"
|
||||
>
|
||||
<UniPopup :show="showShareBox" position="bottom" overlay="false" @close="handleClosePopup" ref="popup">
|
||||
<view class="share-popup" style="background-color: #fff">
|
||||
<view class="share-divider">
|
||||
<text>分享</text>
|
||||
@ -295,10 +196,7 @@
|
||||
<!-- <van-divider contentPosition="center">分享</van-divider> -->
|
||||
<view class="share-pop-btn">
|
||||
<button open-type="share" @tap="handleClosePopup">
|
||||
<image
|
||||
src="https://eshangtech.com/ShopICO/icos/fxhy.png"
|
||||
act
|
||||
></image>
|
||||
<image src="https://eshangtech.com/ShopICO/icos/fxhy.png" act></image>
|
||||
<text>分享给好友</text>
|
||||
</button>
|
||||
<button @tap="creatPageQR">
|
||||
@ -383,6 +281,8 @@ export default {
|
||||
commodityId: _this.pageMsg.goodId,
|
||||
})
|
||||
.then(function (res) {
|
||||
console.log('resresresresresresresresresresresresresresresres', res);
|
||||
|
||||
_this.good = res.Data;
|
||||
_this.pageMsg.current = 0;
|
||||
_this.pageMsg.imgeCount = res.Data.List.length || 0;
|
||||
@ -414,6 +314,8 @@ export default {
|
||||
pageSize: 3,
|
||||
})
|
||||
.then((res) => {
|
||||
console.log('resresresresresresresresres', res);
|
||||
|
||||
_this.rateList = res.Data.List;
|
||||
_this.pageMsg.rateTotal = res.Data.TotalCount;
|
||||
});
|
||||
@ -722,7 +624,7 @@ export default {
|
||||
|
||||
fail() {
|
||||
wx.openSetting({
|
||||
success: (res) => {},
|
||||
success: (res) => { },
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
@ -1,44 +1,25 @@
|
||||
<template>
|
||||
<div class="main">
|
||||
<div
|
||||
class="top"
|
||||
:style="{
|
||||
height: `${loginType === 'min' ? menu.bottom + 8 : ''}px`,
|
||||
paddingTop: `${menu.top}px`,
|
||||
}"
|
||||
>
|
||||
<div class="top" :style="{
|
||||
height: `${loginType === 'min' ? menu.bottom + 8 : ''}px`,
|
||||
paddingTop: `${menu.top}px`,
|
||||
}">
|
||||
<div class="topContent">
|
||||
<image
|
||||
class="backIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/backArrow.svg"
|
||||
@click="handleBack"
|
||||
/>
|
||||
<image class="backIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/backArrow.svg" @click="handleBack" />
|
||||
|
||||
<div class="first" @click="goSelectServer">
|
||||
<image
|
||||
class="addressIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/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="https://eshangtech.com/wanmeiyizhanImg/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="https://eshangtech.com/wanmeiyizhanImg/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="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png"
|
||||
/>
|
||||
<image class="moreIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/rightArrow.png" />
|
||||
</div>
|
||||
<div class="second">
|
||||
距您{{ serverPart.SERVERPART_DISTANCE || "-" }}km
|
||||
@ -52,51 +33,87 @@
|
||||
/>
|
||||
</div> -->
|
||||
|
||||
<div class="newTabList" v-if="false">
|
||||
<div
|
||||
:class="
|
||||
selectTypeTab === index ? 'newTabItem selectTabItem' : 'newTabItem'
|
||||
"
|
||||
v-for="(item, index) in selectTypeList"
|
||||
:key="index"
|
||||
@click="handleChangeType(index)"
|
||||
>
|
||||
<div class="newTabList">
|
||||
<div :class="selectTypeTab === index ? 'newTabItem selectTabItem' : 'newTabItem'
|
||||
" v-for="(item, index) in selectTypeList" :key="index" @click="handleChangeType(index)">
|
||||
{{ item.label }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<scroll-view
|
||||
scroll-y
|
||||
class="shopListBox"
|
||||
:style="{
|
||||
height: `${
|
||||
loginType === 'min'
|
||||
? `calc(100vh - ${menu.bottom + 8 + 12}px)`
|
||||
: menu.height + 'px'
|
||||
<scroll-view scroll-y class="shopListBox" :style="{
|
||||
height: `${loginType === 'min'
|
||||
? `calc(100vh - ${menu.bottom + 8 + 12}px - 34px)`
|
||||
: menu.height + 'px'
|
||||
}`,
|
||||
}"
|
||||
>
|
||||
<div v-if="shopList && shopList.length > 0">
|
||||
<div
|
||||
class="shopItemBox"
|
||||
v-for="(item, index) in shopList"
|
||||
:key="index"
|
||||
@click.stop="goBuy(item)"
|
||||
:style="{
|
||||
marginBottom: index + 1 === shopList.length ? '0' : '',
|
||||
borderWidth: index + 1 === shopList.length ? '0' : '',
|
||||
}"
|
||||
>
|
||||
}">
|
||||
<div v-if="onShowTypeList && onShowTypeList.length > 0">
|
||||
<!-- shopList -->
|
||||
<div class="shopItemBox" v-for="(item, index) in onShowTypeList" :key="index" @click.stop="goBuy(item)" :style="{
|
||||
marginBottom: index + 1 === shopList.length ? '0' : '',
|
||||
borderWidth: index + 1 === shopList.length ? '0' : '',
|
||||
}">
|
||||
<div class="shopItemTop">
|
||||
<div class="shopImg">
|
||||
<image
|
||||
class="shopIcon"
|
||||
:src="
|
||||
item.MERCHANTS_LOGO ||
|
||||
'https://eshangtech.com/ShopICO/no-picture.png'
|
||||
"
|
||||
mode="aspectFit"
|
||||
/>
|
||||
<image class="shopIcon" :src="item.MERCHANTS_LOGO ||
|
||||
'https://eshangtech.com/ShopICO/no-picture.png'
|
||||
" mode="aspectFit" />
|
||||
</div>
|
||||
<div class="shopDetail">
|
||||
|
||||
<div class="shopDetailLeft">
|
||||
<div class="detailLeftTop">
|
||||
<span class="topShopName">{{ item.MERCHANTS_NAME }}</span>
|
||||
</div>
|
||||
|
||||
<div class="detailLeftBottom">
|
||||
<view class="scoreBox">
|
||||
<uni-rate :value="item.MERCHANTS_SCORE" size="16" readonly allowHalf color="#D9D9D9"
|
||||
activeColor="#FFC300" style="margin-right: 8rpx" />
|
||||
{{ item.MERCHANTS_SCORE || '' }}
|
||||
</view>
|
||||
<view class="newOtherDetail">
|
||||
<span class="label">月售</span>
|
||||
<span class="value">{{ item.MONTHLYSALES || "-" }}</span>
|
||||
<span class="label" style="margin-left: 20rpx;">人均</span>
|
||||
<span class="value">￥{{ item.PERCAPITA || "-" }}</span>
|
||||
</view>
|
||||
</div>
|
||||
</div>
|
||||
<div class="shopDetailRight">
|
||||
<view class="goFood" v-if="item.SCANCODE_ORDER === 1" @click.stop="goBuy(item)">点餐</view>
|
||||
<view class="search" v-else-if="item.GOODSLIST && item.GOODSLIST.length > 0" @click.stop="goBuy(item)">
|
||||
查看</view>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="shopList" v-if="
|
||||
item.GOODSLIST &&
|
||||
item.GOODSLIST.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
">
|
||||
<div class="shopItem" v-for="(subItem, subIndex) in item.GOODSLIST" :key="subIndex">
|
||||
<div class="shopImgBox">
|
||||
<image class="shopImg" lazy-load :src="subItem.IMAGE_URL" />
|
||||
</div>
|
||||
<div class="shopName">{{ subItem.COMMODITY_NAME || "" }}</div>
|
||||
<div class="itemPrice">
|
||||
<span class="itemUnit">¥</span>
|
||||
<span class="itemPrice">{{
|
||||
subItem.COMMODITY_RETAILPRICE || ""
|
||||
}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="shopItemTop" v-if="false">
|
||||
<div class="shopImg">
|
||||
<image class="shopIcon" :src="item.MERCHANTS_LOGO ||
|
||||
'https://eshangtech.com/ShopICO/no-picture.png'
|
||||
" mode="aspectFit" />
|
||||
</div>
|
||||
<div class="shopDetail">
|
||||
<div class="shopName">
|
||||
@ -105,16 +122,10 @@
|
||||
</div>
|
||||
<div class="otherDetail">
|
||||
<div class="leftDetail">
|
||||
<span class="mark"
|
||||
>{{ item.MERCHANTS_SCORE
|
||||
}}<span class="unit">分</span></span
|
||||
>
|
||||
<span class="monthSales"
|
||||
>月售{{ item.MONTHLYSALES || "-" }}</span
|
||||
>
|
||||
<span class="perCapita"
|
||||
>人均 ￥{{ item.PERCAPITA || "-" }}</span
|
||||
>
|
||||
<span class="mark">{{ item.MERCHANTS_SCORE
|
||||
}}<span class="unit">分</span></span>
|
||||
<span class="monthSales">月售{{ item.MONTHLYSALES || "-" }}</span>
|
||||
<span class="perCapita">人均 ￥{{ item.PERCAPITA || "-" }}</span>
|
||||
</div>
|
||||
<div class="rightDetail">
|
||||
<!-- <span class="perCapita"
|
||||
@ -128,38 +139,24 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="couponList">
|
||||
<div
|
||||
class="couponBox"
|
||||
:style="{
|
||||
right:
|
||||
item.SCANCODE_ORDER === 1 &&
|
||||
<div class="couponBox" :style="{
|
||||
right:
|
||||
item.SCANCODE_ORDER === 1 &&
|
||||
item.CouponList &&
|
||||
item.CouponList.length > 0
|
||||
? '160rpx'
|
||||
: '0',
|
||||
}"
|
||||
v-if="item.CouponList && item.CouponList.length > 0"
|
||||
>
|
||||
? '160rpx'
|
||||
: '0',
|
||||
}" v-if="item.CouponList && item.CouponList.length > 0">
|
||||
<view class="couponIconBox">
|
||||
<image
|
||||
class="couponIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/useCoupon.svg"
|
||||
/>
|
||||
<image class="couponIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/useCoupon.svg" />
|
||||
</view>
|
||||
<span class="couponText">优惠券</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 去点餐 -->
|
||||
<div
|
||||
class="goOrder"
|
||||
v-if="item.SCANCODE_ORDER === 1"
|
||||
@click.stop="goBuy(item)"
|
||||
>
|
||||
<image
|
||||
class="orderIcon"
|
||||
src="https://eshangtech.com/wanmeiyizhanImg/home/goOrderIcon.svg"
|
||||
/>
|
||||
<div class="goOrder" v-if="item.SCANCODE_ORDER === 1" @click.stop="goBuy(item)">
|
||||
<image class="orderIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/goOrderIcon.svg" />
|
||||
<span class="goOrderText">去点餐</span>
|
||||
</div>
|
||||
<!-- 优惠券 -->
|
||||
@ -184,21 +181,14 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="shopList"
|
||||
v-if="
|
||||
item.GoodsList &&
|
||||
item.GoodsList.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
"
|
||||
>
|
||||
<div
|
||||
class="shopItem"
|
||||
v-for="(subItem, subIndex) in item.GoodsList"
|
||||
:key="subIndex"
|
||||
>
|
||||
<div class="shopList" v-if="
|
||||
item.GoodsList &&
|
||||
item.GoodsList.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
">
|
||||
<div class="shopItem" v-for="(subItem, subIndex) in item.GoodsList" :key="subIndex">
|
||||
<div class="shopImgBox">
|
||||
<image class="shopImg" :src="subItem.IMAGE_URL" />
|
||||
<image class="shopImg" lazy-load :src="subItem.IMAGE_URL" />
|
||||
</div>
|
||||
<div class="shopName">{{ subItem.COMMODITY_NAME || "" }}</div>
|
||||
<div class="itemPrice">
|
||||
@ -212,17 +202,10 @@
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="noDataBox">
|
||||
<no-data
|
||||
text="暂无可点餐门店"
|
||||
:isShow="!(shopList && shopList.length > 0)"
|
||||
/>
|
||||
<no-data text="暂无可点餐门店" :isShow="!(shopList && shopList.length > 0)" />
|
||||
</div>
|
||||
</scroll-view>
|
||||
<CustomLoading
|
||||
:visible="isLoading"
|
||||
v-if="isLoading"
|
||||
@update:visible="(val) => (isLoading = val)"
|
||||
/>
|
||||
<CustomLoading :visible="isLoading" v-if="isLoading" @update:visible="(val) => (isLoading = val)" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -427,10 +410,18 @@ export default {
|
||||
console.log("allList", allList);
|
||||
}
|
||||
|
||||
console.log('listlistlistlist', list);
|
||||
allList.unshift(list)
|
||||
|
||||
if (allList && allList.length > 0) {
|
||||
// 各种业态类型的二维数组
|
||||
this.allTypeList = allList;
|
||||
this.onShowTypeList = allList[this.selectTypeTab];
|
||||
// 添加上全部的分类
|
||||
tabList.unshift({
|
||||
label: "全部",
|
||||
value: "0"
|
||||
})
|
||||
this.selectTypeList = tabList;
|
||||
console.log("this.allTypeList", this.allTypeList);
|
||||
console.log("this.allTypeLonShowTypeListist", this.onShowTypeList);
|
||||
@ -452,20 +443,16 @@ 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}&buyType=${
|
||||
item.SCANCODE_ORDER
|
||||
}&stroreDetail=${JSON.stringify(stroreDetail)}`,
|
||||
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID
|
||||
}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER
|
||||
}&stroreDetail=${JSON.stringify(stroreDetail)}`,
|
||||
});
|
||||
} 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}&buyType=${
|
||||
item.SCANCODE_ORDER
|
||||
}&stroreDetail=${JSON.stringify(stroreDetail)}`,
|
||||
url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID
|
||||
}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER
|
||||
}&stroreDetail=${JSON.stringify(stroreDetail)}`,
|
||||
});
|
||||
this.isLogin = true;
|
||||
}
|
||||
@ -581,19 +568,20 @@ export default {
|
||||
overflow-x: auto;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
border-bottom: 1px solid #dddcdc;
|
||||
margin-top: 16rpx;
|
||||
// border-bottom: 1px solid #dddcdc;
|
||||
// margin-top: 16rpx;
|
||||
height: 30px;
|
||||
|
||||
.newTabItem {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #716f69;
|
||||
color: #C6C6C6;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
padding: 0 50rpx 12rpx 50rpx;
|
||||
white-space: nowrap;
|
||||
padding: 0 40rpx;
|
||||
}
|
||||
|
||||
.selectTabItem {
|
||||
@ -610,9 +598,9 @@ export default {
|
||||
.selectTabItem:after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
width: 2rem;
|
||||
height: 4rpx;
|
||||
background: #ba922f;
|
||||
background: #009DFF;
|
||||
bottom: 0;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
@ -641,11 +629,11 @@ export default {
|
||||
align-items: flex-start;
|
||||
|
||||
.shopImg {
|
||||
width: 136rpx;
|
||||
height: 136rpx;
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
overflow: hidden;
|
||||
border-radius: 8rpx;
|
||||
margin-right: 24rpx;
|
||||
border-radius: 16rpx;
|
||||
margin-right: 28rpx;
|
||||
|
||||
.shopIcon {
|
||||
width: 100%;
|
||||
@ -654,12 +642,115 @@ export default {
|
||||
}
|
||||
|
||||
.shopDetail {
|
||||
width: calc(100% - 136rpx);
|
||||
width: calc(100% - 158rpx);
|
||||
height: 130rpx;
|
||||
// height: 96rpx;
|
||||
// display: flex;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
// flex-direction: column;
|
||||
// justify-content: space-between;
|
||||
position: relative;
|
||||
// position: relative;
|
||||
|
||||
.shopDetailLeft {
|
||||
width: calc(100% - 150rpx);
|
||||
height: 130rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
.detailLeftTop {
|
||||
.topShopName {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 29rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
.detailLeftBottom {
|
||||
.scoreBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
.newOtherDetail {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
margin-top: 12rpx;
|
||||
|
||||
.label {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: rgba(0, 0, 0, 0.5);
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
display: inline-block;
|
||||
width: 50rpx;
|
||||
}
|
||||
|
||||
.value {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #009DFF;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
display: inline-block;
|
||||
width: 70rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.shopDetailRight {
|
||||
width: 150rpx;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
.goFood {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
padding: 4rpx 28rpx;
|
||||
background-color: #FF6200;
|
||||
border-radius: 32rpx;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.search {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
padding: 4rpx 28rpx;
|
||||
background-color: #009DFF;
|
||||
border-radius: 32rpx;
|
||||
display: inline-block;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.shopName {
|
||||
width: 100%;
|
||||
@ -683,8 +774,7 @@ export default {
|
||||
|
||||
.titleIcon {
|
||||
display: inline-block;
|
||||
background: url("https://eshangtech.com/ShopICO/icos/to-eat.png")
|
||||
no-repeat center; // eshangtech.com/ShopICO/icos/to-eat.png) no-repeat center;
|
||||
background: url("https://eshangtech.com/ShopICO/icos/to-eat.png") no-repeat center; // eshangtech.com/ShopICO/icos/to-eat.png) no-repeat center;
|
||||
background-size: contain;
|
||||
width: 133rpx;
|
||||
height: 48rpx;
|
||||
@ -747,8 +837,7 @@ export default {
|
||||
}
|
||||
|
||||
.icon-coupon {
|
||||
background: url("https://eshangtech.com/ShopICO/icos/y-yhq.png")
|
||||
no-repeat left center; // eshangtech.com/ShopICO/icos/y-yhq.png) no-repeat left center
|
||||
background: url("https://eshangtech.com/ShopICO/icos/y-yhq.png") no-repeat left center; // eshangtech.com/ShopICO/icos/y-yhq.png) no-repeat left center
|
||||
background-size: contain;
|
||||
// width 75rpx
|
||||
// height 22rpx
|
||||
@ -869,11 +958,11 @@ export default {
|
||||
margin-right: 16rpx;
|
||||
|
||||
.shopImgBox {
|
||||
width: 168rpx;
|
||||
height: 128rpx;
|
||||
width: 146rpx;
|
||||
height: 96rpx;
|
||||
overflow: hidden;
|
||||
border-radius: 12rpx;
|
||||
margin-bottom: 8rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-bottom: 12rpx;
|
||||
|
||||
.shopImg {
|
||||
width: 100%;
|
||||
@ -886,12 +975,12 @@ export default {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
font-family: "PingFangSC";
|
||||
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #130f05;
|
||||
line-height: 32rpx;
|
||||
text-align: justify;
|
||||
font-size: 24rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@ -899,8 +988,8 @@ export default {
|
||||
.itemUnit {
|
||||
font-family: "DINAlternate";
|
||||
font-weight: bold;
|
||||
font-size: 24rpx;
|
||||
color: #130f05;
|
||||
font-size: 20rpx;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
@ -909,7 +998,7 @@ export default {
|
||||
font-family: "DINAlternate";
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #130f05;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@
|
||||
</view>
|
||||
|
||||
<!-- 蔚来 -->
|
||||
<view class="statusItem" v-if="false">
|
||||
<view class="statusItem" >
|
||||
<!-- <image
|
||||
class="statusIcon"
|
||||
src="https://eshangtech.com/minTestImg/WLIcon.png"
|
||||
@ -215,7 +215,7 @@ export default {
|
||||
startX: 0, // 拖动开始时的 X 坐标
|
||||
startY: 0, // 拖动开始时的 Y 坐标
|
||||
positionX: systemInfo.safeArea.width - 130, // 元素当前的 X 坐标
|
||||
positionY: 180, // 元素当前的 Y 坐标
|
||||
positionY: 210, // 元素当前的 Y 坐标
|
||||
isDragging: false, // 是否正在拖动
|
||||
screenWidth: 0, // 屏幕宽度
|
||||
screenHeight: 0, // 屏幕高度
|
||||
@ -844,7 +844,7 @@ export default {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
top: 360rpx;
|
||||
top: 420rpx;
|
||||
right: 16rpx;
|
||||
z-index: 1;
|
||||
|
||||
|
||||
@ -22,40 +22,75 @@
|
||||
<view class="serviceDetailBox" v-if="showChargeBox">
|
||||
<!-- <charge-box :serviceAreaList="currentServiceList" :pageType="'mapIndex'"
|
||||
@allChargeData="handleGetChargeData" /> -->
|
||||
<view></view>
|
||||
<view>
|
||||
{{ currentServiceObj.SERVERPART_NAME || '' }}
|
||||
</view>
|
||||
<view class="gasContent">
|
||||
<view class="gasItem">
|
||||
<image class="gasItemIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/92Icon.svg" />
|
||||
<span class="label">#加油枪</span>
|
||||
<span class="value">
|
||||
{{
|
||||
oliData && oliData["92"]
|
||||
? `￥${oliData["92"]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN92 || "-"
|
||||
}}
|
||||
</span>
|
||||
<image class="gasItemIcon" src="/static/home/new92.svg" />
|
||||
<view class="newValue">
|
||||
<view class="newValueLeft">
|
||||
<span class="unit">￥</span>
|
||||
<span class="price">{{
|
||||
oliData && oliData["92"]
|
||||
? `${oliData["92"].toString().split('.')[0]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN92 || "-"
|
||||
}}</span>
|
||||
<span class="smallPrice">{{
|
||||
oliData && oliData["92"]
|
||||
? `.${oliData["92"].toString().split('.')[1]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN92 || "-"
|
||||
}}</span>
|
||||
</view>
|
||||
|
||||
<view class="newValueRight">
|
||||
/升
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="gasItem">
|
||||
<image class="gasItemIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/95Icon.svg" />
|
||||
<span class="label">#加油枪</span>
|
||||
<span class="value">
|
||||
{{
|
||||
oliData && oliData["95"]
|
||||
? `￥${oliData["95"]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN95 || "-"
|
||||
}}
|
||||
</span>
|
||||
<image class="gasItemIcon" src="/static/home/new95.svg" />
|
||||
<view class="newValue">
|
||||
<view class="newValueLeft">
|
||||
<span class="unit">￥</span>
|
||||
<span class="price">{{
|
||||
oliData && oliData["95"]
|
||||
? `${oliData["95"].toString().split('.')[0]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN92 || "-"
|
||||
}}</span>
|
||||
<span class="smallPrice">{{
|
||||
oliData && oliData["95"]
|
||||
? `.${oliData["95"].toString().split('.')[1]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN92 || "-"
|
||||
}}</span>
|
||||
</view>
|
||||
|
||||
<view class="newValueRight">
|
||||
/升
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="gasItem">
|
||||
<image class="gasItemIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/zeroIcon.svg" />
|
||||
<span class="label">#加油枪</span>
|
||||
<span class="value">
|
||||
{{
|
||||
oliData && oliData["0"]
|
||||
? `￥${oliData["0"]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN0 || "-"
|
||||
}}
|
||||
</span>
|
||||
<image class="gasItemIcon" src="/static/home/new0.svg" />
|
||||
<view class="newValue">
|
||||
<view class="newValueLeft">
|
||||
<span class="unit">￥</span>
|
||||
<span class="price">{{
|
||||
oliData && oliData["0"]
|
||||
? `${oliData["0"].toString().split('.')[0]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN92 || "-"
|
||||
}}</span>
|
||||
<span class="smallPrice">{{
|
||||
oliData && oliData["0"]
|
||||
? `.${oliData["0"].toString().split('.')[1]}`
|
||||
: detailInfo.sumDetail.REFUELINGGUN92 || "-"
|
||||
}}</span>
|
||||
</view>
|
||||
|
||||
<view class="newValueRight">
|
||||
/升
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -164,8 +199,8 @@ export default {
|
||||
if (seatInfo) {
|
||||
let res = seatInfo;
|
||||
this.seatInfo = {
|
||||
longitude: res.longitude,
|
||||
latitude: res.latitude,
|
||||
longitude: this.currentServiceObj.SERVERPART_X || res.longitude,
|
||||
latitude: this.currentServiceObj.SERVERPART_Y || res.latitude,
|
||||
};
|
||||
this.longitude = this.seatInfo.longitude;
|
||||
this.latitude = this.seatInfo.latitude;
|
||||
@ -923,28 +958,30 @@ export default {
|
||||
box-sizing: border-box;
|
||||
|
||||
.gasItem {
|
||||
width: calc((100% - 32rpx) / 3);
|
||||
padding: 32rpx 0;
|
||||
border-radius: 8rpx;
|
||||
width: calc((100% - 44rpx) / 3);
|
||||
box-sizing: border-box;
|
||||
padding: 20rpx 20rpx 10rpx;
|
||||
border-radius: 16rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
border: 1px solid #F7F7F7;
|
||||
|
||||
.gasItemIcon {
|
||||
width: 72rpx;
|
||||
height: 72rpx;
|
||||
width: 160rpx;
|
||||
height: 160rpx;
|
||||
}
|
||||
|
||||
.label {
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #2a2b2e;
|
||||
line-height: 36rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
margin: 16rpx 0;
|
||||
}
|
||||
// .label {
|
||||
// font-family: "PingFangSC";
|
||||
// font-weight: 400;
|
||||
// font-size: 26rpx;
|
||||
// color: #2a2b2e;
|
||||
// line-height: 36rpx;
|
||||
// text-align: left;
|
||||
// font-style: normal;
|
||||
// margin: 16rpx 0;
|
||||
// }
|
||||
|
||||
.value {
|
||||
font-family: "DINAlternate";
|
||||
@ -954,6 +991,59 @@ export default {
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.newValue {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-top: 10rpx;
|
||||
|
||||
.newValueLeft {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
|
||||
.unit {
|
||||
font-family: "MicrosoftYaHei";
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
.price {
|
||||
font-family: "MicrosoftYaHei";
|
||||
font-weight: bold;
|
||||
font-size: 36rpx;
|
||||
line-height: 36rpx;
|
||||
color: #FF6200;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.smallPrice {
|
||||
font-family: "MicrosoftYaHei";
|
||||
font-weight: bold;
|
||||
font-size: 26rpx;
|
||||
line-height: 26rpx;
|
||||
color: #FF6200;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
.newValueRight {
|
||||
font-family: "MicrosoftYaHei";
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: rgba(0, 0, 0, 0.3);
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.first {
|
||||
|
||||
@ -546,14 +546,15 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="shopList" v-if="
|
||||
item.GoodsList &&
|
||||
item.GoodsList.length > 0 &&
|
||||
<div class="shopList" v-if="
|
||||
item.GOODSLIST &&
|
||||
item.GOODSLIST.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
">
|
||||
<div class="shopItem" v-for="(subItem, subIndex) in item.GoodsList" :key="subIndex">
|
||||
<div class="shopItem" v-for="(subItem, subIndex) in item.GOODSLIST" :key="subIndex">
|
||||
<div class="shopImgBox">
|
||||
<image class="shopImg" mode="aspectFit" lazy-load="true" :src="subItem.IMAGE_URL" />
|
||||
<!-- mode="aspectFit" -->
|
||||
<image class="shopImg" lazy-load :src="subItem.IMAGE_URL" />
|
||||
</div>
|
||||
<div class="shopName">{{ subItem.COMMODITY_NAME || "" }}</div>
|
||||
<div class="itemPrice">
|
||||
@ -563,7 +564,7 @@
|
||||
}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@ -3130,11 +3131,11 @@ export default {
|
||||
margin-right: 16rpx;
|
||||
|
||||
.shopImgBox {
|
||||
width: 168rpx;
|
||||
height: 168rpx;
|
||||
width: 146rpx;
|
||||
height: 96rpx;
|
||||
overflow: hidden;
|
||||
border-radius: 12rpx;
|
||||
margin-bottom: 8rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-bottom: 12rpx;
|
||||
|
||||
.shopImg {
|
||||
width: 100%;
|
||||
@ -3147,12 +3148,12 @@ export default {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
font-family: "PingFangSC";
|
||||
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #130f05;
|
||||
line-height: 32rpx;
|
||||
text-align: justify;
|
||||
font-size: 24rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@ -3160,8 +3161,8 @@ export default {
|
||||
.itemUnit {
|
||||
font-family: "DINAlternate";
|
||||
font-weight: bold;
|
||||
font-size: 24rpx;
|
||||
color: #130f05;
|
||||
font-size: 20rpx;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
@ -3170,7 +3171,7 @@ export default {
|
||||
font-family: "DINAlternate";
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #130f05;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
11
static/home/disabledCode.svg
Normal file
11
static/home/disabledCode.svg
Normal file
@ -0,0 +1,11 @@
|
||||
<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="icon-禁用" clip-path="url(#clip0_104_1782)">
|
||||
<path id="Vector" d="M19 35.3875C14.6538 35.3875 10.4856 33.661 7.41234 30.5878C4.33908 27.5145 2.61255 23.3463 2.61255 19C2.61255 14.6538 4.33908 10.4856 7.41234 7.41234C10.4856 4.33908 14.6538 2.61255 19 2.61255C23.3463 2.61255 27.5145 4.33908 30.5878 7.41234C33.661 10.4856 35.3875 14.6538 35.3875 19C35.3875 23.3463 33.661 27.5145 30.5878 30.5878C27.5145 33.661 23.3463 35.3875 19 35.3875ZM19 33.0125C22.7164 33.0125 26.2805 31.5362 28.9084 28.9084C31.5362 26.2805 33.0125 22.7164 33.0125 19C33.0125 15.2837 31.5362 11.7196 28.9084 9.09171C26.2805 6.46386 22.7164 4.98755 19 4.98755C15.2837 4.98755 11.7196 6.46386 9.09171 9.09171C6.46386 11.7196 4.98755 15.2837 4.98755 19C4.98755 22.7164 6.46386 26.2805 9.09171 28.9084C11.7196 31.5362 15.2837 33.0125 19 33.0125Z" fill="#E7E7E6"/>
|
||||
<path id="Vector_2" d="M6.76025 8.43985L8.43985 6.76025L31.2399 29.5603L29.5603 31.2399L6.76025 8.43985Z" fill="#E7E7E6"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_104_1782">
|
||||
<rect width="38" height="38" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
10
static/home/newChangeCarType.svg
Normal file
10
static/home/newChangeCarType.svg
Normal file
@ -0,0 +1,10 @@
|
||||
<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="icon-切换-绿" clip-path="url(#clip0_91_4070)">
|
||||
<path id="Vector" d="M19.905 13.5843H3.09521C2.59883 13.5843 2.19678 13.9864 2.19678 14.4828C2.19678 14.6715 2.25518 14.8467 2.354 14.9904C2.39668 15.0915 2.46182 15.1858 2.54268 15.2689L6.50254 19.2265C6.67773 19.4017 6.90684 19.4893 7.13818 19.4893C7.36953 19.4893 7.59863 19.4017 7.77383 19.2265C8.12422 18.8761 8.12422 18.3079 7.77383 17.9552L5.19531 15.3812H19.9027C20.3991 15.3812 20.8012 14.9792 20.8012 14.4828C20.8012 13.9864 20.4014 13.5843 19.905 13.5843ZM3.09521 9.4156H19.905C20.4014 9.4156 20.8034 9.01355 20.8034 8.51716C20.8034 8.32849 20.745 8.1533 20.6462 8.00955C20.6147 7.93542 20.5698 7.86355 20.5159 7.79617L17.2771 3.83855C16.9626 3.45447 16.3966 3.39831 16.0125 3.71277C15.6284 4.02722 15.5723 4.59324 15.8867 4.97732L18.0497 7.61873H3.09521C2.59883 7.61873 2.19678 8.02078 2.19678 8.51716C2.19678 9.01355 2.59883 9.4156 3.09521 9.4156Z" fill="#50D000"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_91_4070">
|
||||
<rect width="23" height="23" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
11
static/home/newCloseIcon.svg
Normal file
11
static/home/newCloseIcon.svg
Normal file
@ -0,0 +1,11 @@
|
||||
<svg width="41" height="41" viewBox="0 0 41 41" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="icno-关闭" clip-path="url(#clip0_91_4039)">
|
||||
<path id="Vector" d="M20.5 38.4375C10.6088 38.4375 2.5625 30.3912 2.5625 20.5C2.5625 10.6088 10.6088 2.5625 20.5 2.5625C30.3912 2.5625 38.4375 10.6088 38.4375 20.5C38.4375 30.3912 30.3912 38.4375 20.5 38.4375ZM20.5 5.1365C12.0284 5.1365 5.1365 12.0284 5.1365 20.5C5.1365 28.9703 12.0284 35.8635 20.5 35.8635C28.9703 35.8635 35.8635 28.9704 35.8635 20.5C35.8635 12.0284 28.9703 5.1365 20.5 5.1365Z" fill="black"/>
|
||||
<path id="Vector_2" d="M22.3039 20.5551L27.844 15.0751C28.3476 14.578 28.3514 13.767 27.8543 13.2634C27.3572 12.7599 26.5449 12.756 26.0426 13.2532L20.4948 18.7395L15.0315 13.2596C14.5305 12.7586 13.7209 12.756 13.2199 13.257C12.7189 13.7567 12.7176 14.5677 13.2173 15.0687L18.6728 20.5409L13.1724 25.9824C12.6689 26.4808 12.665 27.2906 13.1621 27.7941C13.4133 28.0478 13.7425 28.1746 14.0731 28.1746C14.3985 28.1746 14.724 28.0504 14.9738 27.8044L20.4819 22.3565L26.0348 27.9274C26.2847 28.1785 26.6127 28.3041 26.942 28.3041C27.27 28.3041 27.5967 28.1785 27.8465 27.9299C28.3475 27.4302 28.3488 26.6205 27.8491 26.1182L22.3039 20.5551Z" fill="black"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_91_4039">
|
||||
<rect width="41" height="41" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
10
static/home/normalChargeIcon.svg
Normal file
10
static/home/normalChargeIcon.svg
Normal file
@ -0,0 +1,10 @@
|
||||
<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="icon-切换-蓝" clip-path="url(#clip0_91_3483)">
|
||||
<path id="Vector" d="M19.905 13.5843H3.09521C2.59883 13.5843 2.19678 13.9864 2.19678 14.4828C2.19678 14.6715 2.25518 14.8467 2.354 14.9904C2.39668 15.0915 2.46182 15.1858 2.54268 15.2689L6.50254 19.2265C6.67773 19.4017 6.90684 19.4893 7.13818 19.4893C7.36953 19.4893 7.59863 19.4017 7.77383 19.2265C8.12422 18.8761 8.12422 18.3079 7.77383 17.9552L5.19531 15.3812H19.9027C20.3991 15.3812 20.8012 14.9792 20.8012 14.4828C20.8012 13.9864 20.4014 13.5843 19.905 13.5843ZM3.09521 9.4156H19.905C20.4014 9.4156 20.8034 9.01355 20.8034 8.51716C20.8034 8.32849 20.745 8.1533 20.6462 8.00955C20.6147 7.93542 20.5698 7.86355 20.5159 7.79617L17.2771 3.83855C16.9626 3.45447 16.3966 3.39831 16.0125 3.71277C15.6284 4.02722 15.5723 4.59324 15.8867 4.97732L18.0497 7.61873H3.09521C2.59883 7.61873 2.19678 8.02078 2.19678 8.51716C2.19678 9.01355 2.59883 9.4156 3.09521 9.4156Z" fill="#0077FF"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_91_3483">
|
||||
<rect width="23" height="23" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
5
static/home/rightRow.svg
Normal file
5
static/home/rightRow.svg
Normal file
@ -0,0 +1,5 @@
|
||||
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="icon- >-绿">
|
||||
<path id="Vector" d="M3.44434 17.7777C3.44434 17.4444 3.55545 17.1111 3.77767 16.8888L10.9999 10.7777C11.111 10.5555 11.2221 10.4444 11.2221 10.1111C11.2221 9.99995 11.111 9.66661 10.9999 9.5555L3.88878 3.11106C3.44434 2.66661 3.44434 1.99995 3.77767 1.5555C4.22211 1.11106 4.88878 1.11106 5.33323 1.44439L12.4443 7.88884C13.111 8.44439 13.4443 9.33328 13.4443 10.2222C13.4443 11.1111 12.9999 11.8888 12.3332 12.5555L5.22211 18.6666C4.77767 19.1111 4.111 18.9999 3.66656 18.5555C3.55545 18.3333 3.44434 17.9999 3.44434 17.7777Z" fill="#07C160"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 694 B |
6
unpackage/dist/build/app-plus/app-service.js
vendored
6
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/build/app-plus/app-view.js
vendored
2
unpackage/dist/build/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/build/app-plus/manifest.json
vendored
2
unpackage/dist/build/app-plus/manifest.json
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,4 +1,4 @@
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
}
|
||||
@ -98,6 +98,29 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
|
||||
var components
|
||||
try {
|
||||
components = {
|
||||
uniPopup: function () {
|
||||
return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 625))
|
||||
},
|
||||
}
|
||||
} catch (e) {
|
||||
if (
|
||||
e.message.indexOf("Cannot find module") !== -1 &&
|
||||
e.message.indexOf(".vue") !== -1
|
||||
) {
|
||||
console.error(e.message)
|
||||
console.error("1. 排查组件名称拼写是否正确")
|
||||
console.error(
|
||||
"2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
|
||||
)
|
||||
console.error(
|
||||
"3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
|
||||
)
|
||||
} else {
|
||||
throw e
|
||||
}
|
||||
}
|
||||
var render = function () {
|
||||
var _vm = this
|
||||
var _h = _vm.$createElement
|
||||
@ -180,7 +203,7 @@ var _default = {
|
||||
return {
|
||||
cards: [],
|
||||
// isLoading: true,
|
||||
normalLen: 7,
|
||||
normalLen: 8,
|
||||
nowIndex: -1,
|
||||
isShow: false,
|
||||
saveCarText: ["皖", "A", "", "", "", "", "", ""],
|
||||
@ -228,7 +251,10 @@ var _default = {
|
||||
frontLicenseCard: "",
|
||||
// 行驶证正面
|
||||
reverseLicenseCard: "" // 行驶证反面
|
||||
} // 三证的图片数据
|
||||
},
|
||||
|
||||
// 三证的图片数据
|
||||
popupType: 0 // 上传证件类型
|
||||
};
|
||||
},
|
||||
|
||||
@ -240,15 +266,99 @@ var _default = {
|
||||
CustomLoading: CustomLoading
|
||||
},
|
||||
methods: {
|
||||
// 重新上传
|
||||
handleUploadAgain: function handleUploadAgain() {
|
||||
// 身份证正面
|
||||
if (this.popupType === 1) {
|
||||
this.submitImg('1', '1');
|
||||
} else if (this.popupType === 2) {
|
||||
// 身份证反面
|
||||
this.submitImg('1', '2');
|
||||
} else if (this.popupType === 3) {
|
||||
// 驾驶证主页
|
||||
this.submitImg('2', '1');
|
||||
} else if (this.popupType === 4) {
|
||||
// 驾驶证副页
|
||||
this.submitImg('2', '2');
|
||||
} else if (this.popupType === 5) {
|
||||
// 行驶证主页
|
||||
this.submitImg('3', '1');
|
||||
} else if (this.popupType === 6) {
|
||||
// 行驶证副页
|
||||
this.submitImg('3', '2');
|
||||
}
|
||||
},
|
||||
// 预览图片
|
||||
handlePriview: function handlePriview() {
|
||||
uni.previewImage({
|
||||
current: 0,
|
||||
// 当前显示图片的http链接
|
||||
urls: [this.popupType === 1 ? this.codeImgObj.frontIDCard : this.popupType === 2 ? this.codeImgObj.reverseIDcard : this.popupType === 3 ? this.codeImgObj.frontDriverCard : this.popupType === 4 ? this.codeImgObj.reverseDriverCard : this.popupType === 5 ? this.codeImgObj.frontLicenseCard : this.popupType === 6 ? this.codeImgObj.reverseLicenseCard : ""] // 需要预览的图片http链接列表
|
||||
});
|
||||
},
|
||||
// 点击立即上传 唤起悬浮框
|
||||
handleShowUplodaPopup: function handleShowUplodaPopup(value) {
|
||||
console.log('valuevaluevaluevalue', value);
|
||||
// this.popupType = value
|
||||
// this.$refs.uploadPopup.open('center')
|
||||
|
||||
// 判断是否显示编辑的抽屉
|
||||
var isShowDetail = false;
|
||||
if (value === 1 && this.codeImgObj.frontIDCard) {
|
||||
isShowDetail = true;
|
||||
} else if (value === 2 && this.codeImgObj.reverseIDcard) {
|
||||
isShowDetail = true;
|
||||
} else if (value === 3 && this.codeImgObj.frontDriverCard) {
|
||||
isShowDetail = true;
|
||||
} else if (value === 4 && this.codeImgObj.reverseDriverCard) {
|
||||
isShowDetail = true;
|
||||
} else if (value === 5 && this.codeImgObj.frontLicenseCard) {
|
||||
isShowDetail = true;
|
||||
} else if (value === 6 && this.codeImgObj.reverseLicenseCard) {
|
||||
isShowDetail = true;
|
||||
}
|
||||
if (isShowDetail) {
|
||||
this.popupType = value;
|
||||
this.$refs.uploadPopup.open('center');
|
||||
} else {
|
||||
// 身份证正面
|
||||
if (value === 1) {
|
||||
this.submitImg('1', '1');
|
||||
} else if (value === 2) {
|
||||
// 身份证反面
|
||||
this.submitImg('1', '2');
|
||||
} else if (value === 3) {
|
||||
// 驾驶证主页
|
||||
this.submitImg('2', '1');
|
||||
} else if (value === 4) {
|
||||
// 驾驶证副页
|
||||
this.submitImg('2', '2');
|
||||
} else if (value === 5) {
|
||||
// 行驶证主页
|
||||
this.submitImg('3', '1');
|
||||
} else if (value === 6) {
|
||||
// 行驶证副页
|
||||
this.submitImg('3', '2');
|
||||
}
|
||||
}
|
||||
console.log('this.codeInfo', this.codeInfo);
|
||||
console.log('this.codeImgObj', this.codeImgObj);
|
||||
},
|
||||
//
|
||||
handleHideUplodaPopup: function handleHideUplodaPopup() {
|
||||
this.popupType = 0;
|
||||
this.$refs.uploadPopup.close();
|
||||
},
|
||||
// 切换汽车类型 会增加会减少车牌号
|
||||
handleChangeCar: function handleChangeCar() {
|
||||
if (this.carType === 1) {
|
||||
this.carType = 2;
|
||||
this.normalLen = 8;
|
||||
// this.normalLen = 8
|
||||
} else {
|
||||
this.carType = 1;
|
||||
this.normalLen = 7;
|
||||
// this.normalLen = 7
|
||||
}
|
||||
|
||||
this.$forceUpdate();
|
||||
},
|
||||
// 修改绑定类型
|
||||
@ -432,6 +542,10 @@ var _default = {
|
||||
// );
|
||||
}
|
||||
case 22:
|
||||
console.log('_this.codeImgObj', _this2.codeImgObj);
|
||||
|
||||
// _this.$forceUpdate();
|
||||
case 23:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
@ -541,6 +655,9 @@ var _default = {
|
||||
// );
|
||||
}
|
||||
case 22:
|
||||
console.log('_this.codeImgObj', _this2.codeImgObj);
|
||||
// _this.$forceUpdate();
|
||||
case 23:
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
}
|
||||
@ -635,7 +752,7 @@ var _default = {
|
||||
}
|
||||
uni.showToast({
|
||||
title: "".concat(type === 1 ? "身份证" : type === 2 ? "驾驶证" : type === 3 ? "行驶证" : "", "\u8BC6\u522B\u5931\u8D25\uFF01\u8BF7\u91CD\u65B0\u4E0A\u4F20"),
|
||||
icon: "none"
|
||||
icon: "error"
|
||||
});
|
||||
_this3.isLoading = false;
|
||||
return _context3.abrupt("return", false);
|
||||
@ -682,7 +799,7 @@ var _default = {
|
||||
case 34:
|
||||
uni.showToast({
|
||||
title: "身份证识别失败，请重新上传！",
|
||||
icon: "none"
|
||||
icon: "error"
|
||||
});
|
||||
_this3.isLoading = false;
|
||||
return _context3.abrupt("return", false);
|
||||
@ -714,7 +831,7 @@ var _default = {
|
||||
case 48:
|
||||
uni.showToast({
|
||||
title: "身份证识别失败，请重新上传！",
|
||||
icon: "none"
|
||||
icon: "error"
|
||||
});
|
||||
_this3.isLoading = false;
|
||||
return _context3.abrupt("return", false);
|
||||
@ -771,7 +888,7 @@ var _default = {
|
||||
case 62:
|
||||
uni.showToast({
|
||||
title: "驾驶证识别失败，请重新上传！",
|
||||
icon: "none"
|
||||
icon: "error"
|
||||
});
|
||||
_this3.isLoading = false;
|
||||
return _context3.abrupt("return", false);
|
||||
@ -794,7 +911,7 @@ var _default = {
|
||||
case 72:
|
||||
uni.showToast({
|
||||
title: "驾驶证识别失败，请重新上传！",
|
||||
icon: "none"
|
||||
icon: "error"
|
||||
});
|
||||
_this.isLoading = false;
|
||||
return _context3.abrupt("return", false);
|
||||
@ -858,7 +975,7 @@ var _default = {
|
||||
case 84:
|
||||
uni.showToast({
|
||||
title: "行驶证识别失败，请重新上传！",
|
||||
icon: "none"
|
||||
icon: "error"
|
||||
});
|
||||
_this3.isLoading = false;
|
||||
return _context3.abrupt("return", false);
|
||||
@ -877,7 +994,7 @@ var _default = {
|
||||
case 94:
|
||||
uni.showToast({
|
||||
title: "行驶证识别失败，请重新上传！",
|
||||
icon: "none"
|
||||
icon: "error"
|
||||
});
|
||||
_this3.isLoading = false;
|
||||
return _context3.abrupt("return", false);
|
||||
@ -896,7 +1013,7 @@ var _default = {
|
||||
handleConfirmCode: function handleConfirmCode() {
|
||||
var _this4 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
var _this, carText, reg, careg, isOk, code, vehicleInfo, imgObj;
|
||||
var _this, carText, reg, careg, isOk, imgObj;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
@ -940,99 +1057,124 @@ var _default = {
|
||||
return _context4.abrupt("return");
|
||||
case 15:
|
||||
console.log('carTextcarTextcarTextcarTextcarText', carText);
|
||||
return _context4.abrupt("return");
|
||||
case 22:
|
||||
if (_this4.codeImgObj.frontDriverCard) {
|
||||
_context4.next = 25;
|
||||
break;
|
||||
}
|
||||
// || !this.codeImgObj.reverseDriverCard
|
||||
uni.showModal({
|
||||
title: "温馨提示",
|
||||
content: "请上传身份证！",
|
||||
showCancel: false
|
||||
});
|
||||
return _context4.abrupt("return");
|
||||
case 25:
|
||||
if (_this4.codeImgObj.frontLicenseCard) {
|
||||
_context4.next = 28;
|
||||
break;
|
||||
}
|
||||
// || !this.codeImgObj.reverseLicenseCard
|
||||
uni.showModal({
|
||||
title: "温馨提示",
|
||||
content: "请上传身份证！",
|
||||
showCancel: false
|
||||
});
|
||||
return _context4.abrupt("return");
|
||||
case 28:
|
||||
if (!(_this4.codeInfo.vehicleInfo.PLATE_NUMBER !== _this4.saveCarText.toString().replace(/,/g, ""))) {
|
||||
_context4.next = 31;
|
||||
break;
|
||||
}
|
||||
uni.showModal({
|
||||
title: "温馨提示",
|
||||
content: "\u884C\u9A76\u8BC1\u8F66\u724C\u53F7\u4E0E\u7ED1\u5B9A\u8F66\u724C\u53F7\u4E0D\u4E00\u81F4\uFF01",
|
||||
showCancel: false
|
||||
});
|
||||
return _context4.abrupt("return", false);
|
||||
case 31:
|
||||
// if (!(this.IDCardImgList && this.IDCardImgList.length > 0)) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传身份证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
isOk = true; // if (this.bindCarType === 2) {
|
||||
// // 暂时把非身份证的副页 都设置为不必填
|
||||
// if (!this.codeImgObj.frontIDCard || !this.codeImgObj.reverseIDcard) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传身份证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!this.codeImgObj.frontDriverCard) {
|
||||
// // || !this.codeImgObj.reverseDriverCard
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传身份证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!this.codeImgObj.frontLicenseCard) {
|
||||
// // || !this.codeImgObj.reverseLicenseCard
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传身份证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// // // 判断身份证和驾驶证 身份证号、名字 是否一致
|
||||
// // if (this.codeInfo.cardInfoCode.IDCARDINFO_CODE && this.codeInfo.drivingInfo.LICENSE_NUMBER && this.codeInfo.drivingInfo.LICENSE_NUMBER === this.codeInfo.cardInfoCode.IDCARDINFO_CODE ||
|
||||
// // this.codeInfo.cardInfoCode.IDCARDINFO_NAME && this.codeInfo.drivingInfo.IDCARDINFO_CODE && this.codeInfo.drivingInfo.IDCARDINFO_CODE === this.codeInfo.cardInfoCode.IDCARDINFO_NAME) {
|
||||
// // } else {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: "驾驶证和身份证信息不一致，请重新上传",
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return false;
|
||||
// // }
|
||||
// // // 比较 驾驶证的准驾车型 和 行驶证的车辆类型 是否一致
|
||||
// // const vehicleType = this.codeInfo.vehicleInfo.VEHICLE_TYPE || '';
|
||||
// // const approvedType = this.codeInfo.drivingInfo.LICENSE_TYPE || '';
|
||||
// // const requiredLicenseTypes = this.getRequiredLicenseTypes(vehicleType);
|
||||
// // if (requiredLicenseTypes && requiredLicenseTypes.length > 0) {
|
||||
// // if (!requiredLicenseTypes.includes(approvedType)) {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: `驾驶证准驾车型（${approvedType}）不符合驾驶车辆（${vehicleType}）的要求`,
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return false;
|
||||
// // }
|
||||
// // } else {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: `未知车型！`,
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return false;
|
||||
// // }
|
||||
// if (
|
||||
// this.codeInfo.vehicleInfo.PLATE_NUMBER !==
|
||||
// this.saveCarText.toString().replace(/,/g, "")
|
||||
// ) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: `行驶证车牌号与绑定车牌号不一致！`,
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return false;
|
||||
// }
|
||||
// // if (!(this.IDCardImgList && this.IDCardImgList.length > 0)) {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: "请上传身份证！",
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return;
|
||||
// // }
|
||||
// // if (!(this.driverLicenseList && this.driverLicenseList.length > 0)) {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: "请上传驾驶证！",
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return;
|
||||
// // }
|
||||
// // if (!(this.drivingLicenseList && this.drivingLicenseList.length > 0)) {
|
||||
// // uni.showModal({
|
||||
// // title: "温馨提示",
|
||||
// // content: "请上传行驶证！",
|
||||
// // showCancel: false,
|
||||
// // });
|
||||
// // return;
|
||||
// // }
|
||||
// this.isLoading = true;
|
||||
// console.log("this.codeInfothis.codeInfothis.codeInfo", this.codeInfo);
|
||||
// isOk = await this.handleSaveAllCarInfo();
|
||||
// } else {
|
||||
// let code = this.saveCarText.toString().replace(/,/g, "");
|
||||
// const vehicleInfo = await this.$api.$post(
|
||||
// "/EShangApiMain/Member/SynchroVEHICLELICENSE",
|
||||
// {
|
||||
// PLATE_NUMBER: code,
|
||||
// STAFF_NAME: "", //
|
||||
// VEHICLELICENSE_STATE: 1,
|
||||
// OPERATE_DATE: this.$moment.now().format("YYYY-MM-DD HH:mm:ss"), //
|
||||
// }
|
||||
// );
|
||||
// if (vehicleInfo.Result_Code !== 100) {
|
||||
// uni.showToast({
|
||||
// title: "存储失败！",
|
||||
// icon: "none",
|
||||
// });
|
||||
// isOk = false;
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
|
||||
// if (!(this.driverLicenseList && this.driverLicenseList.length > 0)) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传驾驶证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!(this.drivingLicenseList && this.drivingLicenseList.length > 0)) {
|
||||
// uni.showModal({
|
||||
// title: "温馨提示",
|
||||
// content: "请上传行驶证！",
|
||||
// showCancel: false,
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
_this4.isLoading = true;
|
||||
console.log("this.codeInfothis.codeInfothis.codeInfo", _this4.codeInfo);
|
||||
_context4.next = 35;
|
||||
return _this4.handleSaveAllCarInfo();
|
||||
case 35:
|
||||
isOk = _context4.sent;
|
||||
_context4.next = 46;
|
||||
break;
|
||||
case 38:
|
||||
code = _this4.saveCarText.toString().replace(/,/g, "");
|
||||
_context4.next = 41;
|
||||
return _this4.$api.$post("/EShangApiMain/Member/SynchroVEHICLELICENSE", {
|
||||
PLATE_NUMBER: code,
|
||||
STAFF_NAME: "",
|
||||
//
|
||||
VEHICLELICENSE_STATE: 1,
|
||||
OPERATE_DATE: _this4.$moment.now().format("YYYY-MM-DD HH:mm:ss") //
|
||||
});
|
||||
case 41:
|
||||
vehicleInfo = _context4.sent;
|
||||
if (!(vehicleInfo.Result_Code !== 100)) {
|
||||
_context4.next = 46;
|
||||
break;
|
||||
}
|
||||
uni.showToast({
|
||||
title: "存储失败！",
|
||||
icon: "none"
|
||||
});
|
||||
isOk = false;
|
||||
return _context4.abrupt("return", false);
|
||||
case 46:
|
||||
// 图片的上传对象格式
|
||||
// let imgObj = {
|
||||
// IDCardImgList: _this.IDCardImgList,
|
||||
@ -1077,7 +1219,7 @@ var _default = {
|
||||
});
|
||||
}
|
||||
_this4.isLoading = false;
|
||||
case 50:
|
||||
case 21:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
@ -1310,6 +1452,9 @@ var _default = {
|
||||
},
|
||||
focusInput: function focusInput(value) {
|
||||
console.log('focusInputfocusInputfocusInputfocusInputfocusInput', value);
|
||||
if (value === 7 && this.carType === 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 判断第一个 有没有值 有值了的话 就显示数字键盘 没值的话 就显示中文键盘
|
||||
if (value === 0) {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{
|
||||
"navigationBarTitleText": "绑定车辆",
|
||||
"usingComponents": {
|
||||
"uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
|
||||
"keyboard": "/components/keyboard",
|
||||
"custom-loading": "/components/customLoading"
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -48,31 +48,44 @@
|
||||
width: calc(100% - 64rpx);
|
||||
height: 206rpx;
|
||||
background: #ffffff;
|
||||
border-radius: 6rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-left: 32rpx;
|
||||
-webkit-transform: translateY(-60rpx);
|
||||
transform: translateY(-60rpx);
|
||||
box-sizing: border-box;
|
||||
padding: 40rpx 26rpx;
|
||||
padding: 28rpx 32rpx;
|
||||
}
|
||||
.main .codeBox .carTypeChange.data-v-1cc19d5c {
|
||||
width: 100%;
|
||||
height: 30rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.main .codeBox .carTypeChange .carTypeLeft .typeName.data-v-1cc19d5c {
|
||||
font-weight: 400;
|
||||
font-size: 30rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
.main .codeBox .carTypeChange .carTypeRight.data-v-1cc19d5c {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.main .codeBox .carTypeChange .changeIcon.data-v-1cc19d5c {
|
||||
.main .codeBox .carTypeChange .carTypeRight .changeIcon.data-v-1cc19d5c {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.main .codeBox .carTypeChange .carType.data-v-1cc19d5c {
|
||||
.main .codeBox .carTypeChange .carTypeRight .carType.data-v-1cc19d5c {
|
||||
color: #ba922f;
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
text-align: center;
|
||||
font-size: 24rpx;
|
||||
color: #0077FF;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
.main .codeBox .input-box.data-v-1cc19d5c {
|
||||
@ -97,6 +110,14 @@
|
||||
.main .codeBox .input-box .input-f .show-input.data-v-1cc19d5c {
|
||||
font-size: 34rpx;
|
||||
}
|
||||
.main .codeBox .input-box .input-f .disabledBox.data-v-1cc19d5c {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.main .codeBox .input-box .input-f .disabled.data-v-1cc19d5c {
|
||||
background-color: #F6F6F6;
|
||||
}
|
||||
.main .codeBox .input-box .input-f .text-sm.data-v-1cc19d5c {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -119,7 +140,7 @@
|
||||
background: #f5f6f7;
|
||||
}
|
||||
.main .codeBox .input-box .orangeRedBorder.data-v-1cc19d5c {
|
||||
border: 1px solid orange;
|
||||
border: 1px solid #07C160;
|
||||
}
|
||||
.main .codeBox .input-box .lastBox.data-v-1cc19d5c {
|
||||
background: #f5f6f7;
|
||||
@ -133,15 +154,15 @@
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
height: 88rpx;
|
||||
padding: 14rpx 0;
|
||||
color: #ffffff;
|
||||
line-height: 44rpx;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
width: calc(100% - 64rpx);
|
||||
margin-left: 32rpx;
|
||||
background: #ba922f;
|
||||
border-radius: 6rpx;
|
||||
background: #07C160;
|
||||
border-radius: 10rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@ -173,18 +194,66 @@
|
||||
border-top-right-radius: 32rpx;
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
}
|
||||
.main .bindPopup .popupTitle.data-v-1cc19d5c {
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
.main .bindPopup .fileItem.data-v-1cc19d5c {
|
||||
margin-bottom: 24rpx;
|
||||
background-color: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 26rpx 32rpx;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
.main .bindPopup .fileItem .itemTitle.data-v-1cc19d5c {
|
||||
font-family: "PingFangSC";
|
||||
font-weight: 400;
|
||||
font-size: 32rpx;
|
||||
font-size: 28rpx;
|
||||
line-height: 44rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.main .bindPopup .fileItem .newUploadImgBox .imgItem.data-v-1cc19d5c {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 20rpx 22rpx;
|
||||
background: #F6F6F6;
|
||||
border-radius: 6rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.main .bindPopup .fileItem .newUploadImgBox .imgItem .leftText.data-v-1cc19d5c {
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: rgba(0, 0, 0, 0.3);
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
.main .bindPopup .fileItem .newUploadImgBox .imgItem .rightBox.data-v-1cc19d5c {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.main .bindPopup .fileItem .newUploadImgBox .imgItem .rightBox .rightText.data-v-1cc19d5c {
|
||||
font-weight: 400;
|
||||
font-size: 24rpx;
|
||||
color: #07C160;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
.main .bindPopup .fileItem .newUploadImgBox .imgItem .rightBox .rightIcon.data-v-1cc19d5c {
|
||||
width: 20rpx;
|
||||
height: 20rpx;
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
.main .bindPopup .fileItem .uploadImgBox.data-v-1cc19d5c {
|
||||
width: 100%;
|
||||
margin-top: 16rpx;
|
||||
@ -328,4 +397,49 @@ page.data-v-1cc19d5c {
|
||||
justify-content: center;
|
||||
line-height: 1.5;
|
||||
}
|
||||
.uploadBox.data-v-1cc19d5c {
|
||||
width: calc(100vw - 64rpx);
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 10rpx;
|
||||
position: relative;
|
||||
}
|
||||
.uploadBox .closeIcon.data-v-1cc19d5c {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
position: absolute;
|
||||
top: 20rpx;
|
||||
right: 20rpx;
|
||||
}
|
||||
.uploadBox .uploadTitle.data-v-1cc19d5c {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #000000;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
.uploadBox .imgBox.data-v-1cc19d5c {
|
||||
width: 100%;
|
||||
height: calc(100vw - 64rpx);
|
||||
border-radius: 10rpx;
|
||||
margin-top: 42rpx;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
}
|
||||
.uploadBox .uploadAgain.data-v-1cc19d5c {
|
||||
width: 100%;
|
||||
border-radius: 10rpx;
|
||||
background-color: #07C160;
|
||||
box-sizing: border-box;
|
||||
padding: 14rpx;
|
||||
font-weight: 400;
|
||||
font-size: 30rpx;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
margin-top: 36rpx;
|
||||
}
|
||||
|
||||
|
||||
@ -269,7 +269,7 @@ var _default = {
|
||||
_this.$utils.barc("barcode", code, _this.barcodeWidth, _this.barcodeHeight);
|
||||
|
||||
// _this.$utils.barc('barcode2', code, _this.qrcodeHeight2, 160, 90)
|
||||
_this.$utils.qrc("qrcode", code, _this.qrcodeHeight, _this.qrcodeHeight, null, "../../..https://eshangtech.com/wanmeiyizhanImg/home/YDIconWhiteBg.png");
|
||||
_this.$utils.qrc("qrcode", code, _this.qrcodeHeight, _this.qrcodeHeight, null, "https://eshangtech.com/wanmeiyizhanImg/home/YDIconWhiteBg.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({
|
||||
@ -365,13 +365,21 @@ var _default = {
|
||||
}).then(function (res) {
|
||||
if (res.Result_Code === 100) {
|
||||
_this.couponlist = res.Result_Data.List;
|
||||
console.log('_this.couponlist_this.couponlist_this.couponlist', _this.couponlist);
|
||||
if (_this.cid) {
|
||||
var id = Number(_this.cid);
|
||||
var index = res.Result_Data.List.findIndex(function (n) {
|
||||
return id === n.CouponSendId;
|
||||
res.Result_Data.List.forEach(function (item, index) {
|
||||
if (item.CouponId === id) {
|
||||
_this.choeseCouponIndex = index;
|
||||
}
|
||||
});
|
||||
_this.choeseCouponIndex = index;
|
||||
|
||||
// let index = res.Result_Data.List.findIndex(
|
||||
// (n) => id === n.CouponSendId
|
||||
// );
|
||||
}
|
||||
|
||||
console.log('_this.choeseCouponIndex_this.choeseCouponIndex_this.choeseCouponIndex_this.choeseCouponIndex', _this.choeseCouponIndex);
|
||||
}
|
||||
_this2.isLoading = false;
|
||||
});
|
||||
|
||||
@ -248,6 +248,7 @@ var _default = {
|
||||
action_type: "GetGoodsDetail",
|
||||
commodityId: _this.pageMsg.goodId
|
||||
}).then(function (res) {
|
||||
console.log('resresresresresresresresresresresresresresresres', res);
|
||||
_this.good = res.Data;
|
||||
_this.pageMsg.current = 0;
|
||||
_this.pageMsg.imgeCount = res.Data.List.length || 0;
|
||||
@ -281,6 +282,7 @@ var _default = {
|
||||
pageIndex: 1,
|
||||
pageSize: 3
|
||||
}).then(function (res) {
|
||||
console.log('resresresresresresresresres', res);
|
||||
_this.rateList = res.Data.List;
|
||||
_this.pageMsg.rateTotal = res.Data.TotalCount;
|
||||
});
|
||||
|
||||
@ -98,23 +98,52 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
|
||||
var components
|
||||
try {
|
||||
components = {
|
||||
uniRate: function () {
|
||||
return __webpack_require__.e(/*! import() | uni_modules/uni-rate/components/uni-rate/uni-rate */ "uni_modules/uni-rate/components/uni-rate/uni-rate").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-rate/components/uni-rate/uni-rate.vue */ 646))
|
||||
},
|
||||
}
|
||||
} catch (e) {
|
||||
if (
|
||||
e.message.indexOf("Cannot find module") !== -1 &&
|
||||
e.message.indexOf(".vue") !== -1
|
||||
) {
|
||||
console.error(e.message)
|
||||
console.error("1. 排查组件名称拼写是否正确")
|
||||
console.error(
|
||||
"2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
|
||||
)
|
||||
console.error(
|
||||
"3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
|
||||
)
|
||||
} else {
|
||||
throw e
|
||||
}
|
||||
}
|
||||
var render = function () {
|
||||
var _vm = this
|
||||
var _h = _vm.$createElement
|
||||
var _c = _vm._self._c || _h
|
||||
var g0 = _vm.shopList && _vm.shopList.length > 0
|
||||
var g0 = _vm.onShowTypeList && _vm.onShowTypeList.length > 0
|
||||
var l0 = g0
|
||||
? _vm.__map(_vm.shopList, function (item, index) {
|
||||
? _vm.__map(_vm.onShowTypeList, function (item, index) {
|
||||
var $orig = _vm.__get_orig(item)
|
||||
var g1 = _vm.shopList.length
|
||||
var g2 = _vm.shopList.length
|
||||
var g3 = item.CouponList && item.CouponList.length > 0
|
||||
var g4 = g3
|
||||
? item.SCANCODE_ORDER === 1 &&
|
||||
item.CouponList &&
|
||||
item.CouponList.length > 0
|
||||
var g3 = !(item.SCANCODE_ORDER === 1)
|
||||
? item.GOODSLIST && item.GOODSLIST.length > 0
|
||||
: null
|
||||
var g5 =
|
||||
var g4 =
|
||||
item.GOODSLIST &&
|
||||
item.GOODSLIST.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
var g5 = false ? undefined : null
|
||||
var g6 =
|
||||
false
|
||||
? undefined
|
||||
: null
|
||||
var g7 =
|
||||
item.GoodsList &&
|
||||
item.GoodsList.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
@ -125,10 +154,12 @@ var render = function () {
|
||||
g3: g3,
|
||||
g4: g4,
|
||||
g5: g5,
|
||||
g6: g6,
|
||||
g7: g7,
|
||||
}
|
||||
})
|
||||
: null
|
||||
var g6 = !g0 ? _vm.shopList && _vm.shopList.length > 0 : null
|
||||
var g8 = !g0 ? _vm.shopList && _vm.shopList.length > 0 : null
|
||||
if (!_vm._isMounted) {
|
||||
_vm.e0 = function (val) {
|
||||
return (_vm.isLoading = val)
|
||||
@ -140,7 +171,7 @@ var render = function () {
|
||||
$root: {
|
||||
g0: g0,
|
||||
l0: l0,
|
||||
g6: g6,
|
||||
g8: g8,
|
||||
},
|
||||
}
|
||||
)
|
||||
@ -439,10 +470,17 @@ var _default = {
|
||||
}
|
||||
console.log("allList", allList);
|
||||
}
|
||||
console.log('listlistlistlist', list);
|
||||
allList.unshift(list);
|
||||
if (allList && allList.length > 0) {
|
||||
// 各种业态类型的二维数组
|
||||
this.allTypeList = allList;
|
||||
this.onShowTypeList = allList[this.selectTypeTab];
|
||||
// 添加上全部的分类
|
||||
tabList.unshift({
|
||||
label: "全部",
|
||||
value: "0"
|
||||
});
|
||||
this.selectTypeList = tabList;
|
||||
console.log("this.allTypeList", this.allTypeList);
|
||||
console.log("this.allTypeLonShowTypeListist", this.onShowTypeList);
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
"navigationBarTitleText": "预约点餐",
|
||||
"navigationStyle": "custom",
|
||||
"usingComponents": {
|
||||
"uni-rate": "/uni_modules/uni-rate/components/uni-rate/uni-rate",
|
||||
"no-data": "/components/noData",
|
||||
"current-service": "/components/currentService",
|
||||
"custom-loading": "/components/customLoading"
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -92,19 +92,18 @@
|
||||
overflow-x: auto;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
border-bottom: 1px solid #dddcdc;
|
||||
margin-top: 16rpx;
|
||||
height: 30px;
|
||||
}
|
||||
.main .newTabList .newTabItem.data-v-c850b6c4 {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #716f69;
|
||||
color: #C6C6C6;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
padding: 0 50rpx 12rpx 50rpx;
|
||||
white-space: nowrap;
|
||||
padding: 0 40rpx;
|
||||
}
|
||||
.main .newTabList .selectTabItem.data-v-c850b6c4 {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
@ -119,9 +118,9 @@
|
||||
.main .newTabList .selectTabItem.data-v-c850b6c4:after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
width: 2rem;
|
||||
height: 4rpx;
|
||||
background: #ba922f;
|
||||
background: #009DFF;
|
||||
bottom: 0;
|
||||
left: 50%;
|
||||
-webkit-transform: translateX(-50%);
|
||||
@ -148,19 +147,108 @@
|
||||
align-items: flex-start;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopImg.data-v-c850b6c4 {
|
||||
width: 136rpx;
|
||||
height: 136rpx;
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
overflow: hidden;
|
||||
border-radius: 8rpx;
|
||||
margin-right: 24rpx;
|
||||
border-radius: 16rpx;
|
||||
margin-right: 28rpx;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopImg .shopIcon.data-v-c850b6c4 {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail.data-v-c850b6c4 {
|
||||
width: calc(100% - 136rpx);
|
||||
position: relative;
|
||||
width: calc(100% - 158rpx);
|
||||
height: 130rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailLeft.data-v-c850b6c4 {
|
||||
width: calc(100% - 150rpx);
|
||||
height: 130rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailLeft .detailLeftTop .topShopName.data-v-c850b6c4 {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 29rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailLeft .detailLeftBottom .scoreBox.data-v-c850b6c4 {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailLeft .detailLeftBottom .newOtherDetail.data-v-c850b6c4 {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
margin-top: 12rpx;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailLeft .detailLeftBottom .newOtherDetail .label.data-v-c850b6c4 {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: rgba(0, 0, 0, 0.5);
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
display: inline-block;
|
||||
width: 50rpx;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailLeft .detailLeftBottom .newOtherDetail .value.data-v-c850b6c4 {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #009DFF;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
display: inline-block;
|
||||
width: 70rpx;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailRight.data-v-c850b6c4 {
|
||||
width: 150rpx;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailRight .goFood.data-v-c850b6c4 {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
padding: 4rpx 28rpx;
|
||||
background-color: #FF6200;
|
||||
border-radius: 32rpx;
|
||||
display: inline-block;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopDetailRight .search.data-v-c850b6c4 {
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
padding: 4rpx 28rpx;
|
||||
background-color: #009DFF;
|
||||
border-radius: 32rpx;
|
||||
display: inline-block;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopItemTop .shopDetail .shopName.data-v-c850b6c4 {
|
||||
width: 100%;
|
||||
@ -315,11 +403,11 @@
|
||||
margin-right: 16rpx;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopList .shopItem .shopImgBox.data-v-c850b6c4 {
|
||||
width: 168rpx;
|
||||
height: 128rpx;
|
||||
width: 146rpx;
|
||||
height: 96rpx;
|
||||
overflow: hidden;
|
||||
border-radius: 12rpx;
|
||||
margin-bottom: 8rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-bottom: 12rpx;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopList .shopItem .shopImgBox .shopImg.data-v-c850b6c4 {
|
||||
width: 100%;
|
||||
@ -330,19 +418,18 @@
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
font-family: "PingFangSC";
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #130f05;
|
||||
line-height: 32rpx;
|
||||
text-align: justify;
|
||||
font-size: 24rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
.main .shopListBox .shopItemBox .shopList .shopItem .itemPrice .itemUnit.data-v-c850b6c4 {
|
||||
font-family: "DINAlternate";
|
||||
font-weight: bold;
|
||||
font-size: 24rpx;
|
||||
color: #130f05;
|
||||
font-size: 20rpx;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
@ -350,7 +437,7 @@
|
||||
font-family: "DINAlternate";
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #130f05;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@ -168,10 +168,15 @@ var render = function () {
|
||||
var g11 = !(item.SCANCODE_ORDER === 1)
|
||||
? item.GOODSLIST && item.GOODSLIST.length > 0
|
||||
: null
|
||||
var g12 =
|
||||
item.GOODSLIST &&
|
||||
item.GOODSLIST.length > 0 &&
|
||||
item.SCANCODE_ORDER === 1
|
||||
return {
|
||||
$orig: $orig,
|
||||
g10: g10,
|
||||
g11: g11,
|
||||
g12: g12,
|
||||
}
|
||||
})
|
||||
: null
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1173,11 +1173,11 @@
|
||||
margin-right: 16rpx;
|
||||
}
|
||||
.main .content .popularMerchants .newShopUnit .shopList .shopItem .shopImgBox.data-v-49dced80 {
|
||||
width: 168rpx;
|
||||
height: 168rpx;
|
||||
width: 146rpx;
|
||||
height: 96rpx;
|
||||
overflow: hidden;
|
||||
border-radius: 12rpx;
|
||||
margin-bottom: 8rpx;
|
||||
border-radius: 10rpx;
|
||||
margin-bottom: 12rpx;
|
||||
}
|
||||
.main .content .popularMerchants .newShopUnit .shopList .shopItem .shopImgBox .shopImg.data-v-49dced80 {
|
||||
width: 100%;
|
||||
@ -1188,19 +1188,18 @@
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
font-family: "PingFangSC";
|
||||
font-family: "Microsoft YaHei";
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
color: #130f05;
|
||||
line-height: 32rpx;
|
||||
text-align: justify;
|
||||
font-size: 24rpx;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
.main .content .popularMerchants .newShopUnit .shopList .shopItem .itemPrice .itemUnit.data-v-49dced80 {
|
||||
font-family: "DINAlternate";
|
||||
font-weight: bold;
|
||||
font-size: 24rpx;
|
||||
color: #130f05;
|
||||
font-size: 20rpx;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
@ -1208,7 +1207,7 @@
|
||||
font-family: "DINAlternate";
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #130f05;
|
||||
color: #FF6200;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
17
unpackage/dist/dev/mp-weixin/project.config.json
vendored
17
unpackage/dist/dev/mp-weixin/project.config.json
vendored
@ -1,8 +1,7 @@
|
||||
{
|
||||
"description": "项目配置文件。",
|
||||
"packOptions": {
|
||||
"ignore": [],
|
||||
"include": []
|
||||
"ignore": []
|
||||
},
|
||||
"setting": {
|
||||
"urlCheck": false,
|
||||
@ -10,16 +9,10 @@
|
||||
"postcss": false,
|
||||
"minified": false,
|
||||
"newFeature": true,
|
||||
"bigPackageSizeSupport": true,
|
||||
"ignoreUploadUnusedFiles": true,
|
||||
"babelSetting": {
|
||||
"ignore": [],
|
||||
"disablePlugins": [],
|
||||
"outputPath": ""
|
||||
}
|
||||
"bigPackageSizeSupport": true
|
||||
},
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "3.8.1",
|
||||
"libVersion": "",
|
||||
"appid": "wx4c497eddcec4a0e7",
|
||||
"projectname": "驿佳",
|
||||
"condition": {
|
||||
@ -39,9 +32,5 @@
|
||||
"current": -1,
|
||||
"list": []
|
||||
}
|
||||
},
|
||||
"editorSetting": {
|
||||
"tabIndent": "insertSpaces",
|
||||
"tabSize": 2
|
||||
}
|
||||
}
|
||||
@ -7,34 +7,6 @@
|
||||
"condition": {
|
||||
"miniprogram": {
|
||||
"list": [
|
||||
{
|
||||
"name": "pages/shopPages/shop/index",
|
||||
"pathName": "pages/shopPages/shop/index",
|
||||
"query": "id=3880&mid=882&province=340000&buyType=1",
|
||||
"launchMode": "default",
|
||||
"scene": null
|
||||
},
|
||||
{
|
||||
"name": "pages/serviceDetail/index",
|
||||
"pathName": "pages/serviceDetail/index",
|
||||
"query": "id=418&come=chargeBox",
|
||||
"launchMode": "default",
|
||||
"scene": null
|
||||
},
|
||||
{
|
||||
"name": "pages/memberBenefits/index",
|
||||
"pathName": "pages/memberBenefits/index",
|
||||
"query": "",
|
||||
"launchMode": "default",
|
||||
"scene": null
|
||||
},
|
||||
{
|
||||
"name": "pages/login/index",
|
||||
"pathName": "pages/login/index",
|
||||
"query": "",
|
||||
"launchMode": "default",
|
||||
"scene": null
|
||||
},
|
||||
{
|
||||
"name": "pages/homeFn/mycar/index",
|
||||
"pathName": "pages/homeFn/mycar/index",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user