|
|
@@ -20,24 +20,22 @@
|
|
|
{{ shopDet.shopScore ? shopDet.shopScore : 0 }}
|
|
|
</view>
|
|
|
|
|
|
- <view class="margin-left-xs text-gray">销量 {{ shopDet.shopSales ? shopDet.shopSales : 0 }}</view>
|
|
|
- <view class="margin-left-xs text-gray" v-if="shopDet.errandTime">约{{ shopDet.errandTime }}分钟</view>
|
|
|
- <view class="margin-left-xs text-gray" v-if="shopDet.minimumDelivery">{{ shopDet.minimumDelivery }}元起送</view>
|
|
|
+ <view class="margin-left-xs">销量 {{ shopDet.shopSales ? shopDet.shopSales : 0 }}</view>
|
|
|
+ <view class="margin-left-xs" v-if="shopDet.errandTime">约{{ shopDet.errandTime }}分钟</view>
|
|
|
+ <view class="margin-left-xs" v-if="shopDet.minimumDelivery">{{ shopDet.minimumDelivery }}元起送</view>
|
|
|
</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 class="text-gray" style="margin-right: 8rpx">配送费{{ shopDet.errandMoney ? shopDet.errandMoney : 0 }}元</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 text-gray" v-if="shopDet.enableFullReductionFlag == 0 && shopDet.exemptMinMoney">
|
|
|
- 满{{ shopDet.exemptMinMoney }}元免配送费
|
|
|
- </view>
|
|
|
+ <view class="lable" v-if="shopDet.enableFullReductionFlag == 0 && shopDet.exemptMinMoney">满{{ shopDet.exemptMinMoney }}元免配送费</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view>
|
|
|
- <image :src="shopDet.shopCover" class="radius" style="width: 110rpx; height: 110rpx; margin-top: 30rpx"></image>
|
|
|
+ <image mode="aspectFill" :src="shopDet.shopCover" class="radius" style="width: 110rpx; height: 110rpx; margin-top: 30rpx"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="flex align-center margin-top-xs" v-if="shopDet.shopNotice">
|
|
|
@@ -144,7 +142,7 @@
|
|
|
>
|
|
|
<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="" style="width: 184rpx; height: 184rpx; border-radius: 10rpx"></image>
|
|
|
+ <image :src="ite.goodsCover" mode="aspectFill" style="width: 184rpx; height: 184rpx; border-radius: 10rpx"></image>
|
|
|
<view class="flex-sub margin-left-sm padding-tb-xs flex flex-direction justify-between">
|
|
|
<view class="text-black text-lg text-bold" style="font-size: 30upx">
|
|
|
{{ ite.goodsName }}
|
|
|
@@ -179,7 +177,7 @@
|
|
|
<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="#FCD202" name="star-fill"></u-icon>
|
|
|
+ <u-icon v-for="ite in shopDet.shopScore1" :key="ite" color="#568D84" name="star-fill"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -317,7 +315,15 @@
|
|
|
<text style="margin-left: 5px">营业执照，食品经营许可和健康证</text>
|
|
|
</view>
|
|
|
<view class="image-container" v-if="shop_zhizhao.length > 0">
|
|
|
- <image v-for="(item, index) in shop_zhizhao" :key="index" class="image" :src="item" style="margin-left: 10px" @click="clickImg(item)"></image>
|
|
|
+ <image
|
|
|
+ v-for="(item, index) in shop_zhizhao"
|
|
|
+ :key="index"
|
|
|
+ class="image"
|
|
|
+ :src="item"
|
|
|
+ mode="aspectFill"
|
|
|
+ style="margin-left: 10px"
|
|
|
+ @click="clickImg(item)"
|
|
|
+ ></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- <view class="flex align-center margin-top-sm">
|
|
|
@@ -372,7 +378,7 @@
|
|
|
<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">
|
|
|
- <image :src="item.goodsPicture[0]" style="width: 96rpx; height: 96rpx; border-radius: 10rpx"></image>
|
|
|
+ <image mode="aspectFill" :src="item.goodsPicture[0]" style="width: 96rpx; height: 96rpx; border-radius: 10rpx"></image>
|
|
|
<view class="margin-left-sm">
|
|
|
<view>{{ item.goodsName }}</view>
|
|
|
<view v-if="item.skuMessage">{{ item.skuMessage }}</view>
|
|
|
@@ -452,7 +458,11 @@
|
|
|
<view class="yhq-box-list-item-c flex justify-between align-center">
|
|
|
<view class="yhq-box-list-item-c-l flex align-center">
|
|
|
<image
|
|
|
- :src="item.couponPicture ? item.couponPicture : 'https://mxys.chuanghai-tech.com/wmfile/20250814/fff4dc5d02ea4af881db9685f2e1e61d.png'"
|
|
|
+ :src="
|
|
|
+ item.couponPicture
|
|
|
+ ? item.couponPicture
|
|
|
+ : 'https://mxys.chuanghai-tech.com/wmfile/20250814/fff4dc5d02ea4af881db9685f2e1e61d.png'
|
|
|
+ "
|
|
|
style="width: 80rpx; height: 80rpx; border-radius: 20rpx"
|
|
|
mode=""
|
|
|
></image>
|
|
|
@@ -581,7 +591,7 @@ export default {
|
|
|
},
|
|
|
customStyle: {
|
|
|
color: '#333333',
|
|
|
- background: '#FCD202',
|
|
|
+ background: '#568D84',
|
|
|
marginRight: '20rpx',
|
|
|
border: 0
|
|
|
},
|
|
|
@@ -1288,7 +1298,7 @@ export default {
|
|
|
if (goodstr1 == goodstr2) {
|
|
|
//检查购物车商品是否存在必须
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/index/shop/confirmOrder?shopId=' + this.shopId + '&orderType=' + this.orderType+'&shopTypeName='+this.shopDet.shopTypeName
|
|
|
+ url: '/pages/index/shop/confirmOrder?shopId=' + this.shopId + '&orderType=' + this.orderType + '&shopTypeName=' + this.shopDet.shopTypeName
|
|
|
})
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
@@ -1306,9 +1316,9 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- console.log('3333fd',this.shopDet)
|
|
|
+ console.log('3333fd', this.shopDet)
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/index/shop/confirmOrder?shopId=' + this.shopId + '&orderType=' + this.orderType+'&shopTypeName='+this.shopDet.shopTypeName
|
|
|
+ url: '/pages/index/shop/confirmOrder?shopId=' + this.shopId + '&orderType=' + this.orderType + '&shopTypeName=' + this.shopDet.shopTypeName
|
|
|
})
|
|
|
}
|
|
|
} else {
|
|
|
@@ -1580,9 +1590,9 @@ page {
|
|
|
right: 0;
|
|
|
width: 686rpx;
|
|
|
margin: auto;
|
|
|
- background: #ffffff;
|
|
|
border-radius: 20rpx;
|
|
|
box-shadow: 0 0 20rpx #cccccc;
|
|
|
+ background: linear-gradient(135deg, #81bdb3 0%, #ecf6ce 100%);
|
|
|
}
|
|
|
|
|
|
.skuBtn {
|
|
|
@@ -1596,15 +1606,15 @@ page {
|
|
|
}
|
|
|
|
|
|
.active {
|
|
|
- background: rgba(252, 210, 2, 0.2) !important;
|
|
|
- border: 2px solid #fcd202 !important;
|
|
|
+ background: rgba(129, 189, 179, 0.2) !important;
|
|
|
+ border: 2px solid rgba(129, 189, 179, 1) !important;
|
|
|
opacity: 0.6;
|
|
|
}
|
|
|
|
|
|
.active1 {
|
|
|
/* width: 82rpx; */
|
|
|
height: 16rpx;
|
|
|
- background: #fcd202;
|
|
|
+ background: #568d84;
|
|
|
position: relative;
|
|
|
top: -10rpx;
|
|
|
z-index: 9;
|
|
|
@@ -1735,7 +1745,8 @@ page {
|
|
|
border-radius: 44rpx;
|
|
|
text-align: center;
|
|
|
line-height: 2.8;
|
|
|
- border: 2rpx solid #fcd202;
|
|
|
+ border: 2rpx solid rgba(129, 189, 179, 1);
|
|
|
+ background-color: rgba(129, 189, 179, 0.4);
|
|
|
}
|
|
|
|
|
|
.detail_account_bottom_ri {
|
|
|
@@ -1743,7 +1754,7 @@ page {
|
|
|
border-radius: 44rpx;
|
|
|
text-align: center;
|
|
|
line-height: 2.8;
|
|
|
- background-color: #fcd202;
|
|
|
+ background-color: rgba(129, 189, 179, 1);
|
|
|
}
|
|
|
|
|
|
.food_all {
|
|
|
@@ -1851,7 +1862,7 @@ page {
|
|
|
/* 结算 */
|
|
|
.settlement {
|
|
|
width: 94%;
|
|
|
- background-color: #000000;
|
|
|
+ background-color: rgba(129, 189, 179, 0.4);
|
|
|
line-height: 3.4;
|
|
|
border-radius: 49rpx;
|
|
|
position: fixed;
|
|
|
@@ -1859,11 +1870,12 @@ page {
|
|
|
left: 3%;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
+ border: 2rpx solid #568d84;
|
|
|
}
|
|
|
|
|
|
.settlement1 {
|
|
|
width: 94%;
|
|
|
- background-color: #000000;
|
|
|
+ background-color: rgba(129, 189, 179, 0.4);
|
|
|
line-height: 2.8;
|
|
|
border-radius: 49rpx;
|
|
|
position: relative;
|
|
|
@@ -1880,7 +1892,7 @@ page {
|
|
|
.settlement_le {
|
|
|
width: 48%;
|
|
|
padding-left: 18%;
|
|
|
- color: #ffffff;
|
|
|
+ color: #000;
|
|
|
font-size: 30rpx;
|
|
|
}
|
|
|
|
|
|
@@ -1890,7 +1902,7 @@ page {
|
|
|
|
|
|
.settlement_ri {
|
|
|
width: 35%;
|
|
|
- background-color: #fcd202;
|
|
|
+ background-color: #75a599;
|
|
|
font-family: PingFang SC;
|
|
|
font-weight: 800;
|
|
|
color: #333333;
|
|
|
@@ -1919,6 +1931,7 @@ page {
|
|
|
}
|
|
|
|
|
|
.settlement_img image {
|
|
|
+ margin-top: 10rpx;
|
|
|
width: 74rpx;
|
|
|
height: 81rpx;
|
|
|
}
|
|
|
@@ -1930,7 +1943,7 @@ page {
|
|
|
text-align: center;
|
|
|
border-radius: 50%;
|
|
|
position: absolute;
|
|
|
- top: -10rpx;
|
|
|
+ top: 5rpx;
|
|
|
right: 0;
|
|
|
background-color: #ff130a;
|
|
|
color: #ffffff;
|
