This commit is contained in:
weipengfei 2024-03-18 15:34:30 +08:00
parent fa1c47d87c
commit 084f2cfb4b
5 changed files with 37 additions and 11 deletions

View File

@ -215,7 +215,7 @@
fail: function(res) { fail: function(res) {
// //
} }
}) })
} }
}, 1500) }, 1500)
// #endif // #endif

View File

@ -14,17 +14,20 @@
</view> </view>
<view class="shop"> <view class="shop">
<view class="shop-img"> <!-- <view class="shop-img">
<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar" <u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar"
radius="10"> radius="10">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#999"></u-loading-icon> <u-loading-icon color="#999"></u-loading-icon>
</template> </template>
</u-image> </u-image>
</view> </view> -->
<view class="shop-info"> <view class="shop-info">
<view class="shop-info-title">{{store.mer_name}}</view> <view class="shop-info-title" @click="navTo('/pages/store/detail/index?id='+id)">
<text>{{store.mer_name}}</text>
<u-icon name="arrow-right" color="#fff"></u-icon>
</view>
<view class="shop-info-eva"> <view class="shop-info-eva">
<view class="star"> <view class="star">
<u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21" <u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21"
@ -39,7 +42,9 @@
</view> </view>
<view class="shop-info-runtime">营业时间 : 90:0021:00</view> <view class="shop-info-runtime">营业时间 : 90:0021:00</view>
<view class="shop-info-addr iconfont iconfont-xiangyou" @click="showMaoLocation"> <view class="shop-info-addr iconfont iconfont-xiangyou" @click="showMaoLocation">
{{store.mer_address}}</view> <text>{{store.mer_address}}</text>
<u-icon name="arrow-right" :size="12" color="#fff"></u-icon>
</view>
</view> </view>
<view class="shop-logo"> <view class="shop-logo">
@ -689,6 +694,11 @@
}, },
// #endif // #endif
methods: { methods: {
navTo(url){
uni.navigateTo({
url:url
})
},
// //
showMaoLocation: function() { showMaoLocation: function() {
if (!this.store.lat || !this.store.long) return this if (!this.store.lat || !this.store.long) return this
@ -1258,12 +1268,19 @@
.shop-info { .shop-info {
.shop-info-title { .shop-info-title {
max-width: 400rpx; width: 530rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;
font-weight: 600; font-weight: 600;
font-size: 28rpx; font-size: 28rpx;
color: #FFFFFF; color: #FFFFFF;
word-break: break-word; display: flex;
align-items: flex-end;
text{
max-width: 480rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
} }
.shop-info-eva { .shop-info-eva {
@ -1294,12 +1311,20 @@
} }
.shop-info-addr { .shop-info-addr {
width: 440rpx; width: 530rpx;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 22rpx; font-size: 22rpx;
color: #FFFFFF; color: #FFFFFF;
display: flex;
align-items: center;
text{
max-width: 480rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
} }
} }
} }

View File

@ -224,7 +224,7 @@
<view class="text">{{copyright.Copyright}}</view> <view class="text">{{copyright.Copyright}}</view>
<view class="">备案号:蜀ICP备2022030133号-2A</view> <view class="">备案号:蜀ICP备2022030133号-2A</view>
<view class="">增值电信营业许可证号:川B2-20221250</view> <view class="">增值电信营业许可证号:川B2-20221250</view>
<view>版本号</view>
</view> </view>
<!-- <view v-else class="copy-right"> <!-- <view v-else class="copy-right">
<view class="iconfont icon-crmeb"></view> <view class="iconfont icon-crmeb"></view>

View File

@ -685,7 +685,7 @@ import { Toast } from "../../../libs/uniApi";
} }
uni.hideLoading(); uni.hideLoading();
}).catch(res => { }).catch(res => {
console.log( '错误', res); console.log('错误--', res);
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: res.message || res, title: res.message || res,

View File

@ -173,7 +173,9 @@
<view>{{goods.cart_info.productAttr.price}}</view> <view>{{goods.cart_info.productAttr.price}}</view>
<view>x{{goods.product_num}}</view> <view>x{{goods.product_num}}</view>
</view> </view>
<text style="font-size: 22rpx;background-color: #ecfaed;color: #40ae36;border-radius: 40rpx;padding: 5rpx 10rpx;">{{item.merchant.cloud_warehouse}}</text>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
@ -202,7 +204,6 @@
<text class="iconfont icon-shangjiadingdan"></text> <text class="iconfont icon-shangjiadingdan"></text>
<view class="store-name"> <view class="store-name">
<view>{{item.merchant.mer_name}}</view> <view>{{item.merchant.mer_name}}</view>
<text style="font-size: 22rpx;background-color: #ecfaed;color: #40ae36;border-radius: 40rpx;padding: 5rpx 10rpx;">{{item.merchant.cloud_warehouse}}</text>
</view> </view>
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>