|
|
@@ -3,15 +3,48 @@
|
|
|
<view>
|
|
|
<view class="food_all">
|
|
|
<!-- banner -->
|
|
|
- <view style="height: 100%; padding-bottom: 10px">
|
|
|
- <swiper class="swiper" :autoplay="true" interval="2000" duration="500" :circular="true" style="width: 100%; z-index: 1; height: 128px">
|
|
|
+ <view style="width: 100%; padding-bottom: 20rpx; background-color: #fff">
|
|
|
+ <!-- <swiper class="swiper" :autoplay="true" interval="2000" duration="500" :circular="true" style="width: 100%; z-index: 1; height: 128px">
|
|
|
<swiper-item v-for="(item, index) in shopDet.shopBanner" :key="index">
|
|
|
<image :src="item" mode="scaleToFill" style="width: 100%"></image>
|
|
|
</swiper-item>
|
|
|
</swiper>
|
|
|
- <view style="position: relative; height: 34px; z-index: 1; margin-top: -50px"></view>
|
|
|
- <view class="shop padding">
|
|
|
- <view class="flex justify-between">
|
|
|
+ <view style="position: relative; height: 34px; z-index: 1; margin-top: -50px"></view> -->
|
|
|
+ <view class="shop" style="padding: 26rpx">
|
|
|
+ <image style="width: 184rpx; height: 184rpx; border-radius: 32rpx" :src="shopDet.shopCover" mode="aspectFill"></image>
|
|
|
+
|
|
|
+ <view style="margin-left: 34rpx; width: 490rpx; display: flex; flex-direction: column">
|
|
|
+ <view class="text-bold">{{ shopDet.shopName }}</view>
|
|
|
+ <view style="display: flex; margin: 10rpx 0 20rpx">
|
|
|
+ <view style="border-right: 2rpx solid #707070; padding-right: 28rpx; display: flex; flex-direction: column; justify-content: space-between">
|
|
|
+ <span style="color: #707070; font-size: 24rpx">评分</span>
|
|
|
+ <view class="text-bold">{{ shopDet.shopScore ? shopDet.shopScore : 0 }}分</view>
|
|
|
+ </view>
|
|
|
+ <view style="border-right: 2rpx solid #707070; padding: 0 28rpx 0 20rpx; display: flex; flex-direction: column; justify-content: space-between">
|
|
|
+ <span style="color: #707070; font-size: 24rpx">销量</span>
|
|
|
+ <view class="text-bold">{{ shopDet.shopSales ? shopDet.shopSales : 0 }}</view>
|
|
|
+ </view>
|
|
|
+ <view style="padding-left: 20rpx; display: flex; flex-direction: column; justify-content: space-between">
|
|
|
+ <span style="color: #707070; font-size: 24rpx">平台配送</span>
|
|
|
+ <view class="text-bold">{{ shopDet.errandTime }}分钟</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="flex align-center margin-top-xs" v-if="shopDet.shopNotice">
|
|
|
+ <text style="width: 90rpx; color: #707070">公告：</text>
|
|
|
+ <view style="width: 400rpx">
|
|
|
+ <u-notice-bar
|
|
|
+ color="#707070"
|
|
|
+ :speed="100"
|
|
|
+ type="none"
|
|
|
+ padding="0rpx 0rpx"
|
|
|
+ mode="horizontal"
|
|
|
+ :volume-icon="false"
|
|
|
+ :list="shopDet.shopNotice.split(',')"
|
|
|
+ ></u-notice-bar>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <!-- <view class="flex justify-between">
|
|
|
<view style="width: 500rpx">
|
|
|
<view class="text-xl text-bold u-line-1">{{ shopDet.shopName }}</view>
|
|
|
<view class="flex align-center margin-top-xs">
|
|
|
@@ -26,11 +59,8 @@
|
|
|
</view>
|
|
|
|
|
|
<view class="flex align-center margin-top-xs">
|
|
|
- <!-- <view style="color: #FCD202;margin-right: 8rpx;">{{shopDet.autoSendOrder==1?'商家配送':'平台配送'}}</view> -->
|
|
|
<view style="margin-right: 8rpx">{{ shopDet.autoSendOrder == 1 ? '商家配送：' : '平台配送：' }}</view>
|
|
|
<view style="margin-right: 8rpx">配送费{{ shopDet.errandMoney ? shopDet.errandMoney : 0 }}元</view>
|
|
|
- <!-- <view class="lable text-gray" v-if="shopDet.enableFullReductionFlag==1">
|
|
|
- 不参与配送费满减</view> -->
|
|
|
<view class="lable" v-if="shopDet.enableFullReductionFlag == 0 && shopDet.exemptMinMoney">满{{ shopDet.exemptMinMoney }}元免配送费</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -55,7 +85,6 @@
|
|
|
</view>
|
|
|
<view style="display: flex; margin-top: 3px" class="flex flex-wrap align-center" @click="clickGong">
|
|
|
<view v-for="(ite, ind) in huoListss" :key="ind" v-if="huoListss && ite.activityType != '1'">
|
|
|
- <!-- -->
|
|
|
<view class="lable flex justify-center align-center" style="border-radius: 4rpx; background-color: #ffffff; color: red; box-sizing: border-box">
|
|
|
<text v-if="ite.activityType == '2'">时段</text>
|
|
|
<text v-if="ite.activityType == '3'">满额</text>
|
|
|
@@ -63,10 +92,6 @@
|
|
|
<text style="margin-left: 3px">|</text>
|
|
|
<text style="margin-left: 3px">{{ ite.activityName }}</text>
|
|
|
</view>
|
|
|
- <!-- <view class="lable flex justify-center align-center"
|
|
|
- style="border-radius: 4rpx;border: 1rpx solid red;background-color: #ffffff;color: red;box-sizing: border-box;"
|
|
|
- >{{ite.activityName}}
|
|
|
- </view> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -82,11 +107,8 @@
|
|
|
<view style="margin-right: 20rpx">满{{ item.minMoney }}可用</view>
|
|
|
<view style="font-weight: bold">领</view>
|
|
|
</view>
|
|
|
- <!-- <view class="flex align-center" style="width: 100%;height: 100%;">
|
|
|
-
|
|
|
- </view> -->
|
|
|
</scroll-view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 食品 -->
|
|
|
@@ -119,7 +141,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="VerticalBox" v-if="current == 1">
|
|
|
- <scroll-view class="VerticalNav nav bg-gray" scroll-y scroll-with-animation :scroll-top="verticalNavTop" style="height: calc(100vh - 590upx)">
|
|
|
+ <scroll-view class="VerticalNav nav bg-gray" scroll-y scroll-with-animation :scroll-top="verticalNavTop">
|
|
|
<view
|
|
|
style="font-size: 28upx"
|
|
|
class="cu-item text-lg"
|
|
|
@@ -132,14 +154,7 @@
|
|
|
{{ item.classifyName }}
|
|
|
</view>
|
|
|
</scroll-view>
|
|
|
- <scroll-view
|
|
|
- class="VerticalMain"
|
|
|
- scroll-y
|
|
|
- scroll-with-animation
|
|
|
- style="height: calc(100vh - 590rpx)"
|
|
|
- :scroll-into-view="'main-' + mainCur"
|
|
|
- @scroll="VerticalMain"
|
|
|
- >
|
|
|
+ <scroll-view class="VerticalMain" scroll-y scroll-with-animation :scroll-into-view="'main-' + mainCur" @scroll="VerticalMain">
|
|
|
<view class="bg-white padding-sm margin-bottom-sm" v-for="(item, index) in dataList" v-if="item.goodsList.length" :key="index" :id="'main-' + index">
|
|
|
<view class="flex justify-between padding-bottom-sm" @click="goDet(ite.goodsId)" v-for="(ite, ind) in item.goodsList" :key="ind">
|
|
|
<image :src="ite.goodsCover" mode="aspectFill" style="width: 184rpx; height: 184rpx; border-radius: 10rpx"></image>
|
|
|
@@ -152,7 +167,7 @@
|
|
|
{{ ite.goodsDescribe ? ite.goodsDescribe : '' }}
|
|
|
</view>
|
|
|
<view class="flex justify-between" style="position: relative">
|
|
|
- <view class="text-sm text-red">
|
|
|
+ <view class="text-sm" style="color: #ff0303">
|
|
|
¥
|
|
|
<text class="text-lg">{{ ite.goodsMoney }}</text>
|
|
|
</view>
|
|
|
@@ -170,14 +185,14 @@
|
|
|
</scroll-view>
|
|
|
<empty v-if="!dataList.length"></empty>
|
|
|
</view>
|
|
|
- <view class="" v-if="current == 2">
|
|
|
+ <view style="background-color: #fff9ed" v-if="current == 2">
|
|
|
<view class="flex margin-lr padding-tb-sm u-border-bottom" v-if="shopDet.shopScore">
|
|
|
<view class="flex padding-right">
|
|
|
<view class="text-sl" style="color: #fd6416">{{ shopDet.shopScore }}</view>
|
|
|
<view class="flex flex-direction justify-around margin-left-sm">
|
|
|
<view>商家评分</view>
|
|
|
<view class="flex">
|
|
|
- <u-icon v-for="ite in shopDet.shopScore1" :key="ite" color="#568D84" name="star-fill"></u-icon>
|
|
|
+ <u-icon v-for="ite in shopDet.shopScore1" :key="ite" color="#F2CB51" name="star-fill"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -281,7 +296,7 @@
|
|
|
</view>
|
|
|
<empty v-if="!EvaluateList.length"></empty>
|
|
|
</view>
|
|
|
- <view class="padding-bottom" v-if="current == 3">
|
|
|
+ <view style="background-color: #fff9ed" class="padding-bottom" v-if="current == 3">
|
|
|
<view class="shop_xiang">
|
|
|
<view class="shopDizhi margin-lr">
|
|
|
<image :src="Tupian('/shopXiang/address.png')" class="radius" style="width: 44rpx; height: 44rpx; float: left; margin-top: 20rpx"></image>
|
|
|
@@ -367,8 +382,8 @@
|
|
|
</view>
|
|
|
<!-- 购物车弹窗 -->
|
|
|
<u-popup v-model="popupShow" mode="bottom" border-radius="20">
|
|
|
- <view class="padding">
|
|
|
- <view class="flex justify-between align-center margin-bottom-sm">
|
|
|
+ <view style="padding: 0 0 30rpx">
|
|
|
+ <view class="flex justify-between align-center margin-bottom-sm" style="height: 90rpx; background-color: #b2d5c6; padding: 0 30rpx">
|
|
|
<view class="text-bold text-black text-df">已选餐品</view>
|
|
|
<view class="flex align-center">
|
|
|
<image src="../../../static/images/index/delete.png" style="width: 28rpx; height: 31rpx" mode=""></image>
|
|
|
@@ -377,25 +392,26 @@
|
|
|
</view>
|
|
|
<scroll-view scroll-y="true" class="popup">
|
|
|
<view v-for="(item, ind) in goodsList.orderGoodsList[0]" :key="ind">
|
|
|
- <view class="flex align-center margin-tb-sm">
|
|
|
+ <view class="flex margin-tb-sm">
|
|
|
<image mode="aspectFill" :src="item.goodsPicture[0]" style="width: 96rpx; height: 96rpx; border-radius: 10rpx"></image>
|
|
|
- <view class="margin-left-sm">
|
|
|
+ <view class="margin-left-sm" style="display: flex; flex-direction: column; justify-content: space-between">
|
|
|
<view>{{ item.goodsName }}</view>
|
|
|
<view v-if="item.skuMessage">{{ item.skuMessage }}</view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="flex justify-between align-center">
|
|
|
- <view class="text-bold text-sm">
|
|
|
- ¥
|
|
|
- <text class="text-lg">{{ item.goodsPrice }}</text>
|
|
|
- </view>
|
|
|
- <view class="flex align-center justify-between">
|
|
|
- <view @click.stop="noAdd(item, ind)">
|
|
|
- <image src="../../../static/images/index/jian.png" style="width: 54rpx; height: 54rpx"></image>
|
|
|
+ <view class="text-bold text-sm" style="color: #ff0303">
|
|
|
+ ¥
|
|
|
+ <text class="text-lg">{{ item.goodsPrice }}</text>
|
|
|
</view>
|
|
|
- <view class="text-center margin-lr-xs">{{ item.goodsNum }}</view>
|
|
|
- <view @click.stop="add(item, ind)">
|
|
|
- <image src="../../../static/images/index/add.png" style="width: 50rpx; height: 50rpx"></image>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="flex justify-between align-center" style="margin-left: auto">
|
|
|
+ <view class="flex align-center justify-between">
|
|
|
+ <view @click.stop="noAdd(item, ind)">
|
|
|
+ <image src="../../../static/images/index/jian.png" style="width: 54rpx; height: 54rpx"></image>
|
|
|
+ </view>
|
|
|
+ <view class="text-center margin-lr-xs">{{ item.goodsNum }}</view>
|
|
|
+ <view @click.stop="add(item, ind)">
|
|
|
+ <image src="../../../static/images/index/add.png" style="width: 50rpx; height: 50rpx"></image>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -432,7 +448,7 @@
|
|
|
</view>
|
|
|
<view class="flex justify-between padding-lr padding-top">
|
|
|
<view>
|
|
|
- <view class="text-xl text-bold text-black">
|
|
|
+ <view class="text-xl text-bold" style="color: #ff0303">
|
|
|
<text class="text-sm">￥</text>
|
|
|
{{ price }}
|
|
|
</view>
|
|
|
@@ -597,7 +613,7 @@ export default {
|
|
|
},
|
|
|
customStyle1: {
|
|
|
color: '#333333',
|
|
|
- background: '#F2F2F2',
|
|
|
+ background: '#fff',
|
|
|
marginRight: '20rpx',
|
|
|
border: 0
|
|
|
},
|
|
|
@@ -1239,7 +1255,7 @@ export default {
|
|
|
this.$Request.get('/app/order/selectAllOrderList', data).then((res) => {
|
|
|
if (res.code == 0 && res.data.pageUtils.list.length) {
|
|
|
this.goodsList = res.data.pageUtils.list[0]
|
|
|
- // console.log(this.goodsList, '888')
|
|
|
+ console.log(this.goodsList, '888')
|
|
|
|
|
|
if (this.goodsList && this.goodsList.orderGoodsList && this.goodsList.orderGoodsList[0]) {
|
|
|
this.totalPrice = res.data.money
|
|
|
@@ -1583,14 +1599,15 @@ page {
|
|
|
}
|
|
|
|
|
|
.shop {
|
|
|
- position: relative;
|
|
|
- z-index: 2;
|
|
|
- margin-top: -80rpx;
|
|
|
- left: 0;
|
|
|
- right: 0;
|
|
|
- width: 686rpx;
|
|
|
+ // position: relative;
|
|
|
+ // z-index: 2;
|
|
|
+ // margin-top: -80rpx;
|
|
|
+ // left: 0;
|
|
|
+ // right: 0;
|
|
|
+ display: flex;
|
|
|
+ width: 100%;
|
|
|
margin: auto;
|
|
|
- border-radius: 20rpx;
|
|
|
+ border-radius: 40rpx;
|
|
|
box-shadow: 0 0 20rpx #cccccc;
|
|
|
background: linear-gradient(135deg, #81bdb3 0%, #ecf6ce 100%);
|
|
|
}
|
|
|
@@ -1613,7 +1630,7 @@ page {
|
|
|
|
|
|
.active1 {
|
|
|
/* width: 82rpx; */
|
|
|
- height: 16rpx;
|
|
|
+ height: 6rpx;
|
|
|
background: #568d84;
|
|
|
position: relative;
|
|
|
top: -10rpx;
|
|
|
@@ -1623,15 +1640,19 @@ page {
|
|
|
.popup {
|
|
|
/* height: 500rpx; */
|
|
|
max-height: 500rpx;
|
|
|
+ padding: 0 30rpx;
|
|
|
/* overflow-y: auto; */
|
|
|
}
|
|
|
|
|
|
.tabBtn {
|
|
|
- /* background-color: #f6f6fa; */
|
|
|
height: 60rpx;
|
|
|
line-height: 60rpx;
|
|
|
color: #999999;
|
|
|
font-size: 38rpx;
|
|
|
+
|
|
|
+ .title {
|
|
|
+ background-color: #fff9ed;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.Switch {
|
|
|
@@ -1697,13 +1718,15 @@ page {
|
|
|
|
|
|
.VerticalNav.nav {
|
|
|
width: 200upx;
|
|
|
+ height: calc(100% - 120rpx);
|
|
|
white-space: initial;
|
|
|
+ background-color: #fff;
|
|
|
}
|
|
|
|
|
|
.VerticalNav.nav .cu-item {
|
|
|
width: 100%;
|
|
|
text-align: center;
|
|
|
- background-color: #f1f1f1;
|
|
|
+ background-color: #fff;
|
|
|
margin: 0;
|
|
|
border: none;
|
|
|
height: 50px;
|
|
|
@@ -1712,16 +1735,19 @@ page {
|
|
|
}
|
|
|
|
|
|
.VerticalNav.nav .cu-item.cur {
|
|
|
- background-color: #fff;
|
|
|
+ background-color: #fff9ed;
|
|
|
line-height: 25px;
|
|
|
}
|
|
|
|
|
|
.VerticalBox {
|
|
|
display: flex;
|
|
|
+ height: calc(100% - 120rpx);
|
|
|
+ background-color: #fff9ed;
|
|
|
}
|
|
|
|
|
|
.VerticalMain {
|
|
|
- background-color: #f1f1f1;
|
|
|
+ height: calc(100% - 120rpx);
|
|
|
+ background-color: #fff9ed;
|
|
|
flex: 1;
|
|
|
}
|
|
|
|
|
|
@@ -1768,10 +1794,11 @@ page {
|
|
|
/* 食物 */
|
|
|
.food {
|
|
|
width: 100%;
|
|
|
+ height: calc(100vh - 260rpx);
|
|
|
overflow: hidden;
|
|
|
// position: absolute;
|
|
|
// top: 350rpx;
|
|
|
- // background-color: #FFFFFF;
|
|
|
+ background-color: #fff9ed;
|
|
|
border-top-left-radius: 18rpx;
|
|
|
border-top-right-radius: 18rpx;
|
|
|
}
|
|
|
@@ -1783,7 +1810,7 @@ page {
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
// margin-top: 190rpx;
|
|
|
- background-color: #ffffff;
|
|
|
+ background-color: #fff9ed;
|
|
|
// padding-bottom: 3%;
|
|
|
padding: 3%;
|
|
|
}
|
|
|
@@ -1913,10 +1940,10 @@ page {
|
|
|
|
|
|
.settlement_ri1 {
|
|
|
width: 35%;
|
|
|
- background-color: #333333;
|
|
|
+ background-color: #75a599;
|
|
|
font-family: PingFang SC;
|
|
|
font-weight: 800;
|
|
|
- color: #999999;
|
|
|
+ color: #333333;
|
|
|
text-align: center;
|
|
|
border-top-right-radius: 49rpx;
|
|
|
border-bottom-right-radius: 49rpx;
|
|
|
@@ -2149,7 +2176,6 @@ page {
|
|
|
|
|
|
//下方店铺详情
|
|
|
.shop_xiang {
|
|
|
- background-color: rgba(255, 255, 255, 1);
|
|
|
width: 100%;
|
|
|
margin-top: 8px;
|
|
|
}
|
|
|
@@ -2166,7 +2192,6 @@ page {
|
|
|
// border: 1rpx solid rgba(242,242,242,0.5);
|
|
|
}
|
|
|
.shop_zheng {
|
|
|
- background-color: rgba(255, 255, 255, 1);
|
|
|
width: 100%;
|
|
|
margin-top: 8px;
|
|
|
height: 100%;
|
