|
|
|
@ -17,9 +17,9 @@ |
|
|
|
</view> |
|
|
|
<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" |
|
|
|
:interval="interval" :duration="duration"> |
|
|
|
<swiper-item v-if="item.position == 'home_top' " v-for="(item,index) in mallAds" :key="index" |
|
|
|
<swiper-item v-for="(item,index) in adList" :key="index" |
|
|
|
@tap="goAdPage(item)"> |
|
|
|
<img :src="item.adImage" alt="" /> |
|
|
|
<img :src="item.pic" alt="" /> |
|
|
|
</swiper-item> |
|
|
|
</swiper> |
|
|
|
<view class="order-notice-wrap"> |
|
|
|
@ -47,7 +47,7 @@ |
|
|
|
|
|
|
|
<swiper class="swiper" vertical circular :autoplay="orderLists.length > 0" |
|
|
|
:interval="onlineWorkerInterval" :duration="onlineWorkerDuration" |
|
|
|
style="height: 74px;margin-top: -50px;"> |
|
|
|
style="height: 170rpx;margin-top: -120rpx;"> |
|
|
|
<swiper-item v-if="orderLists.length > 0" v-for="(item,index) in orderLists" :key="index" |
|
|
|
@tap="goOrderDetail(item)"> |
|
|
|
<view class="order-msg-box"> |
|
|
|
@ -626,6 +626,7 @@ |
|
|
|
export default { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
adList:[], |
|
|
|
pages: [{ |
|
|
|
name: '商家账单详情111', |
|
|
|
url: '/package2/shop/shopSettlementDetail' |
|
|
|
@ -1027,6 +1028,27 @@ |
|
|
|
that.loadStatus = 'nomore'; |
|
|
|
if (res.code == 200) { |
|
|
|
that.mallAds = res.result.mallAds |
|
|
|
for(let i=0;i<that.mallAds.length;i++){ |
|
|
|
if(that.mallAds[i].position == 'home_top'){ |
|
|
|
|
|
|
|
// 判断字符串中是否包含逗号 |
|
|
|
if (that.mallAds[i].adImage.indexOf(',') !== -1) { |
|
|
|
// 有逗号：先按逗号分割，再过滤掉空字符串或纯空白字符串，最后映射为 {pic: url} 对象数组 |
|
|
|
that.adList = that.mallAds[i].adImage |
|
|
|
.split(',') |
|
|
|
.filter(item => item.trim() !== '') // 过滤掉空项 |
|
|
|
.map(url => ({ |
|
|
|
pic: url.trim() |
|
|
|
})); |
|
|
|
} else { |
|
|
|
// 没有逗号：整个字符串作为一个对象 |
|
|
|
that.adList = [{ |
|
|
|
pic: that.mallAds[i].adImage.trim() |
|
|
|
}]; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
console.log('50000',that.adList) |
|
|
|
that.deliveryItem = res.result.records; |
|
|
|
if (res.result.orderCount != null) { |
|
|
|
for (let i = 0; i < res.result.orderCount.length; i++) { |
|
|
|
@ -1389,10 +1411,11 @@ |
|
|
|
width: 100%; |
|
|
|
height: 100%; |
|
|
|
z-index: 99 !important; |
|
|
|
border-radius:10px; |
|
|
|
} |
|
|
|
|
|
|
|
.order-notice-wrap { |
|
|
|
background: linear-gradient(180deg, rgba(255, 255, 255, 0.96) 0%, rgba(250, 255, 250, 0.72) 100%); |
|
|
|
// background: linear-gradient(180deg, rgba(255, 255, 255, 0.96) 0%, rgba(250, 255, 250, 0.72) 100%); |
|
|
|
position: relative; |
|
|
|
} |
|
|
|
|
|
|
|
@ -1401,8 +1424,7 @@ |
|
|
|
height: 146rpx; |
|
|
|
border-radius: 36rpx; |
|
|
|
border: 1px solid rgba(166, 255, 234, 0.86); |
|
|
|
background: linear-gradient(135deg, rgba(255, 255, 255, 0.98) 0%, rgba(242, 255, 250, 0.96) 100%); |
|
|
|
box-shadow: 0 18rpx 36rpx rgba(0, 35, 28, 0.08); |
|
|
|
background: #fff; |
|
|
|
z-index: 99; |
|
|
|
position: absolute; |
|
|
|
left: 2.5%; |
|
|
|
@ -1528,7 +1550,7 @@ |
|
|
|
|
|
|
|
.menu-box { |
|
|
|
width: 95%; |
|
|
|
height: 172rpx; |
|
|
|
height: 200rpx; |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
margin: 30rpx auto 0; |
|
|
|
@ -1573,8 +1595,8 @@ |
|
|
|
} |
|
|
|
|
|
|
|
.menu-list img { |
|
|
|
width: 82rpx; |
|
|
|
height: 82rpx; |
|
|
|
width: 100rpx; |
|
|
|
height: 100rpx; |
|
|
|
display: block; |
|
|
|
margin: 0 auto; |
|
|
|
filter: drop-shadow(0 10rpx 14rpx rgba(0, 35, 28, 0.08)); |
|
|
|
|
