update
This commit is contained in:
ylj20011123
parent
8796b77e5e
commit
b39018e90a
@ -28,7 +28,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="tabItem" @click="goPages('/pages/shopMallPage/shopCar/index')">
|
<div class="tabItem" @click="goPages('/pages/shopMallPage/shopCar/index')">
|
||||||
<span class="shopCarNumber" v-if="shopCount > 0"
|
<span class="shopCarNumber" v-if="shopCount > 0"
|
||||||
:style="{ background: pageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E' }">{{ shopCount
|
:style="{ background: pageType === 'UnionMall' ? '#4BCB7E' : '#4BCB7E' }">{{ shopCount
|
||||||
}}</span>
|
}}</span>
|
||||||
|
|
||||||
<image class="tabItemIcon" :src="selectIndex === '/pages/shopMallPage/shopCar/index'
|
<image class="tabItemIcon" :src="selectIndex === '/pages/shopMallPage/shopCar/index'
|
||||||
|
|||||||
@ -3,36 +3,61 @@
|
|||||||
@scrolltolower="handleScrollBottom" :style="{
|
@scrolltolower="handleScrollBottom" :style="{
|
||||||
backgroundImage:
|
backgroundImage:
|
||||||
pageType === 'UnionMall'
|
pageType === 'UnionMall'
|
||||||
? ''
|
? 'url(https://eshangtech.com/minTestImg/pageBg.png)'
|
||||||
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
||||||
}">
|
}">
|
||||||
|
<div class="meng" v-if="showExportFun" @click="handleHideExportFun"></div>
|
||||||
|
|
||||||
|
|
||||||
<div id="navItem" class="header" :style="{
|
<div id="navItem" class="header" :style="{
|
||||||
paddingTop: menu.top + menu.height + 'px',
|
paddingTop: menu.top + menu.height + 'px',
|
||||||
backgroundImage:
|
backgroundImage:
|
||||||
pageType === 'UnionMall'
|
pageType === 'UnionMall'
|
||||||
? 'url(https://eshangtech.com/minTestImg/unionMallBg.png)'
|
? 'url(https://eshangtech.com/minTestImg/pageBg.png)'
|
||||||
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
||||||
backgroundSize:
|
backgroundSize:
|
||||||
pageType === 'UnionMall' ? '100% 480rpx' : '100% 100vh',
|
pageType === 'UnionMall' ? '100% 100vh' : '100% 100vh',
|
||||||
paddingBottom: '16rpx'
|
paddingBottom: '16rpx'
|
||||||
}">
|
}">
|
||||||
<view class="headerTop" :style="{
|
<view class="headerTop" :style="{
|
||||||
height: menu.top + menu.height + 'px',
|
height: menu.height + menu.top + 4 + 'px',
|
||||||
paddingTop: menu.top + 'px',
|
paddingTop: menu.top + 'px',
|
||||||
|
paddingBottom: 4 + 'px',
|
||||||
backgroundImage:
|
backgroundImage:
|
||||||
pageType === 'UnionMall'
|
pageType === 'UnionMall'
|
||||||
? 'url(https://eshangtech.com/minTestImg/unionMallBg.png)'
|
? 'url(https://eshangtech.com/minTestImg/pageBg.png)'
|
||||||
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
: 'url(https://eshangtech.com/minTestImg/pageBg.png)',
|
||||||
backgroundSize:
|
backgroundSize:
|
||||||
pageType === 'UnionMall' ? '100% 480rpx' : '100% 100vh',
|
pageType === 'UnionMall' ? '100% 100vh' : '100% 100vh',
|
||||||
}">
|
}">
|
||||||
|
<view class="backArrowBox">
|
||||||
<image class="backArrow"
|
<image class="backArrow"
|
||||||
:src="pageType === 'UnionMall' ? '/static/images/home/backArrowWhite.svg' : '/static/images/home/backArrowblack.svg'"
|
:src="pageType === 'UnionMall' ? '/static/images/home/backArrowblack.svg' : '/static/images/home/backArrowblack.svg'"
|
||||||
@click="handleBackHome" />
|
@click="handleBackHome" />
|
||||||
<view class="pageName" :style="{ color: pageType === 'UnionMall' ? '' : '#000' }">{{
|
<view class="line"></view>
|
||||||
|
<!-- <image class="img" src="/static/images/home/export.svg" @click="handleShowExportBox" /> -->
|
||||||
|
<image class="img" style="width: 40rpx;height: 40rpx;margin-left: 8rpx;"
|
||||||
|
src="https://eshangtech.com/cyy_DIB/backHomeICon.png" @click="handleShowExportBox" />
|
||||||
|
</view>
|
||||||
|
<!-- <image class="backArrow"
|
||||||
|
:src="pageType === 'UnionMall' ? '/static/images/home/backArrowWhite.svg' : '/static/images/home/backArrowblack.svg'"
|
||||||
|
@click="handleBackHome" /> -->
|
||||||
|
<view class="pageName" :style="{ color: pageType === 'UnionMall' ? '#000' : '#000' }">{{
|
||||||
pageType === "UnionMall" ? "工会之家" : "彩云驿商城"
|
pageType === "UnionMall" ? "工会之家" : "彩云驿商城"
|
||||||
}}</view>
|
}}</view>
|
||||||
<view class="backArrow"></view>
|
<view class="backArrowBox"></view>
|
||||||
|
|
||||||
|
<view class="moreFunBox" :style="{ top: showExportObj.y + 20 + 'px' }" v-if="showExportFun">
|
||||||
|
<view class="triangle"></view>
|
||||||
|
<view class="funList">
|
||||||
|
<view class="funItem" v-for="(item, index) in funList" :key="index" @click="handleExpentGo(item)">
|
||||||
|
<image class="funItemIcon" :src="item.src" />
|
||||||
|
<text class="funItemText" :style="{
|
||||||
|
border: index + 1 === funList.length ? 'none' : '',
|
||||||
|
}">{{ item.label }}</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<scroll-view class="typeBox" scroll-x>
|
<scroll-view class="typeBox" scroll-x>
|
||||||
@ -152,7 +177,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 活动 -->
|
<!-- 活动 -->
|
||||||
<div class="advertisement" v-if="haveActivity" :style="{
|
<div class="advertisement" v-if="haveActivity && false" :style="{
|
||||||
background: pageType !== 'UnionMall' ? '#fff' : 'transparent',
|
background: pageType !== 'UnionMall' ? '#fff' : 'transparent',
|
||||||
marginTop: 0
|
marginTop: 0
|
||||||
}">
|
}">
|
||||||
@ -712,7 +737,15 @@ export default {
|
|||||||
activityObj: {}, // 活动项的具体内容
|
activityObj: {}, // 活动项的具体内容
|
||||||
activityShopList: [], // 活动商品列表
|
activityShopList: [], // 活动商品列表
|
||||||
priceRangeRefShow: false,
|
priceRangeRefShow: false,
|
||||||
popupBottom: 0 // 键盘高度
|
popupBottom: 0, // 键盘高度
|
||||||
|
showExportFun: false, // 显示展开的悬浮框
|
||||||
|
showExportObj: {
|
||||||
|
x: "", y: ""
|
||||||
|
},
|
||||||
|
funList: [
|
||||||
|
{ label: "商城首页", src: "" },
|
||||||
|
{ label: "", src: "" },
|
||||||
|
]
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -835,9 +868,20 @@ export default {
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
handleHideExportFun() {
|
||||||
|
this.showExportFun = false
|
||||||
|
},
|
||||||
|
// 显示展开功能
|
||||||
|
handleShowExportBox(e) {
|
||||||
|
uni.switchTab({
|
||||||
|
url: "/pages/index/index"
|
||||||
|
})
|
||||||
|
// console.log('e', e);
|
||||||
|
// this.showExportFun = !this.showExportFun;
|
||||||
|
// this.showExportObj = e.detail
|
||||||
|
},
|
||||||
handleFocus(e) {
|
handleFocus(e) {
|
||||||
console.log('eee', e);
|
console.log('eee', e);
|
||||||
|
|
||||||
// 安卓 / iOS 可能不一样，可以用 e.detail.height 获取键盘高度
|
// 安卓 / iOS 可能不一样，可以用 e.detail.height 获取键盘高度
|
||||||
this.popupBottom = 200 // 默认抬高
|
this.popupBottom = 200 // 默认抬高
|
||||||
},
|
},
|
||||||
@ -1711,6 +1755,15 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background: #f2f4f5;
|
background: #f2f4f5;
|
||||||
|
|
||||||
|
.meng {
|
||||||
|
width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
z-index: 9999;
|
||||||
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
@ -1738,6 +1791,89 @@ export default {
|
|||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: 100% 300rpx;
|
background-size: 100% 300rpx;
|
||||||
|
|
||||||
|
.backArrowBox {
|
||||||
|
width: 120rpx;
|
||||||
|
background: rgba(255, 255, 255, 0.6);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: 32rpx;
|
||||||
|
border: 1px solid #d9d5cc;
|
||||||
|
padding: 4rpx 16rpx;
|
||||||
|
|
||||||
|
.backArrow {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.line {
|
||||||
|
width: 2rpx;
|
||||||
|
height: 32rpx;
|
||||||
|
background: #bbbbba;
|
||||||
|
margin: 0 8rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.img {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.moreFunBox {
|
||||||
|
width: 220rpx;
|
||||||
|
height: 220rpx;
|
||||||
|
background: #fff;
|
||||||
|
border-radius: 16rpx;
|
||||||
|
position: absolute;
|
||||||
|
z-index: 10;
|
||||||
|
left: 50rpx;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 12rpx 0 12rpx 16rpx;
|
||||||
|
|
||||||
|
.triangle {
|
||||||
|
position: absolute;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
|
border-left: 5px solid transparent;
|
||||||
|
/* 左边透明 */
|
||||||
|
border-right: 5px solid transparent;
|
||||||
|
/* 右边透明 */
|
||||||
|
border-bottom: 10px solid #fff;
|
||||||
|
/* 底边颜色 */
|
||||||
|
top: -10px;
|
||||||
|
left: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.funList {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
|
||||||
|
.funItem {
|
||||||
|
width: 100%;
|
||||||
|
height: 70rpx;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
.funItemIcon {
|
||||||
|
width: 30rpx;
|
||||||
|
height: 30rpx;
|
||||||
|
margin-right: 20rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.funItemText {
|
||||||
|
width: calc(100% - 50rpx);
|
||||||
|
height: 100%;
|
||||||
|
display: inline-block;
|
||||||
|
font-size: 26rpx;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
border-bottom: 1px solid #dad6cb;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.backArrow {
|
.backArrow {
|
||||||
width: 48rpx;
|
width: 48rpx;
|
||||||
height: 48rpx;
|
height: 48rpx;
|
||||||
@ -1845,11 +1981,13 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
min-height: 214rpx;
|
min-height: 214rpx;
|
||||||
padding: 30rpx;
|
padding: 30rpx;
|
||||||
|
background-image: url("https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/Special Offers.png");
|
||||||
background: linear-gradient(180deg,
|
background-repeat: no-repeat;
|
||||||
rgba(230, 240, 255, 1) 0%,
|
background-size: 100% 100%;
|
||||||
rgba(255, 255, 255, 1) 50%,
|
// background: linear-gradient(180deg,
|
||||||
#ffffff 100%);
|
// rgba(230, 240, 255, 1) 0%,
|
||||||
|
// rgba(255, 255, 255, 1) 50%,
|
||||||
|
// #ffffff 100%);
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@ -2,7 +2,15 @@
|
|||||||
<view class="main">
|
<view class="main">
|
||||||
<div class="mainTop" :style="{ paddingTop: menu.top + 'px' }">
|
<div class="mainTop" :style="{ paddingTop: menu.top + 'px' }">
|
||||||
<view class="headerTop" :style="{ height: menu.height + 'px' }">
|
<view class="headerTop" :style="{ height: menu.height + 'px' }">
|
||||||
|
<view class="backArrowBox">
|
||||||
<image class="backArrow" src="/static/images/home/backArrowblack.svg" @click="handleBackHome" />
|
<image class="backArrow" src="/static/images/home/backArrowblack.svg" @click="handleBackHome" />
|
||||||
|
<view class="line"></view>
|
||||||
|
<!-- <image class="img" src="/static/images/home/export.svg" @click="handleShowExportBox" /> -->
|
||||||
|
<image class="img" style="width: 40rpx;height: 40rpx;margin-left: 8rpx;"
|
||||||
|
src="https://eshangtech.com/cyy_DIB/backHomeICon.png" @click="handleShowExportBox" />
|
||||||
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<view class="pageName">{{
|
<view class="pageName">{{
|
||||||
bigPageType === "UnionMall" ? "工会之家" : "购物车"
|
bigPageType === "UnionMall" ? "工会之家" : "购物车"
|
||||||
}}</view>
|
}}</view>
|
||||||
@ -66,11 +74,12 @@
|
|||||||
<div class="detailLeft">
|
<div class="detailLeft">
|
||||||
<view style="display: flex">
|
<view style="display: flex">
|
||||||
<!-- color="#1890FF" -->
|
<!-- color="#1890FF" -->
|
||||||
|
<!-- #E43C3D -->
|
||||||
<radio v-if="pageType === 'normal'" :checked="item.select"
|
<radio v-if="pageType === 'normal'" :checked="item.select"
|
||||||
:color="bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E'" @click="handleChangeSelect(item)">
|
:color="bigPageType === 'UnionMall' ? '#4BCB7E' : '#4BCB7E'" @click="handleChangeSelect(item)">
|
||||||
</radio>
|
</radio>
|
||||||
<radio v-else :checked="item.selectDelete"
|
<radio v-else :checked="item.selectDelete"
|
||||||
:color="bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E'" @click="handleChangeDelete(item)">
|
:color="bigPageType === 'UnionMall' ? '#4BCB7E' : '#4BCB7E'" @click="handleChangeDelete(item)">
|
||||||
</radio>
|
</radio>
|
||||||
<!-- 因为购物车是根据缓存里面的数据来的 缓存的数据 可能是通过 详情加入到购物车 也有从列表直接加入到购物车 而两个地方的数据源 不一样 所以区图片的字段也需要修改 -->
|
<!-- 因为购物车是根据缓存里面的数据来的 缓存的数据 可能是通过 详情加入到购物车 也有从列表直接加入到购物车 而两个地方的数据源 不一样 所以区图片的字段也需要修改 -->
|
||||||
<image class="leftIcon" :src="item.IMAGE_PATH ? item.IMAGE_PATH.split(',') && item.IMAGE_PATH.split(',').length > 1 ? item.IMAGE_PATH.split(',')[0] : item.IMAGE_PATH :
|
<image class="leftIcon" :src="item.IMAGE_PATH ? item.IMAGE_PATH.split(',') && item.IMAGE_PATH.split(',').length > 1 ? item.IMAGE_PATH.split(',')[0] : item.IMAGE_PATH :
|
||||||
@ -142,11 +151,11 @@
|
|||||||
|
|
||||||
<div class="bottom" :style="{ bottom: `${50 + safeHeight}px` }">
|
<div class="bottom" :style="{ bottom: `${50 + safeHeight}px` }">
|
||||||
<div class="bottomLeft" v-if="pageType === 'normal'">
|
<div class="bottomLeft" v-if="pageType === 'normal'">
|
||||||
<radio :checked="isAllSelect" :color="bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E'"
|
<radio :checked="isAllSelect" :color="bigPageType === 'UnionMall' ? '#4BCB7E' : '#4BCB7E'"
|
||||||
@click="handleAllSelect" />全选
|
@click="handleAllSelect" />全选
|
||||||
</div>
|
</div>
|
||||||
<div class="bottomLeft" v-else>
|
<div class="bottomLeft" v-else>
|
||||||
<radio :checked="isAllDelete" :color="bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E'"
|
<radio :checked="isAllDelete" :color="bigPageType === 'UnionMall' ? '#4BCB7E' : '#4BCB7E'"
|
||||||
@click="handleAllDelete" />全选
|
@click="handleAllDelete" />全选
|
||||||
</div>
|
</div>
|
||||||
<div class="bottomRight" v-if="pageType === 'normal'">
|
<div class="bottomRight" v-if="pageType === 'normal'">
|
||||||
@ -154,10 +163,10 @@
|
|||||||
<text class="sumPrice">￥</text>
|
<text class="sumPrice">￥</text>
|
||||||
<text class="sunNumber">{{ totalPay }}</text>
|
<text class="sunNumber">{{ totalPay }}</text>
|
||||||
<div class="submitBtn" @click="goPayFn"
|
<div class="submitBtn" @click="goPayFn"
|
||||||
:style="{ background: bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E' }">立即下单</div>
|
:style="{ background: bigPageType === 'UnionMall' ? '#4BCB7E' : '#4BCB7E' }">立即下单</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="deleteBtn"
|
<div v-else class="deleteBtn"
|
||||||
:style="{ background: bigPageType === 'UnionMall' ? '#F6CFCC' : '#E7F8EE', color: bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E' }"
|
:style="{ background: bigPageType === 'UnionMall' ? '#E7F8EE' : '#E7F8EE', color: bigPageType === 'UnionMall' ? '#4BCB7E' : '#4BCB7E' }"
|
||||||
@click="handleDelete">删除</div>
|
@click="handleDelete">删除</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -330,6 +339,15 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 显示展开功能
|
||||||
|
handleShowExportBox(e) {
|
||||||
|
uni.switchTab({
|
||||||
|
url: "/pages/index/index"
|
||||||
|
})
|
||||||
|
// console.log('e', e);
|
||||||
|
// this.showExportFun = !this.showExportFun;
|
||||||
|
// this.showExportObj = e.detail
|
||||||
|
},
|
||||||
// 点击地址
|
// 点击地址
|
||||||
handleClickAddressItem(obj) {
|
handleClickAddressItem(obj) {
|
||||||
if (!obj.MEMBERADDRESS_CODE) {
|
if (!obj.MEMBERADDRESS_CODE) {
|
||||||
@ -916,6 +934,34 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
|
.backArrowBox {
|
||||||
|
width: 120rpx;
|
||||||
|
background: rgba(255, 255, 255, 0.6);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: 32rpx;
|
||||||
|
border: 1px solid #d9d5cc;
|
||||||
|
padding: 4rpx 16rpx;
|
||||||
|
|
||||||
|
.backArrow {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.line {
|
||||||
|
width: 2rpx;
|
||||||
|
height: 32rpx;
|
||||||
|
background: #bbbbba;
|
||||||
|
margin: 0 8rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.img {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.backArrow {
|
.backArrow {
|
||||||
width: 48rpx;
|
width: 48rpx;
|
||||||
height: 48rpx;
|
height: 48rpx;
|
||||||
|
|||||||
@ -1,14 +1,25 @@
|
|||||||
<template>
|
<template>
|
||||||
<view :class="pageType === 'UnionMall' ? 'main' : 'main newMain'">
|
<view :class="pageType === 'UnionMall' ? 'main newMain' : 'main newMain'">
|
||||||
<div class="header" :style="{ paddingTop: menu.top + 'px' }">
|
<div class="header" :style="{ paddingTop: menu.top + 'px' }">
|
||||||
<view class="headerTop" :style="{ height: menu.height + 'px' }">
|
<view class="headerTop" :style="{ height: menu.height + 'px' }">
|
||||||
|
<view class="backArrowBox">
|
||||||
<image class="backArrow"
|
<image class="backArrow"
|
||||||
:src="pageType === 'UnionMall' ? '/static/images/home/backArrowWhite.svg' : '/static/images/home/backArrowblack.svg'"
|
:src="pageType === 'UnionMall' ? '/static/images/home/backArrowblack.svg' : '/static/images/home/backArrowblack.svg'"
|
||||||
@click="handleBackHome" />
|
@click="handleBackHome" />
|
||||||
<view class="pageName" :style="{ color: pageType === 'UnionMall' ? '' : '#000' }">{{
|
<view class="line"></view>
|
||||||
|
<!-- <image class="img" src="/static/images/home/export.svg" @click="handleShowExportBox" /> -->
|
||||||
|
<image class="img" style="width: 40rpx;height: 40rpx;margin-left: 8rpx;"
|
||||||
|
src="https://eshangtech.com/cyy_DIB/backHomeICon.png" @click="handleShowExportBox" />
|
||||||
|
</view>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- <image class="backArrow"
|
||||||
|
:src="pageType === 'UnionMall' ? '/static/images/home/backArrowblack.svg' : '/static/images/home/backArrowblack.svg'"
|
||||||
|
@click="handleBackHome" /> -->
|
||||||
|
<view class="pageName" :style="{ color: pageType === 'UnionMall' ? '#000' : '#000' }">{{
|
||||||
pageType === "UnionMall" ? "工会之家" : "分类"
|
pageType === "UnionMall" ? "工会之家" : "分类"
|
||||||
}}</view>
|
}}</view>
|
||||||
<view class="backArrow"></view>
|
<view class="backArrowBox"></view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- <div class="pageTitle" :style="{ height: menu.height + 'px', lineHeight: menu.height + 'px' }">分类</div> -->
|
<!-- <div class="pageTitle" :style="{ height: menu.height + 'px', lineHeight: menu.height + 'px' }">分类</div> -->
|
||||||
@ -26,7 +37,7 @@
|
|||||||
}px)`,
|
}px)`,
|
||||||
}">
|
}">
|
||||||
<scroll-view class="bigTabBox" scroll-x :scroll-into-view="bigTypeScroll"
|
<scroll-view class="bigTabBox" scroll-x :scroll-into-view="bigTypeScroll"
|
||||||
:style="{ background: pageType === 'UnionMall' ? '' : 'transparent' }">
|
:style="{ background: pageType === 'UnionMall' ? 'transparent' : 'transparent' }">
|
||||||
<div class="scrollBox">
|
<div class="scrollBox">
|
||||||
<!-- :style="{ width: (shopTypeList.length + 2) * 70 + 'px' }" -->
|
<!-- :style="{ width: (shopTypeList.length + 2) * 70 + 'px' }" -->
|
||||||
|
|
||||||
@ -144,7 +155,7 @@
|
|||||||
<div class="addReduceBox" v-else>
|
<div class="addReduceBox" v-else>
|
||||||
<div class="reduceShopCar" @click.stop="touchReduce($event, item)" v-if="item.showReduce">
|
<div class="reduceShopCar" @click.stop="touchReduce($event, item)" v-if="item.showReduce">
|
||||||
<img class="optionBtn"
|
<img class="optionBtn"
|
||||||
:src="pageType === 'UnionMall' ? '/static/images/home/newReduce2.png' : '/static/images/home/newReduce.png'" />
|
:src="pageType === 'UnionMall' ? '/static/images/home/newReduce.png' : '/static/images/home/newReduce.png'" />
|
||||||
</div>
|
</div>
|
||||||
<span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span>
|
<span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span>
|
||||||
<div v-if="item.COMMODITY_STOCK > 0" class="addShopCar" @click.stop="touchOnGoods($event, item)"
|
<div v-if="item.COMMODITY_STOCK > 0" class="addShopCar" @click.stop="touchOnGoods($event, item)"
|
||||||
@ -154,7 +165,7 @@
|
|||||||
item.SELLERCOMMODITYTYPE_ID
|
item.SELLERCOMMODITYTYPE_ID
|
||||||
">
|
">
|
||||||
<img class="optionBtn"
|
<img class="optionBtn"
|
||||||
:src="pageType === 'UnionMall' ? '/static/images/home/newAddIcon2.png' : '/static/images/home/newAddIcon.png'" />
|
:src="pageType === 'UnionMall' ? '/static/images/home/newAddIcon.png' : '/static/images/home/newAddIcon.png'" />
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="shopState">已售罄</div>
|
<div v-else class="shopState">已售罄</div>
|
||||||
</div>
|
</div>
|
||||||
@ -499,6 +510,15 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
// 显示展开功能
|
||||||
|
handleShowExportBox(e) {
|
||||||
|
uni.switchTab({
|
||||||
|
url: "/pages/index/index"
|
||||||
|
})
|
||||||
|
// console.log('e', e);
|
||||||
|
// this.showExportFun = !this.showExportFun;
|
||||||
|
// this.showExportObj = e.detail
|
||||||
|
},
|
||||||
// 因为有增加和减少商品 所以要更新显示区域内的商品数据
|
// 因为有增加和减少商品 所以要更新显示区域内的商品数据
|
||||||
handleUpDataShop(newVal) {
|
handleUpDataShop(newVal) {
|
||||||
if (this.visibleList && this.visibleList.length > 0) {
|
if (this.visibleList && this.visibleList.length > 0) {
|
||||||
@ -1562,6 +1582,34 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
|
.backArrowBox {
|
||||||
|
width: 120rpx;
|
||||||
|
background: rgba(255, 255, 255, 0.6);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: 32rpx;
|
||||||
|
border: 1px solid #d9d5cc;
|
||||||
|
padding: 4rpx 16rpx;
|
||||||
|
|
||||||
|
.backArrow {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.line {
|
||||||
|
width: 2rpx;
|
||||||
|
height: 32rpx;
|
||||||
|
background: #bbbbba;
|
||||||
|
margin: 0 8rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.img {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.backArrow {
|
.backArrow {
|
||||||
width: 48rpx;
|
width: 48rpx;
|
||||||
height: 48rpx;
|
height: 48rpx;
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="main">
|
<view class="main">
|
||||||
|
|
||||||
<view class="fixedHeader" :style="{ height: menu.bottom + 16 + 'px' }">
|
<view class="fixedHeader" :style="{ height: menu.bottom + 16 + 'px' }">
|
||||||
<image class="YDIcon" src="/static/images/home/yunnanLogo.svg" />
|
<image class="YDIcon" src="/static/images/home/yunnanLogo.svg" />
|
||||||
</view>
|
</view>
|
||||||
@ -27,27 +28,33 @@
|
|||||||
<view class="userInfoLeft">
|
<view class="userInfoLeft">
|
||||||
<view class="userInfoLeftTop">
|
<view class="userInfoLeftTop">
|
||||||
<view class="userName">{{ inShop === 2 ? (userInfo.MEMBERSHIP_NAME ||
|
<view class="userName">{{ inShop === 2 ? (userInfo.MEMBERSHIP_NAME ||
|
||||||
user.MEMBERSHIP_NAME || "微信用户") :
|
user.MEMBERSHIP_NAME || "微信用户")
|
||||||
|
:
|
||||||
(userInfo.Membership_NickName || userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME ||
|
(userInfo.Membership_NickName || userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME ||
|
||||||
"未填写名称") }}</view>
|
"未填写名称") }}
|
||||||
|
</view>
|
||||||
|
<view class="userLevelBox" style="width: 100%;">
|
||||||
<view class="userLevel">
|
<view class="userLevel">
|
||||||
<image class="userLevelIcon"
|
<image class="userLevelIcon"
|
||||||
src="https://eshangtech.com/caiyunyiImg/levelIcon2.png" />
|
src="https://eshangtech.com/caiyunyiImg/levelIcon2.png" />
|
||||||
<view class="userLevelName">{{ user.MEMBERSHIP_LEVEL_TEXT || "" }}</view>
|
<view class="userLevelName">{{ user.MEMBERSHIP_LEVEL_TEXT || "" }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="userSetting" @click="hanldGoConfig">
|
|
||||||
<image class="userSettingIcon"
|
|
||||||
src="https://eshangtech.com/caiyunyiImg/userSettingIcon.png" />
|
|
||||||
</view>
|
</view>
|
||||||
|
<!-- <view class="userSetting" @click="hanldGoConfig">
|
||||||
|
<image class="userSettingIcon" src="https://eshangtech.com/caiyunyiImg/userSettingIcon.png" />
|
||||||
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
<view class="userInfoLeftBottom">
|
<!-- <view class="userInfoLeftBottom">
|
||||||
|
<view class="userInfoLeftBottomItem">
|
||||||
<view class="bindCarBox" @click="handleGoBindCar">{{ cards ? cards : "未绑定爱车" }}</view>
|
<view class="bindCarBox" @click="handleGoBindCar">{{ cards ? cards : "未绑定爱车" }}</view>
|
||||||
|
</view>
|
||||||
|
<view class="userInfoLeftBottomItem">
|
||||||
<view class="userCollect" @click="handleGoCollect">我的收藏</view>
|
<view class="userCollect" @click="handleGoCollect">我的收藏</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="userInfoRight" @click="handleGoUserCode">
|
<view class="userInfoRight" @click="handleGoUserCode">
|
||||||
<!-- <image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userCodeImg.png" /> -->
|
|
||||||
<image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userInfoCode.png" />
|
<image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userInfoCode.png" />
|
||||||
<view class="userCodeText">会员码</view>
|
<view class="userCodeText">会员码</view>
|
||||||
</view>
|
</view>
|
||||||
@ -78,13 +85,46 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- {{ showErrorText || "" }} -->
|
<!-- {{ showErrorText || "" }} -->
|
||||||
|
|
||||||
<view class="pageContent">
|
<view class="pageContent">
|
||||||
|
|
||||||
|
<!-- 基础按钮 -->
|
||||||
|
<view class="basicBox">
|
||||||
|
<view class="userOrderTop">
|
||||||
|
<view class="userOrderTitle">我的服务</view>
|
||||||
|
</view>
|
||||||
|
<view class="basicBoxContent">
|
||||||
|
<view class="basicItem" @click="handleGoCollect">
|
||||||
|
<image class="basicItemImg" src="https://eshangtech.com/caiyunyiImg/productCollection.png" />
|
||||||
|
<view class="basicText">商品收藏</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="basicItem" @click="handleGoNormal({ value: 1 })">
|
||||||
|
<image class="basicItemImg" src="https://eshangtech.com/caiyunyiImg/MemberBenefitsIcon.png" />
|
||||||
|
<view class="basicText">会员权益</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="basicItem" @click="handleGoBindCar">
|
||||||
|
<image class="basicItemImg" src="https://eshangtech.com/caiyunyiImg/bindCarIcon.png" />
|
||||||
|
<view class="basicText">绑定车辆</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="basicItem" @click="handleGoNormal({ value: 3 })">
|
||||||
|
<image class="basicItemImg"
|
||||||
|
src="https://eshangtech.com/caiyunyiImg/suggestionFeedbackIcon.png" />
|
||||||
|
<view class="basicText">建议反馈</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="basicItem" @click="hanldGoConfig">
|
||||||
|
<image class="basicItemImg" src="https://eshangtech.com/caiyunyiImg/configIcon.png" />
|
||||||
|
<view class="basicText">设置</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
<!-- 我的订单 -->
|
<!-- 我的订单 -->
|
||||||
<view class="userOrder">
|
<view class="userOrder">
|
||||||
<view class="userOrderTop" @click="handleGoOrder(0, '')">
|
<view class="userOrderTop" @click="handleGoOrder(0, '')">
|
||||||
@ -94,30 +134,30 @@
|
|||||||
|
|
||||||
<view class="userOrderBottom">
|
<view class="userOrderBottom">
|
||||||
<view class="userOrderBottomItem" @click="handleGoOrder(1, '')">
|
<view class="userOrderBottomItem" @click="handleGoOrder(1, '')">
|
||||||
<img class="userOrderBottomItemImg" src="https://eshangtech.com/caiyunyiImg/orderStatus1.png" />
|
<img class="userOrderBottomItemImg" src="/static/images/home/obligationIcon.svg" />
|
||||||
<view class="userOrderBottomItemText">未付款</view>
|
<view class="userOrderBottomItemText">未付款</view>
|
||||||
<view class="orderCount" v-if="mallOrderCountList[0] > 0">{{ mallOrderCountList[0] }}</view>
|
<view class="orderCount" v-if="mallOrderCountList[0] > 0">{{ mallOrderCountList[0] }}</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="userOrderBottomItem" @click="handleGoOrder(2, '')">
|
<view class="userOrderBottomItem" @click="handleGoOrder(2, '')">
|
||||||
<img class="userOrderBottomItemImg" src="https://eshangtech.com/caiyunyiImg/orderStatus2.png" />
|
<img class="userOrderBottomItemImg" src="/static/images/home/shipmentIcon.svg" />
|
||||||
<view class="userOrderBottomItemText">待发货</view>
|
<view class="userOrderBottomItemText">待发货</view>
|
||||||
<view class="orderCount" v-if="mallOrderCountList[1] > 0">{{ mallOrderCountList[1] }}</view>
|
<view class="orderCount" v-if="mallOrderCountList[1] > 0">{{ mallOrderCountList[1] }}</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="userOrderBottomItem" @click="handleGoOrder(3, '')">
|
<view class="userOrderBottomItem" @click="handleGoOrder(3, '')">
|
||||||
<img class="userOrderBottomItemImg" src="https://eshangtech.com/caiyunyiImg/orderStatus3.png" />
|
<img class="userOrderBottomItemImg" src="/static/images/home/receiptOfGoods.svg" />
|
||||||
<view class="userOrderBottomItemText">待收货</view>
|
<view class="userOrderBottomItemText">待收货</view>
|
||||||
<view class="orderCount" v-if="mallOrderCountList[2] > 0">{{ mallOrderCountList[2] }}</view>
|
<view class="orderCount" v-if="mallOrderCountList[2] > 0">{{ mallOrderCountList[2] }}</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="userOrderBottomItem" @click="handleGoOrder(4, '')">
|
<view class="userOrderBottomItem" @click="handleGoOrder(4, '')">
|
||||||
<img class="userOrderBottomItemImg" src="https://eshangtech.com/caiyunyiImg/orderStatus4.png" />
|
<img class="userOrderBottomItemImg" src="/static/images/home/evaluatedIcon.svg" />
|
||||||
<view class="userOrderBottomItemText">待评价</view>
|
<view class="userOrderBottomItemText">待评价</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="userOrderBottomItem" @click="handleGo('/pages/order/buyOrder/index?type=6')">
|
<view class="userOrderBottomItem" @click="handleGo('/pages/order/buyOrder/index?type=6')">
|
||||||
<img class="userOrderBottomItemImg" src="https://eshangtech.com/caiyunyiImg/orderStatus5.png" />
|
<img class="userOrderBottomItemImg" src="/static/images/home/afterSales.svg" />
|
||||||
<view class="userOrderBottomItemText">退换货</view>
|
<view class="userOrderBottomItemText">退换货</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -180,10 +220,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- 常用功能 -->
|
<!-- 常用功能 -->
|
||||||
<view class="oftenFunBox">
|
<view class="oftenFunBox" v-if="false">
|
||||||
<view class="ofternFunTitle">常用功能</view>
|
<view class="ofternFunTitle">常用功能</view>
|
||||||
|
|
||||||
<view class="funListBox">
|
<view class="funListBox">
|
||||||
@ -208,7 +246,7 @@
|
|||||||
<view class="customerServiceTitle">客服帮助</view>
|
<view class="customerServiceTitle">客服帮助</view>
|
||||||
|
|
||||||
<view class="customerServiceContent">
|
<view class="customerServiceContent">
|
||||||
<view class="customerServiceItem">
|
<view class="customerServiceItem" @click="handleGoCustomerService">
|
||||||
<view class="customerServiceItemTitle">客服帮助</view>
|
<view class="customerServiceItemTitle">客服帮助</view>
|
||||||
<view class="customerServiceItemContent">伴您行程无忧</view>
|
<view class="customerServiceItemContent">伴您行程无忧</view>
|
||||||
</view>
|
</view>
|
||||||
@ -219,95 +257,6 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 服务区详情 -->
|
|
||||||
<view class="serviceDetail" @click="handleGoDetail" v-if="false">
|
|
||||||
<view class="detailTop">
|
|
||||||
<view class="detailImg">
|
|
||||||
<image v-if="
|
|
||||||
serviceDetail.ImageLits && serviceDetail.ImageLits.length > 0
|
|
||||||
" class="img" :src="serviceDetail.ImageLits[0]" />
|
|
||||||
<image class="img" v-else src="/static/images/home/defaultIcon.png" />
|
|
||||||
</view>
|
|
||||||
<view class="detailRight">
|
|
||||||
<view class="detailTop">
|
|
||||||
<view class="title">{{
|
|
||||||
serviceDetail.SERVERPART_NAME || "-"
|
|
||||||
}}</view>
|
|
||||||
<view class="status">
|
|
||||||
<span class="statusText">营业中</span>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view class="detailBottom">
|
|
||||||
<span class="distance">{{ serviceDetail.SERVERPART_DISTANCE || "-" }}km</span>
|
|
||||||
<span class="addressText">{{
|
|
||||||
serviceDetail.SERVERPART_ADDRESS || "-"
|
|
||||||
}}</span>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<image @click.stop="handleGoMap" class="navigation" src="/static/images/home/navigationIcon.svg" />
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view class="detailBottom">
|
|
||||||
<view class="detailBottomItem">
|
|
||||||
|
|
||||||
<image class="detailIcon" :src="serviceDetail.haveREFUELINGGUN
|
|
||||||
? '/static/images/home/serviceGasoline.svg'
|
|
||||||
: '/static/images/home/noServiceGasoline.svg'
|
|
||||||
" />
|
|
||||||
<span class="detailText">加油站</span>
|
|
||||||
</view>
|
|
||||||
<view class="detailBottomItem">
|
|
||||||
<image class="detailIcon" :src="serviceDetail.HASCHARGE
|
|
||||||
? '/static/images/home/serviceCharge.svg'
|
|
||||||
: '/static/images/home/noServiceCharge.svg'
|
|
||||||
" />
|
|
||||||
<span class="detailText">充电桩</span>
|
|
||||||
</view>
|
|
||||||
<view class="detailBottomItem">
|
|
||||||
<image class="detailIcon" :src="serviceDetail.havePARKING
|
|
||||||
? '/static/images/home/carStop.svg'
|
|
||||||
: '/static/images/home/noCarStop.svg'
|
|
||||||
" />
|
|
||||||
<span class="detailText">停车场</span>
|
|
||||||
</view>
|
|
||||||
<view class="detailBottomItem">
|
|
||||||
<image class="detailIcon" :src="serviceDetail.haveWC
|
|
||||||
? '/static/images/home/toilet.svg'
|
|
||||||
: '/static/images/home/noToilet.svg'
|
|
||||||
" />
|
|
||||||
<span class="detailText">卫生间</span>
|
|
||||||
</view>
|
|
||||||
<view class="detailBottomItem">
|
|
||||||
<image class="detailIcon" :src="serviceDetail.HASMOTHER
|
|
||||||
? ' /static/images/home/badyHome.svg'
|
|
||||||
: '/static/images/home/noBadyHome.svg'
|
|
||||||
" />
|
|
||||||
<span class="detailText">母婴室</span>
|
|
||||||
</view>
|
|
||||||
<view class="detailBottomItem">
|
|
||||||
<image class="detailIcon" :src="serviceDetail.HASPILOTLOUNGE
|
|
||||||
? '/static/images/home/serviceDriverHome.svg'
|
|
||||||
: '/static/images/home/noServiceDriverHome.svg'
|
|
||||||
" />
|
|
||||||
<span class="detailText">司机之家</span>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view class="stateGrid">
|
|
||||||
<view class="leftGrid">
|
|
||||||
<text class="gridText">交投新能源</text>
|
|
||||||
<text class="fastCharg">快充</text>
|
|
||||||
</view>
|
|
||||||
<view class="rightGrid">
|
|
||||||
<text class="other">空</text>
|
|
||||||
<text class="have">{{ chargingObj.use || "0" }}</text>
|
|
||||||
<text class="all" v-if="chargingObj.have > 0">/{{ chargingObj.have || "0" }}</text>
|
|
||||||
<text class="all" v-else>/{{ serviceDetail.sumDetail.STATEGRIDCHARGE || "0" }}</text>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<shop-tabbar :page="`/pages/shopMallPage/user/newIndex`" :pageType="bigPageType"
|
<shop-tabbar :page="`/pages/shopMallPage/user/newIndex`" :pageType="bigPageType"
|
||||||
:shopCarLength="shopCarListCount" />
|
:shopCarLength="shopCarListCount" />
|
||||||
@ -545,6 +494,10 @@ export default {
|
|||||||
handleSaveOrderStore()
|
handleSaveOrderStore()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 跳转客服帮助
|
||||||
|
handleGoCustomerService() {
|
||||||
|
uni.navigateTo({ url: "/pages/useConfig/customerService" });
|
||||||
|
},
|
||||||
// 跳转到余额
|
// 跳转到余额
|
||||||
hanldGoBalance() {
|
hanldGoBalance() {
|
||||||
if (this.user && !this.user.MEMBERSHIP_ID || (!this.user && !this.user.MEMBERSHIP_ID)) {
|
if (this.user && !this.user.MEMBERSHIP_ID || (!this.user && !this.user.MEMBERSHIP_ID)) {
|
||||||
@ -1352,17 +1305,18 @@ export default {
|
|||||||
|
|
||||||
|
|
||||||
.userInfoLeft {
|
.userInfoLeft {
|
||||||
width: calc(100% - 82rpx);
|
// width: calc(100% - 82rpx);
|
||||||
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 16rpx 0 0 0;
|
// padding: 16rpx 0 0 0;
|
||||||
|
|
||||||
.userInfoLeftTop {
|
.userInfoLeftTop {
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
|
// display: flex;
|
||||||
|
// align-items: center;
|
||||||
.userName {
|
.userName {
|
||||||
display: inline-block;
|
display: block;
|
||||||
max-width: 160rpx;
|
max-width: 100%;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@ -1371,14 +1325,14 @@ export default {
|
|||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
color: #FFFFFF;
|
color: #FFFFFF;
|
||||||
line-height: 40rpx;
|
line-height: 40rpx;
|
||||||
text-align: right;
|
text-align: left;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
.userLevel {
|
.userLevel {
|
||||||
display: flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-left: 14rpx;
|
margin-top: 24rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 0 14rpx;
|
padding: 0 14rpx;
|
||||||
border-radius: 32rpx;
|
border-radius: 32rpx;
|
||||||
@ -1405,6 +1359,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.userSetting {
|
.userSetting {
|
||||||
width: 48rpx;
|
width: 48rpx;
|
||||||
height: 48rpx;
|
height: 48rpx;
|
||||||
@ -1420,10 +1375,11 @@ export default {
|
|||||||
|
|
||||||
.userInfoLeftBottom {
|
.userInfoLeftBottom {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin-top: 22rpx;
|
margin-top: 16rpx;
|
||||||
display: flex;
|
// display: flex;
|
||||||
align-items: center;
|
// align-items: center;
|
||||||
|
|
||||||
|
.userInfoLeftBottomItem {
|
||||||
.bindCarBox {
|
.bindCarBox {
|
||||||
font-family: PingFangSC, PingFang SC;
|
font-family: PingFangSC, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
@ -1437,6 +1393,7 @@ export default {
|
|||||||
// background-color: #D8D8D8;
|
// background-color: #D8D8D8;
|
||||||
color: #716F69;
|
color: #716F69;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.userCollect {
|
.userCollect {
|
||||||
@ -1448,22 +1405,24 @@ export default {
|
|||||||
font-style: normal;
|
font-style: normal;
|
||||||
padding: 4rpx 22rpx 2rpx 22rpx;
|
padding: 4rpx 22rpx 2rpx 22rpx;
|
||||||
border-radius: 32rpx;
|
border-radius: 32rpx;
|
||||||
margin-left: 18rpx;
|
// margin-left: 18rpx;
|
||||||
// color: #2D2D2D;
|
// color: #2D2D2D;
|
||||||
// background-color: #D8D8D8;
|
// background-color: #D8D8D8;
|
||||||
color: #716F69;
|
color: #716F69;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
display: inline-block;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
.userInfoRight {
|
.userInfoRight {
|
||||||
width: 82rpx;
|
width: 82rpx;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding-top: 18rpx;
|
// padding-top: 18rpx;
|
||||||
|
|
||||||
.userCodeImg {
|
.userCodeImg {
|
||||||
width: 82rpx;
|
width: 82rpx;
|
||||||
@ -1542,15 +1501,87 @@ export default {
|
|||||||
border-radius: 1rpx;
|
border-radius: 1rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.pageContent {
|
.pageContent {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 0 32rpx 200rpx;
|
padding: 0 32rpx 200rpx;
|
||||||
|
|
||||||
|
.basicBox {
|
||||||
|
width: 100%;
|
||||||
|
background: #FFFFFF;
|
||||||
|
border-radius: 14rpx;
|
||||||
|
margin-top: 24rpx;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 22rpx 34rpx;
|
||||||
|
|
||||||
|
.userOrderTop {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
|
.userOrderTitle {
|
||||||
|
font-family: PingFangSC, PingFang SC;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 28rpx;
|
||||||
|
color: #222222;
|
||||||
|
line-height: 40rpx;
|
||||||
|
text-align: right;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.userOrderMoreIcon {
|
||||||
|
width: 24rpx;
|
||||||
|
height: 24rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.basicBoxContent {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
margin-top: 42rpx;
|
||||||
|
|
||||||
|
.basicItem {
|
||||||
|
width: 20%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
|
||||||
|
.basicItemImg {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
margin-bottom: 16rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.basicText {
|
||||||
|
font-family: 'PingFangSC';
|
||||||
|
font-weight: 400;
|
||||||
|
font-size: 24rpx;
|
||||||
|
color: #716F69;
|
||||||
|
line-height: 36rpx;
|
||||||
|
text-align: left;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
.userOrder {
|
.userOrder {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
@ -1595,9 +1626,9 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.userOrderBottomItemImg {
|
.userOrderBottomItemImg {
|
||||||
width: 44rpx;
|
width: 48rpx;
|
||||||
height: 44rpx;
|
height: 48rpx;
|
||||||
margin-bottom: 12rpx;
|
margin-bottom: 16rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.userOrderBottomItemText {
|
.userOrderBottomItemText {
|
||||||
@ -1977,6 +2008,7 @@ export default {
|
|||||||
background: #fff;
|
background: #fff;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 22rpx 34rpx;
|
padding: 22rpx 34rpx;
|
||||||
|
border-radius: 14rpx;
|
||||||
|
|
||||||
.boxTitleTop {
|
.boxTitleTop {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
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 +1 @@
|
|||||||
<view class="main data-v-066c6722" style="{{'z-index:'+(zIndex===98?98:99999)+';'}}"><view class="content _div data-v-066c6722"><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/index/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/index/index'?'/static/images/shopTabbar/active_home.png':'/static/images/shopTabbar/home.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/index/index'?'#1890FF':'#3A3D48')+';'}}">首页</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/shopType/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/shopType/index'?'/static/images/shopTabbar/active_classification.png':'/static/images/shopTabbar/classification.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/shopType/index'?'#1890FF':'#3A3D48')+';'}}">分类</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/shopCar/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><block wx:if="{{shopCount>0}}"><label class="shopCarNumber _span data-v-066c6722" style="{{'background:'+(pageType==='UnionMall'?'#E43C3D':'#4BCB7E')+';'}}">{{shopCount}}</label></block><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/shopCar/index'?'/static/images/shopTabbar/active_shopCar.png':'/static/images/shopTabbar/shopCar.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/shopCar/index'?'#1890FF':'#3A3D48')+';'}}">购物车</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/user/newIndex']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/user/newIndex'?'/static/images/shopTabbar/active_user.png':'/static/images/shopTabbar/user.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/user/newIndex'?'#1890FF':'#3A3D48')+';'}}">我的</label></view></view></view>
|
<view class="main data-v-066c6722" style="{{'z-index:'+(zIndex===98?98:99999)+';'}}"><view class="content _div data-v-066c6722"><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/index/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/index/index'?'/static/images/shopTabbar/active_home.png':'/static/images/shopTabbar/home.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/index/index'?'#1890FF':'#3A3D48')+';'}}">首页</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/shopType/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/shopType/index'?'/static/images/shopTabbar/active_classification.png':'/static/images/shopTabbar/classification.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/shopType/index'?'#1890FF':'#3A3D48')+';'}}">分类</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/shopCar/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><block wx:if="{{shopCount>0}}"><label class="shopCarNumber _span data-v-066c6722" style="{{'background:'+(pageType==='UnionMall'?'#4BCB7E':'#4BCB7E')+';'}}">{{shopCount}}</label></block><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/shopCar/index'?'/static/images/shopTabbar/active_shopCar.png':'/static/images/shopTabbar/shopCar.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/shopCar/index'?'#1890FF':'#3A3D48')+';'}}">购物车</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/user/newIndex']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/user/newIndex'?'/static/images/shopTabbar/active_user.png':'/static/images/shopTabbar/user.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/user/newIndex'?'#1890FF':'#3A3D48')+';'}}">我的</label></view></view></view>
|
||||||
@ -125,153 +125,163 @@ var render = function () {
|
|||||||
var _vm = this
|
var _vm = this
|
||||||
var _h = _vm.$createElement
|
var _h = _vm.$createElement
|
||||||
var _c = _vm._self._c || _h
|
var _c = _vm._self._c || _h
|
||||||
var g0 = _vm.shopTypeList.length
|
var l0 = _vm.showExportFun
|
||||||
var g1 = !(g0 < 5) ? _vm.shopTypeList.length : null
|
? _vm.__map(_vm.funList, function (item, index) {
|
||||||
var g2 = !(g0 < 5) && g1 === 5 ? Math.ceil(6 / 5) : null
|
|
||||||
var g3 = !(g0 < 5) && g1 === 5 ? Math.ceil(6 / 5) : null
|
|
||||||
var g4 =
|
|
||||||
!(g0 < 5) && !(g1 === 5) ? Math.ceil(_vm.shopTypeList.length / 5) : null
|
|
||||||
var g5 =
|
|
||||||
!(g0 < 5) && !(g1 === 5) ? Math.ceil(_vm.shopTypeList.length / 5) : null
|
|
||||||
var l0 = _vm.__map(_vm.shopTypeList, function (item, index) {
|
|
||||||
var $orig = _vm.__get_orig(item)
|
var $orig = _vm.__get_orig(item)
|
||||||
|
var g0 = _vm.funList.length
|
||||||
|
return {
|
||||||
|
$orig: $orig,
|
||||||
|
g0: g0,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
: null
|
||||||
|
var g1 = _vm.shopTypeList.length
|
||||||
|
var g2 = !(g1 < 5) ? _vm.shopTypeList.length : null
|
||||||
|
var g3 = !(g1 < 5) && g2 === 5 ? Math.ceil(6 / 5) : null
|
||||||
|
var g4 = !(g1 < 5) && g2 === 5 ? Math.ceil(6 / 5) : null
|
||||||
|
var g5 =
|
||||||
|
!(g1 < 5) && !(g2 === 5) ? Math.ceil(_vm.shopTypeList.length / 5) : null
|
||||||
var g6 =
|
var g6 =
|
||||||
|
!(g1 < 5) && !(g2 === 5) ? Math.ceil(_vm.shopTypeList.length / 5) : null
|
||||||
|
var l1 = _vm.__map(_vm.shopTypeList, function (item, index) {
|
||||||
|
var $orig = _vm.__get_orig(item)
|
||||||
|
var g7 =
|
||||||
_vm.pageType === "UnionMall" &&
|
_vm.pageType === "UnionMall" &&
|
||||||
index < Math.ceil(_vm.shopTypeList.length / 4 - 1) * 4
|
index < Math.ceil(_vm.shopTypeList.length / 4 - 1) * 4
|
||||||
return {
|
return {
|
||||||
$orig: $orig,
|
$orig: $orig,
|
||||||
g6: g6,
|
g7: g7,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
var g7 =
|
var g8 =
|
||||||
_vm.haveActivity && _vm.pageType !== "UnionMall"
|
_vm.haveActivity && false && _vm.pageType !== "UnionMall"
|
||||||
? _vm.activityShopList && _vm.activityShopList.length > 0
|
? _vm.activityShopList && _vm.activityShopList.length > 0
|
||||||
: null
|
: null
|
||||||
var g8 =
|
var g9 =
|
||||||
_vm.haveActivity && _vm.pageType !== "UnionMall" && g7
|
_vm.haveActivity && false && _vm.pageType !== "UnionMall" && g8
|
||||||
? _vm.activityShopList.length
|
? _vm.activityShopList.length
|
||||||
: null
|
: null
|
||||||
var g9 =
|
var g10 =
|
||||||
_vm.pageType !== "UnionMall" && _vm.pageType !== "UnionMall"
|
_vm.pageType !== "UnionMall" && _vm.pageType !== "UnionMall"
|
||||||
? _vm.weeklySpecialOffer.slice(0, 10).length
|
? _vm.weeklySpecialOffer.slice(0, 10).length
|
||||||
: null
|
: null
|
||||||
var l1 =
|
var l2 =
|
||||||
_vm.pageType !== "UnionMall" && _vm.pageType !== "UnionMall"
|
_vm.pageType !== "UnionMall" && _vm.pageType !== "UnionMall"
|
||||||
? _vm.__map(_vm.weeklySpecialOffer.slice(0, 10), function (item, index) {
|
? _vm.__map(_vm.weeklySpecialOffer.slice(0, 10), function (item, index) {
|
||||||
var $orig = _vm.__get_orig(item)
|
var $orig = _vm.__get_orig(item)
|
||||||
var g10 = item.IMAGE_PATH
|
var g11 = item.IMAGE_PATH
|
||||||
? item.IMAGE_PATH.split(",") &&
|
? item.IMAGE_PATH.split(",") &&
|
||||||
item.IMAGE_PATH.split(",").length > 1
|
item.IMAGE_PATH.split(",").length > 1
|
||||||
: null
|
: null
|
||||||
var g11 = item.IMAGE_PATH && g10 ? item.IMAGE_PATH.split(",") : null
|
var g12 = item.IMAGE_PATH && g11 ? item.IMAGE_PATH.split(",") : null
|
||||||
return {
|
return {
|
||||||
$orig: $orig,
|
$orig: $orig,
|
||||||
g10: g10,
|
|
||||||
g11: g11,
|
g11: g11,
|
||||||
|
g12: g12,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
: null
|
: null
|
||||||
var g12 =
|
var g13 =
|
||||||
_vm.pageType !== "UnionMall"
|
_vm.pageType !== "UnionMall"
|
||||||
? _vm.specialOffersList.slice(0, 10).length
|
? _vm.specialOffersList.slice(0, 10).length
|
||||||
: null
|
: null
|
||||||
var l2 =
|
var l3 =
|
||||||
_vm.pageType !== "UnionMall"
|
_vm.pageType !== "UnionMall"
|
||||||
? _vm.__map(_vm.specialOffersList.slice(0, 10), function (item, index) {
|
? _vm.__map(_vm.specialOffersList.slice(0, 10), function (item, index) {
|
||||||
var $orig = _vm.__get_orig(item)
|
var $orig = _vm.__get_orig(item)
|
||||||
var g13 = item.IMAGE_PATH
|
var g14 = item.IMAGE_PATH
|
||||||
? item.IMAGE_PATH.split(",") &&
|
? item.IMAGE_PATH.split(",") &&
|
||||||
item.IMAGE_PATH.split(",").length > 1
|
item.IMAGE_PATH.split(",").length > 1
|
||||||
: null
|
: null
|
||||||
var g14 = item.IMAGE_PATH && g13 ? item.IMAGE_PATH.split(",") : null
|
var g15 = item.IMAGE_PATH && g14 ? item.IMAGE_PATH.split(",") : null
|
||||||
return {
|
return {
|
||||||
$orig: $orig,
|
$orig: $orig,
|
||||||
g13: g13,
|
|
||||||
g14: g14,
|
g14: g14,
|
||||||
|
g15: g15,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
: null
|
: null
|
||||||
var g15 =
|
|
||||||
_vm.pageType === "UnionMall"
|
|
||||||
? _vm.newShopList && _vm.newShopList.length > 0
|
|
||||||
: null
|
|
||||||
var g16 =
|
var g16 =
|
||||||
_vm.pageType === "UnionMall" && g15
|
|
||||||
? _vm.hotShopList && _vm.hotShopList.length > 0
|
|
||||||
: null
|
|
||||||
var g17 =
|
|
||||||
_vm.pageType === "UnionMall" && g15 && !g16
|
|
||||||
? _vm.goodShopList && _vm.goodShopList.length > 0
|
|
||||||
: null
|
|
||||||
var l3 =
|
|
||||||
_vm.pageType === "UnionMall" && g15
|
|
||||||
? _vm.__map(_vm.newShopList, function (item, index) {
|
|
||||||
var $orig = _vm.__get_orig(item)
|
|
||||||
var g18 = _vm.goodShopList.length
|
|
||||||
return {
|
|
||||||
$orig: $orig,
|
|
||||||
g18: g18,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
: null
|
|
||||||
var g19 =
|
|
||||||
_vm.pageType === "UnionMall"
|
_vm.pageType === "UnionMall"
|
||||||
? _vm.hotShopList && _vm.hotShopList.length > 0
|
|
||||||
: null
|
|
||||||
var g20 =
|
|
||||||
_vm.pageType === "UnionMall" && g19
|
|
||||||
? _vm.goodShopList && _vm.goodShopList.length > 0
|
|
||||||
: null
|
|
||||||
var g21 =
|
|
||||||
_vm.pageType === "UnionMall" && g19 && !g20
|
|
||||||
? _vm.newShopList && _vm.newShopList.length > 0
|
? _vm.newShopList && _vm.newShopList.length > 0
|
||||||
: null
|
: null
|
||||||
|
var g17 =
|
||||||
|
_vm.pageType === "UnionMall" && g16
|
||||||
|
? _vm.hotShopList && _vm.hotShopList.length > 0
|
||||||
|
: null
|
||||||
|
var g18 =
|
||||||
|
_vm.pageType === "UnionMall" && g16 && !g17
|
||||||
|
? _vm.goodShopList && _vm.goodShopList.length > 0
|
||||||
|
: null
|
||||||
var l4 =
|
var l4 =
|
||||||
_vm.pageType === "UnionMall" && g19
|
_vm.pageType === "UnionMall" && g16
|
||||||
? _vm.__map(_vm.hotShopList, function (item, index) {
|
? _vm.__map(_vm.newShopList, function (item, index) {
|
||||||
var $orig = _vm.__get_orig(item)
|
var $orig = _vm.__get_orig(item)
|
||||||
var g22 = _vm.goodShopList.length
|
var g19 = _vm.goodShopList.length
|
||||||
return {
|
return {
|
||||||
$orig: $orig,
|
$orig: $orig,
|
||||||
g22: g22,
|
g19: g19,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
: null
|
: null
|
||||||
var g23 =
|
var g20 =
|
||||||
_vm.pageType === "UnionMall"
|
_vm.pageType === "UnionMall"
|
||||||
? _vm.goodShopList && _vm.goodShopList.length > 0
|
|
||||||
: null
|
|
||||||
var g24 =
|
|
||||||
_vm.pageType === "UnionMall" && g23
|
|
||||||
? _vm.hotShopList && _vm.hotShopList.length > 0
|
? _vm.hotShopList && _vm.hotShopList.length > 0
|
||||||
: null
|
: null
|
||||||
var g25 =
|
var g21 =
|
||||||
_vm.pageType === "UnionMall" && g23 && !g24
|
_vm.pageType === "UnionMall" && g20
|
||||||
|
? _vm.goodShopList && _vm.goodShopList.length > 0
|
||||||
|
: null
|
||||||
|
var g22 =
|
||||||
|
_vm.pageType === "UnionMall" && g20 && !g21
|
||||||
? _vm.newShopList && _vm.newShopList.length > 0
|
? _vm.newShopList && _vm.newShopList.length > 0
|
||||||
: null
|
: null
|
||||||
var l5 =
|
var l5 =
|
||||||
_vm.pageType === "UnionMall" && g23
|
_vm.pageType === "UnionMall" && g20
|
||||||
? _vm.__map(_vm.goodShopList, function (item, index) {
|
? _vm.__map(_vm.hotShopList, function (item, index) {
|
||||||
var $orig = _vm.__get_orig(item)
|
var $orig = _vm.__get_orig(item)
|
||||||
var g26 = _vm.goodShopList.length
|
var g23 = _vm.goodShopList.length
|
||||||
return {
|
return {
|
||||||
$orig: $orig,
|
$orig: $orig,
|
||||||
g26: g26,
|
g23: g23,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
: null
|
: null
|
||||||
var g27 =
|
var g24 =
|
||||||
|
_vm.pageType === "UnionMall"
|
||||||
|
? _vm.goodShopList && _vm.goodShopList.length > 0
|
||||||
|
: null
|
||||||
|
var g25 =
|
||||||
|
_vm.pageType === "UnionMall" && g24
|
||||||
|
? _vm.hotShopList && _vm.hotShopList.length > 0
|
||||||
|
: null
|
||||||
|
var g26 =
|
||||||
|
_vm.pageType === "UnionMall" && g24 && !g25
|
||||||
|
? _vm.newShopList && _vm.newShopList.length > 0
|
||||||
|
: null
|
||||||
|
var l6 =
|
||||||
|
_vm.pageType === "UnionMall" && g24
|
||||||
|
? _vm.__map(_vm.goodShopList, function (item, index) {
|
||||||
|
var $orig = _vm.__get_orig(item)
|
||||||
|
var g27 = _vm.goodShopList.length
|
||||||
|
return {
|
||||||
|
$orig: $orig,
|
||||||
|
g27: g27,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
: null
|
||||||
|
var g28 =
|
||||||
_vm.pageType !== "UnionMall"
|
_vm.pageType !== "UnionMall"
|
||||||
? _vm.todayOffersList.slice(0, 10).length
|
? _vm.todayOffersList.slice(0, 10).length
|
||||||
: null
|
: null
|
||||||
var l6 =
|
var l7 =
|
||||||
_vm.pageType !== "UnionMall" ? _vm.todayOffersList.slice(0, 10) : null
|
_vm.pageType !== "UnionMall" ? _vm.todayOffersList.slice(0, 10) : null
|
||||||
var g28 =
|
var g29 =
|
||||||
_vm.pageType !== "UnionMall" &&
|
_vm.pageType !== "UnionMall" &&
|
||||||
_vm.productsList &&
|
_vm.productsList &&
|
||||||
_vm.productsList.length > 0
|
_vm.productsList.length > 0
|
||||||
var g29 = g28 && _vm.pageType !== "UnionMall" ? _vm.productsList.length : null
|
var g30 = g29 && _vm.pageType !== "UnionMall" ? _vm.productsList.length : null
|
||||||
var g30 =
|
var g31 =
|
||||||
_vm.pageType === "UnionMall"
|
_vm.pageType === "UnionMall"
|
||||||
? _vm.showShopList && _vm.showShopList.length > 0
|
? _vm.showShopList && _vm.showShopList.length > 0
|
||||||
: null
|
: null
|
||||||
@ -305,36 +315,37 @@ var render = function () {
|
|||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
$root: {
|
$root: {
|
||||||
g0: g0,
|
l0: l0,
|
||||||
g1: g1,
|
g1: g1,
|
||||||
g2: g2,
|
g2: g2,
|
||||||
g3: g3,
|
g3: g3,
|
||||||
g4: g4,
|
g4: g4,
|
||||||
g5: g5,
|
g5: g5,
|
||||||
l0: l0,
|
g6: g6,
|
||||||
g7: g7,
|
l1: l1,
|
||||||
g8: g8,
|
g8: g8,
|
||||||
g9: g9,
|
g9: g9,
|
||||||
l1: l1,
|
g10: g10,
|
||||||
g12: g12,
|
|
||||||
l2: l2,
|
l2: l2,
|
||||||
g15: g15,
|
g13: g13,
|
||||||
|
l3: l3,
|
||||||
g16: g16,
|
g16: g16,
|
||||||
g17: g17,
|
g17: g17,
|
||||||
l3: l3,
|
g18: g18,
|
||||||
g19: g19,
|
l4: l4,
|
||||||
g20: g20,
|
g20: g20,
|
||||||
g21: g21,
|
g21: g21,
|
||||||
l4: l4,
|
g22: g22,
|
||||||
g23: g23,
|
l5: l5,
|
||||||
g24: g24,
|
g24: g24,
|
||||||
g25: g25,
|
g25: g25,
|
||||||
l5: l5,
|
g26: g26,
|
||||||
g27: g27,
|
|
||||||
l6: l6,
|
l6: l6,
|
||||||
g28: g28,
|
g28: g28,
|
||||||
|
l7: l7,
|
||||||
g29: g29,
|
g29: g29,
|
||||||
g30: g30,
|
g30: g30,
|
||||||
|
g31: g31,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@ -498,10 +509,23 @@ var _default = {
|
|||||||
activityShopList: [],
|
activityShopList: [],
|
||||||
// 活动商品列表
|
// 活动商品列表
|
||||||
priceRangeRefShow: false,
|
priceRangeRefShow: false,
|
||||||
popupBottom: 0 // 键盘高度
|
popupBottom: 0,
|
||||||
|
// 键盘高度
|
||||||
|
showExportFun: false,
|
||||||
|
// 显示展开的悬浮框
|
||||||
|
showExportObj: {
|
||||||
|
x: "",
|
||||||
|
y: ""
|
||||||
|
},
|
||||||
|
funList: [{
|
||||||
|
label: "商城首页",
|
||||||
|
src: ""
|
||||||
|
}, {
|
||||||
|
label: "",
|
||||||
|
src: ""
|
||||||
|
}]
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: _objectSpread({}, (0, _vuex.mapGetters)({
|
computed: _objectSpread({}, (0, _vuex.mapGetters)({
|
||||||
user: "user"
|
user: "user"
|
||||||
})),
|
})),
|
||||||
@ -635,9 +659,20 @@ var _default = {
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: (_methods = {
|
methods: (_methods = {
|
||||||
|
handleHideExportFun: function handleHideExportFun() {
|
||||||
|
this.showExportFun = false;
|
||||||
|
},
|
||||||
|
// 显示展开功能
|
||||||
|
handleShowExportBox: function handleShowExportBox(e) {
|
||||||
|
uni.switchTab({
|
||||||
|
url: "/pages/index/index"
|
||||||
|
});
|
||||||
|
// console.log('e', e);
|
||||||
|
// this.showExportFun = !this.showExportFun;
|
||||||
|
// this.showExportObj = e.detail
|
||||||
|
},
|
||||||
handleFocus: function handleFocus(e) {
|
handleFocus: function handleFocus(e) {
|
||||||
console.log('eee', e);
|
console.log('eee', e);
|
||||||
|
|
||||||
// 安卓 / iOS 可能不一样，可以用 e.detail.height 获取键盘高度
|
// 安卓 / iOS 可能不一样，可以用 e.detail.height 获取键盘高度
|
||||||
this.popupBottom = 200; // 默认抬高
|
this.popupBottom = 200; // 默认抬高
|
||||||
},
|
},
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -4,6 +4,14 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background: #f2f4f5;
|
background: #f2f4f5;
|
||||||
}
|
}
|
||||||
|
.main .meng.data-v-79c11018 {
|
||||||
|
width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
z-index: 9999;
|
||||||
|
}
|
||||||
.main .header.data-v-79c11018 {
|
.main .header.data-v-79c11018 {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
@ -27,6 +35,78 @@
|
|||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: 100% 300rpx;
|
background-size: 100% 300rpx;
|
||||||
}
|
}
|
||||||
|
.main .header .headerTop .backArrowBox.data-v-79c11018 {
|
||||||
|
width: 120rpx;
|
||||||
|
background: rgba(255, 255, 255, 0.6);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: 32rpx;
|
||||||
|
border: 1px solid #d9d5cc;
|
||||||
|
padding: 4rpx 16rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .backArrowBox .backArrow.data-v-79c11018 {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .backArrowBox .line.data-v-79c11018 {
|
||||||
|
width: 2rpx;
|
||||||
|
height: 32rpx;
|
||||||
|
background: #bbbbba;
|
||||||
|
margin: 0 8rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .backArrowBox .img.data-v-79c11018 {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .moreFunBox.data-v-79c11018 {
|
||||||
|
width: 220rpx;
|
||||||
|
height: 220rpx;
|
||||||
|
background: #fff;
|
||||||
|
border-radius: 16rpx;
|
||||||
|
position: absolute;
|
||||||
|
z-index: 10;
|
||||||
|
left: 50rpx;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 12rpx 0 12rpx 16rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .moreFunBox .triangle.data-v-79c11018 {
|
||||||
|
position: absolute;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
|
border-left: 5px solid transparent;
|
||||||
|
/* 左边透明 */
|
||||||
|
border-right: 5px solid transparent;
|
||||||
|
/* 右边透明 */
|
||||||
|
border-bottom: 10px solid #fff;
|
||||||
|
/* 底边颜色 */
|
||||||
|
top: -10px;
|
||||||
|
left: 40px;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .moreFunBox .funList.data-v-79c11018 {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .moreFunBox .funList .funItem.data-v-79c11018 {
|
||||||
|
width: 100%;
|
||||||
|
height: 70rpx;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .moreFunBox .funList .funItem .funItemIcon.data-v-79c11018 {
|
||||||
|
width: 30rpx;
|
||||||
|
height: 30rpx;
|
||||||
|
margin-right: 20rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .moreFunBox .funList .funItem .funItemText.data-v-79c11018 {
|
||||||
|
width: calc(100% - 50rpx);
|
||||||
|
height: 100%;
|
||||||
|
display: inline-block;
|
||||||
|
font-size: 26rpx;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
border-bottom: 1px solid #dad6cb;
|
||||||
|
}
|
||||||
.main .header .headerTop .backArrow.data-v-79c11018 {
|
.main .header .headerTop .backArrow.data-v-79c11018 {
|
||||||
width: 48rpx;
|
width: 48rpx;
|
||||||
height: 48rpx;
|
height: 48rpx;
|
||||||
@ -119,7 +199,9 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
min-height: 214rpx;
|
min-height: 214rpx;
|
||||||
padding: 30rpx;
|
padding: 30rpx;
|
||||||
background: linear-gradient(180deg, #e6f0ff 0%, #ffffff 50%, #ffffff 100%);
|
background-image: url("https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/Special Offers.png");
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-size: 100% 100%;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@ -361,6 +361,15 @@ var _default = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 显示展开功能
|
||||||
|
handleShowExportBox: function handleShowExportBox(e) {
|
||||||
|
uni.switchTab({
|
||||||
|
url: "/pages/index/index"
|
||||||
|
});
|
||||||
|
// console.log('e', e);
|
||||||
|
// this.showExportFun = !this.showExportFun;
|
||||||
|
// this.showExportObj = e.detail
|
||||||
|
},
|
||||||
// 点击地址
|
// 点击地址
|
||||||
handleClickAddressItem: function handleClickAddressItem(obj) {
|
handleClickAddressItem: function handleClickAddressItem(obj) {
|
||||||
if (!obj.MEMBERADDRESS_CODE) {
|
if (!obj.MEMBERADDRESS_CODE) {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -16,6 +16,30 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
.main .mainTop .headerTop .backArrowBox.data-v-fce33af8 {
|
||||||
|
width: 120rpx;
|
||||||
|
background: rgba(255, 255, 255, 0.6);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: 32rpx;
|
||||||
|
border: 1px solid #d9d5cc;
|
||||||
|
padding: 4rpx 16rpx;
|
||||||
|
}
|
||||||
|
.main .mainTop .headerTop .backArrowBox .backArrow.data-v-fce33af8 {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
.main .mainTop .headerTop .backArrowBox .line.data-v-fce33af8 {
|
||||||
|
width: 2rpx;
|
||||||
|
height: 32rpx;
|
||||||
|
background: #bbbbba;
|
||||||
|
margin: 0 8rpx;
|
||||||
|
}
|
||||||
|
.main .mainTop .headerTop .backArrowBox .img.data-v-fce33af8 {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
.main .mainTop .headerTop .backArrow.data-v-fce33af8 {
|
.main .mainTop .headerTop .backArrow.data-v-fce33af8 {
|
||||||
width: 48rpx;
|
width: 48rpx;
|
||||||
height: 48rpx;
|
height: 48rpx;
|
||||||
|
|||||||
@ -451,6 +451,15 @@ var _default = {
|
|||||||
this.searchText = "";
|
this.searchText = "";
|
||||||
},
|
},
|
||||||
methods: (_methods = {
|
methods: (_methods = {
|
||||||
|
// 显示展开功能
|
||||||
|
handleShowExportBox: function handleShowExportBox(e) {
|
||||||
|
uni.switchTab({
|
||||||
|
url: "/pages/index/index"
|
||||||
|
});
|
||||||
|
// console.log('e', e);
|
||||||
|
// this.showExportFun = !this.showExportFun;
|
||||||
|
// this.showExportObj = e.detail
|
||||||
|
},
|
||||||
// 因为有增加和减少商品 所以要更新显示区域内的商品数据
|
// 因为有增加和减少商品 所以要更新显示区域内的商品数据
|
||||||
handleUpDataShop: function handleUpDataShop(newVal) {
|
handleUpDataShop: function handleUpDataShop(newVal) {
|
||||||
if (this.visibleList && this.visibleList.length > 0) {
|
if (this.visibleList && this.visibleList.length > 0) {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -18,6 +18,30 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
.main .header .headerTop .backArrowBox.data-v-36e5d840 {
|
||||||
|
width: 120rpx;
|
||||||
|
background: rgba(255, 255, 255, 0.6);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border-radius: 32rpx;
|
||||||
|
border: 1px solid #d9d5cc;
|
||||||
|
padding: 4rpx 16rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .backArrowBox .backArrow.data-v-36e5d840 {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .backArrowBox .line.data-v-36e5d840 {
|
||||||
|
width: 2rpx;
|
||||||
|
height: 32rpx;
|
||||||
|
background: #bbbbba;
|
||||||
|
margin: 0 8rpx;
|
||||||
|
}
|
||||||
|
.main .header .headerTop .backArrowBox .img.data-v-36e5d840 {
|
||||||
|
width: 48rpx;
|
||||||
|
height: 48rpx;
|
||||||
|
}
|
||||||
.main .header .headerTop .backArrow.data-v-36e5d840 {
|
.main .header .headerTop .backArrow.data-v-36e5d840 {
|
||||||
width: 48rpx;
|
width: 48rpx;
|
||||||
height: 48rpx;
|
height: 48rpx;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user