解决冲突

This commit is contained in:
cc_zbp 2023-05-16 09:17:58 +08:00
commit d66e47d9ba
3 changed files with 824 additions and 442 deletions

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
<template> <template>
<view class="zbp-head-wrapper"> <view class="zbp-head-wrapper">
<view class="color-lump"></view> <view class="color-lump"></view>
@ -242,4 +243,327 @@
} }
} }
} }
</style> </style>
=======
<template>
<view class="zbp-head-wrapper">
<view class="color-lump"></view>
<view class="bg-img">
<img :src="bgColor" alt="">
</view>
<view class="site-box flex_a_c_j_sb">
<view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi"></view>
<view class="town_name">{{recommend_address}}</view>
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
</navigator>
</view>
<!-- 搜索栏 -->
<navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
<view class="flex_a_c">
<view class="iconfont icon-sousuo"></view>
<input type="text" v-model="keyword" placeholder="搜索产品或店铺">
</view>
<button class="search_btn">搜索</button>
</navigator>
<!-- 轮播图 -->
<view class="supply_chains-head">
<swiper class="swiper l_center" @change="swiperChange" :indicator-dots="swiper.indicatorDots"
:autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration"
indicator-active-color="#fff">
<block v-for="(item,index) in swiper['url']" :key="index">
<swiper-item class="swi_item">
<u--image radius="15" :showLoading="true" :src="item.img" width="694.74rpx" height="242.11rpx"
mode="aspectFill">
</u--image>
</swiper-item>
</block>
</swiper>
</view>
<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
</view>
</template>
<script>
import {
getArea,
getStreet
} from '@/api/article.js';
import {
getIndexData,
getDiy
} from '@/api/api.js'
import {getGeocoder } from '@/api/store.js';
import {
mapGetters
} from 'vuex'
export default {
props: {
isSelectPlace: {
type: Boolean,
default: false
}
},
data() {
return {
showPicker: false,
styleConfig: [],
columnData: [],
homeCombData:[],
keyword: '',
recommend_address: '',
bgColor: '',
swiper: {
url: [{
img: ''
}],
indicatorDots: true, //
vertical: false, //
autoplay: true, //
interval: 2000, //
duration: 400 //
},
}
},
// computed: mapGetters(['location']),
watch: {},
created() {
//#ifdef APP
this.selfLocation()
//#endif
// const loca = JSON.parse(this.location)
// this.street = loca.address_component.street
this.getBanner()
this.Area()
},
methods: {
selectLocation() {
this.isSelectPlace ? this.showPicker = true : ''
},
confirm(e) {
this.showPicker = false
this.$emit('selectPlce', e)
},
changeHandler(e) {
const {
columnIndex,
value,
values,
index,
picker = this.$refs.uPicker
} = e;
if (columnIndex === 0) {
getStreet({
area_code: value[0]['code']
}).then(res => {
picker.setColumnValues(1, res.data);
});
}
},
Area() {
getArea({
city_code: 510500
}).then(res => {
this.$refs.uPicker.setColumnValues(0, res.data);
this.Street(res.data[0]['code']);
});
},
Street(code) {
getStreet({
area_code: code
}).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data);
});
},
selfLocation() {
let self = this
uni.getLocation({
type: 'gcj02',
success: (res) => {
let latitude, longitude;
latitude = res.latitude.toString();
longitude = res.longitude.toString();
this.latitude = res.latitude
this.longitude = res.longitude
getGeocoder({
lat: latitude,
long: longitude
}).then(res => {
console.log(res)
this.detaile_address = res.data.address;
this.location_address = res.data.address;
this.recommend_address = res.data.formatted_addresses.recommend.length > 4 ? res.data.formatted_addresses.recommend.slice(0,7) + '...' : res.data.formatted_addresses.recommend
}).catch(err => {
uni.showToast({
title: err,
icon: 'none'
})
})
},
fail: (res) => {
uni.showToast({
title: res,
icon: 'none',
duration: 1000
});
},
});
},
swiperChange(e) {
let {
current,
source
} = e.detail;
if (source === 'autoplay' || source === 'touch') {
this.bgColor = this.swiper.url[e.detail.current]['img']
}
},
//
objToArr(data) {
let obj = Object.keys(data).sort();
let m = obj.map(key => data[key]);
return m;
},
async getBanner(id) {
let that = this;
const {
data
} = await getDiy({
id: 0
})
that.styleConfig = that.objToArr(data.value);
/* 循环数组得到数据*/
that.styleConfig.forEach((item, index, arr) => {
if (item.name == 'headerSerch' || item.name == 'homeComb') {
if (item.name == 'homeComb') {
that.swiper.url = item.swiperConfig.list
}
}
})
this.bgColor = this.swiper.url[0].img
},
}
}
</script>
<style lang="scss">
.zbp-head-wrapper {
position: relative;
padding-top: 78.95rpx;
overflow: hidden;
.color-lump {
z-index: 1;
position: absolute;
bottom: -86px;
left: 50%;
transform: translate(-50%, 0);
width: 102%;
height: 133px;
border-radius: 30px 30px 0 0;
background-color: #fff;
}
.bg-img {
position: absolute;
width: 100%;
height: 100%;
top: 0;
/* #ifdef MP || APP-PLUS */
z-index: -1;
/* #endif */
/* #ifdef H5 */
z-index: 0;
/* #endif */
z-index: 0;
filter: blur(0);
overflow: hidden;
img {
width: 100%;
height: 100%;
filter: blur(30rpx);
transform: scale(1.5);
}
}
.site-box {
margin: 0 auto;
width: 694.74rpx;
height: 66.67rpx;
margin-bottom: 26.32rpx;
position: relative;
//
.place_wrapper {
color: #fff;
margin-right: 24.56rpx;
font-size: 31.58rpx;
.town_name {
margin-left: 10.53rpx;
}
}
.iconfont {
font-size: 35.09rpx;
}
}
.my-main {
transition: background-color .5s ease;
}
.search_content {
margin: 0 auto;
width: 694.74rpx;
height: 61.4rpx;
padding: 2px 2px 2px 21.05rpx;
border-radius: 100px;
background: #fff;
margin-bottom: 17.54rpx;
position: relative;
box-sizing: border-box;
.icon-sousuo {
font-size: 26.32rpx;
font-weight: bold;
color: #c8c7c6;
margin-right: 17.54rpx;
}
.search_btn {
color: #fff;
width: 105.26rpx;
height: 52.63rpx;
line-height: 52.63rpx;
background: #f84221;
border-radius: 100px;
font-size: 28.07rpx;
}
}
.supply_chains-head {
margin-bottom: 17.54rpx;
position: relative;
z-index: 2;
.swiper {
width: 694.74rpx;
height: 242.11rpx;
margin: 0 auto;
.swi_item {
width: 100%;
height: 242.11rpx;
}
}
}
}
</style>
>>>>>>> a46be7373a3ace79168d4e9e55683ef59cd9db8d

View File

@ -1,491 +1,549 @@
<template> <template>
<view class="Circle_friends"> <view class="Circle_friends">
<view class="circle_friends_wrapper"> <view class="circle_friends_wrapper">
<zbpSwiper></zbpSwiper> <zbpSwiper></zbpSwiper>
<view class="tabs_wrapper"> <view class="tabs_wrapper">
<u-tabs :list="tabsData.list" @click="tabsChange" :activeStyle="tabsData.activeStyle" <u-tabs :list="tabsData.list" @click="tabsChange" :activeStyle="tabsData.activeStyle"
:inactiveStyle="tabsData.inactiveStyle" lineHeight="0" keyName="cate_name"></u-tabs> :inactiveStyle="tabsData.inactiveStyle" lineHeight="0" keyName="cate_name"></u-tabs>
</view> </view>
<view class="goods"> <view class="goods">
<block v-for="(item,index) in cateGoods" :key="index"> <block v-for="(item,index) in cateGoods" :key="index">
<view class="goods_item" @click="gogogo(item)"> <view class="goods_item" @click="gogogo(item)">
<image class="goods_img" :src="item.image[0]" mode="aspectFill"></image> <image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
<view class="botm"> <view class="botm">
<view class="title">{{item.title}}</view> <view class="title">{{item.title}}</view>
<view class="goods_info flex_a_c"> <view class="goods_info flex_a_c">
<view class="l_info flex_a_c"> <view class="l_info flex_a_c">
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill" <image :src="(item.author && item.author.avatar) || '/static/images/f.png'"
class="g_img"></image> mode="aspectFill" class="g_img"></image>
<view class="g_name">{{item.author && item.author.nickname}}</view> <view class="g_name">{{item.author && item.author.nickname}}</view>
</view> </view>
<view class="nice_box" @click.stop="giveStart(item)"> <view class="nice_box" @click.stop="giveStart(item)">
<text class="iconfont" :class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text> <text class="iconfont"
<text class="collect">{{item.count_start}}</text> :class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
</view> <text class="collect">{{item.count_start}}</text>
</view> </view>
</view> </view>
</view> </view>
</block> </view>
</view> </block>
<view class="empty_wrapper" v-if="emptyShow"> </view>
<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty> <view class="empty_wrapper" v-if="emptyShow">
</view> <u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
</view> </view>
</view>
<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm" <u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker> @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<!-- <view class="bg_color"></view> --> <!-- <view class="bg_color"></view> -->
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
<view class="custom_style_icon"></view> <view class="custom_style_icon"></view>
</view> </view>
</template> </template>
</m-tabbar> --> </m-tabbar> -->
</view> </view>
</template> </template>
<script> <script>
import mTabbar from '@/components/m-tabbar/m-tabbar.vue' import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
import zbpSwiper from '@/components/zbpSwiper' import zbpSwiper from '@/components/zbpSwiper'
import { getSlideAPI } from '@/api/lihai.js' import {
import { graphicLstApi, getTopicList, graphicStartApi } from '@/api/community.js' getSlideAPI
import { getIndexData, getDiy } from '@/api/api.js' } from '@/api/lihai.js'
import { getGeocoder, merClassifly } from '@/api/store.js'; import {
import { getArea, getStreet } from '@/api/article.js'; graphicLstApi,
import { Toast } from '@/libs/uniApi' getTopicList,
export default { graphicStartApi
components: { } from '@/api/community.js'
mTabbar, import {
zbpSwiper getIndexData,
}, getDiy
data() { } from '@/api/api.js'
return { import {
bgColor: '', getGeocoder,
showPicker: false, merClassifly
columnData: [], } from '@/api/store.js';
show: false, import {
swiper: { getArea,
url: [{ getStreet
img: '' } from '@/api/article.js';
}], import {
indicatorDots: true, // Toast
vertical: false, // } from '@/libs/uniApi'
autoplay: true, // export default {
interval: 2000, // components: {
duration: 500 // mTabbar,
}, zbpSwiper
tabsData: { },
list: [], data() {
tabsActive: 0, return {
activeStyle: { bgColor: '',
color: '#fff', showPicker: false,
fontWeight: 'bold', columnData: [],
borderRadius: '100px', show: false,
backgroundColor: '#F84221', swiper: {
padding: '15.79rpx 21.05rpx' url: [{
}, img: ''
inactiveStyle: { }],
color: '#000', indicatorDots: true, //
padding: '15.79rpx 21.05rpx', vertical: false, //
} autoplay: true, //
}, interval: 2000, //
where: { duration: 500 //
category_id: 0, },
page: 1, tabsData: {
limit: 30 list: [],
}, tabsActive: 0,
currentItemId: 69, // 0 || 69 activeStyle: {
keyword: '', color: '#fff',
location: '', fontWeight: 'bold',
emptyShow: false, borderRadius: '100px',
street: '', backgroundColor: '#F84221',
cateGoods: [] padding: '15.79rpx 21.05rpx'
} },
}, inactiveStyle: {
onLoad() { color: '#000',
this.getCateList() padding: '15.79rpx 21.05rpx',
this.getGoods() }
this.selfLocation() },
this.Area() where: {
}, category_id: 0,
onShow() {}, page: 1,
methods: { limit: 30
// },
swiperChange(e) { currentItemId: 69, // 0 || 69
let { current, source } = e.detail; keyword: '',
if (source === 'autoplay' || source === 'touch') { location: '',
this.bgColor = this.swiper.url[e.detail.current]['img'] emptyShow: false,
} street: '',
}, cateGoods: []
confirm(e) { }
this.where.street_id = e.value[1].code },
this.showPicker = false onLoad() {
}, this.getBanner()
changeHandler(e) { this.getCateList()
const { columnIndex, value, values, index, picker = this.$refs.uPicker } = e; this.getGoods()
if (columnIndex === 0) { this.selfLocation()
getStreet({ area_code: value[0]['code'] }).then(res => { this.Area()
this.$refs.uPicker.setColumnValues(1, res.data); },
}); onShow() {},
} methods: {
}, //
Area() { swiperChange(e) {
getArea({ city_code: 510500 }).then(res => { let {
this.$refs.uPicker.setColumnValues(0, res.data); current,
this.Street(res.data[0]['code']); source
}); } = e.detail;
}, if (source === 'autoplay' || source === 'touch') {
Street(code) { this.bgColor = this.swiper.url[e.detail.current]['img']
getStreet({ area_code: code }).then(res => { }
this.$refs.uPicker.setColumnValues(1, res.data); },
}); confirm(e) {
}, this.where.street_id = e.value[1].code
gogogo(item) { this.showPicker = false
if (this.tabsData.tabsActive == 1) { },
uni.navigateTo({ changeHandler(e) {
url: '/pages/short_video/nvueSwiper/index?id=' + item.community_id const {
}) columnIndex,
} else { value,
uni.navigateTo({ values,
url: '/pages/plantGrass/plant_detail/index?id=' + item.community_id index,
}) picker = this.$refs.uPicker
} } = e;
}, if (columnIndex === 0) {
giveStart(item) { getStreet({
let status = item.relevance_id ? 0 : 1 area_code: value[0]['code']
graphicStartApi(item.community_id, { status: status }).then(res => { }).then(res => {
Toast(res.message) this.$refs.uPicker.setColumnValues(1, res.data);
this.getGoods() });
}) }
}, },
dianji() { Area() {
this.show = !this.show getArea({
}, city_code: 510500
// }).then(res => {
getGoods: function() { this.$refs.uPicker.setColumnValues(0, res.data);
// category_id=69&page=1&limit=30 this.Street(res.data[0]['code']);
graphicLstApi(this.where).then(res => { });
this.cateGoods = res.data.list },
res.data.list.length <= 0 ? this.emptyShow = true : this.emptyShow = false Street(code) {
}) getStreet({
}, area_code: code
/*获取分类列表*/ }).then(res => {
async getCateList() { this.$refs.uPicker.setColumnValues(1, res.data);
const { data } = await getTopicList() });
this.tabsData.list = [{ },
cate_name: "推荐", gogogo(item) {
category_id: 0 if (this.tabsData.tabsActive == 1) {
}, { cate_name: "视频", category_id: -1, children: [] }, ...data] uni.navigateTo({
}, //#ifdef APP
tabsChange(item) { url: '/pages/short_video/appSwiper/index?id=' + item.community_id
this.where.category_id = item.category_id //#endif
this.getGoods() //#ifndef APP
this.street_id = item.id url: '/pages/short_video/nvueSwiper/index?id=' + item.community_id
this.tabsData.tabsActive = item.index //#endif
if (item.index == 1) { })
uni.navigateTo({ } else {
url: '/pages/short_video/nvueSwiper/index?id=' + '136' uni.navigateTo({
}) url: '/pages/plantGrass/plant_detail/index?id=' + item.community_id
} })
}, }
async getBanner() { },
const { data } = await getDiy({ id: 0 }) giveStart(item) {
if (data.value['1683638943100000']) { let status = item.relevance_id ? 0 : 1
this.swiper.url = data.value['1683638943100000'].swiperConfig.list graphicStartApi(item.community_id, {
} else { status: status
this.swiper.url = data.value['1683875164005000'].swiperConfig.list }).then(res => {
} Toast(res.message)
this.bgColor = this.swiper.url[0].img this.getGoods()
}, })
selfLocation() { },
uni.getLocation({ dianji() {
type: 'gcj02', this.show = !this.show
success: (res) => { },
let latitude, longitude; //
latitude = res.latitude.toString(); getGoods: function() {
longitude = res.longitude.toString(); // category_id=69&page=1&limit=30
getGeocoder({ lat: latitude, long: longitude }).then(res => { graphicLstApi(this.where).then(res => {
this.$store.commit('setLocation', res.data) this.cateGoods = res.data.list
this.street = res.data.address_component.street res.data.list.length <= 0 ? this.emptyShow = true : this.emptyShow = false
}).catch(err => { })
uni.showToast({ title: err, icon: 'none' }) },
}) /*获取分类列表*/
}, async getCateList() {
fail: (err) => { const {
uni.showToast({ data
title: err.errMsg, } = await getTopicList()
icon: 'none', this.tabsData.list = [{
duration: 1000 cate_name: "推荐",
}); category_id: 0
} }, {
}); cate_name: "视频",
}, category_id: -1,
}, children: []
onPullDownRefresh() { }, ...data]
this.getCateList() },
this.getGoods() tabsChange(item) {
this.selfLocation() this.where.category_id = item.category_id
this.Area() this.getGoods()
uni.stopPullDownRefresh() this.street_id = item.id
} this.tabsData.tabsActive = item.index
} if (item.index == 1) {
uni.navigateTo({
url: '/pages/short_video/nvueSwiper/index?id=' + '136'
})
}
},
async getBanner() {
const {
data
} = await getDiy({
id: 0
})
if (data.value['1683638943100000']) {
this.swiper.url = data.value['1683638943100000'].swiperConfig.list
} else {
this.swiper.url = data.value['1683875164005000'].swiperConfig.list
}
this.bgColor = this.swiper.url[0].img
},
selfLocation() {
uni.getLocation({
type: 'gcj02',
success: (res) => {
let latitude, longitude;
latitude = res.latitude.toString();
longitude = res.longitude.toString();
getGeocoder({
lat: latitude,
long: longitude
}).then(res => {
this.$store.commit('setLocation', res.data)
this.street = res.data.address_component.street
}).catch(err => {
uni.showToast({
title: err,
icon: 'none'
})
})
},
fail: (err) => {
uni.showToast({
title: err.errMsg,
icon: 'none',
duration: 1000
});
}
});
},
},
onPullDownRefresh() {
this.getBanner()
this.getCateList()
this.getGoods()
this.selfLocation()
this.Area()
uni.stopPullDownRefresh()
}
}
</script> </script>
<style lang="scss"> <style lang="scss">
page { page {
// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
} }
// //
.head-wrapper { .head-wrapper {
position: relative; position: relative;
padding-top: 78.95rpx; padding-top: 78.95rpx;
overflow: hidden; overflow: hidden;
.color-lump { .color-lump {
z-index: 1; z-index: 1;
position: absolute; position: absolute;
bottom: -86px; bottom: -86px;
left: 50%; left: 50%;
transform: translate(-50%, 0); transform: translate(-50%, 0);
width: 102%; width: 102%;
height: 133px; height: 133px;
border-radius: 30px 30px 0 0; border-radius: 30px 30px 0 0;
background-color: #fff; background-color: #fff;
} }
.bg-img { .bg-img {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
top: 0; top: 0;
/* #ifdef MP || APP-PLUS */ /* #ifdef MP || APP-PLUS */
z-index: -1; z-index: -1;
/* #endif */ /* #endif */
/* #ifdef H5 */ /* #ifdef H5 */
z-index: 0; z-index: 0;
/* #endif */ /* #endif */
z-index: 0; z-index: 0;
filter: blur(0); filter: blur(0);
overflow: hidden; overflow: hidden;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
filter: blur(30rpx); filter: blur(30rpx);
transform: scale(1.5); transform: scale(1.5);
} }
} }
.site-box { .site-box {
margin: 0 auto; margin: 0 auto;
width: 694.74rpx; width: 694.74rpx;
height: 66.67rpx; height: 66.67rpx;
margin-bottom: 26.32rpx; margin-bottom: 26.32rpx;
position: relative; position: relative;
// //
.place_wrapper { .place_wrapper {
color: #fff; color: #fff;
margin-right: 24.56rpx; margin-right: 24.56rpx;
font-size: 31.58rpx; font-size: 31.58rpx;
.town_name { .town_name {
margin-left: 10.53rpx; margin-left: 10.53rpx;
} }
} }
.iconfont { .iconfont {
font-size: 35.09rpx; font-size: 35.09rpx;
} }
} }
.my-main { .my-main {
transition: background-color .5s ease; transition: background-color .5s ease;
} }
.search_content { .search_content {
margin: 0 auto; margin: 0 auto;
width: 694.74rpx; width: 694.74rpx;
height: 61.4rpx; height: 61.4rpx;
padding: 2px 2px 2px 21.05rpx; padding: 2px 2px 2px 21.05rpx;
border-radius: 100px; border-radius: 100px;
background: #fff; background: #fff;
margin-bottom: 17.54rpx; margin-bottom: 17.54rpx;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
.icon-sousuo { .icon-sousuo {
font-size: 26.32rpx; font-size: 26.32rpx;
font-weight: bold; font-weight: bold;
color: #c8c7c6; color: #c8c7c6;
margin-right: 17.54rpx; margin-right: 17.54rpx;
} }
.search_btn { .search_btn {
color: #fff; color: #fff;
width: 105.26rpx; width: 105.26rpx;
height: 52.63rpx; height: 52.63rpx;
line-height: 52.63rpx; line-height: 52.63rpx;
background: #f84221; background: #f84221;
border-radius: 100px; border-radius: 100px;
font-size: 28.07rpx; font-size: 28.07rpx;
} }
} }
.supply_chains-head { .supply_chains-head {
margin-bottom: 31.58rpx; margin-bottom: 31.58rpx;
position: relative; position: relative;
z-index: 2; z-index: 2;
.swiper { .swiper {
width: 694.74rpx; width: 694.74rpx;
height: 242.11rpx; height: 242.11rpx;
margin: 0 auto; margin: 0 auto;
.swi_item { .swi_item {
width: 100%; width: 100%;
height: 242.11rpx; height: 242.11rpx;
} }
} }
} }
} }
.Circle_friends { .Circle_friends {
position: relative; position: relative;
padding: 0 0 87.72rpx 0; padding: 0 0 87.72rpx 0;
background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
} }
.circle_friends_wrapper { .circle_friends_wrapper {
position: relative; position: relative;
z-index: 2; z-index: 2;
} }
.bg_color { .bg_color {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: 1; z-index: 1;
width: 100%; width: 100%;
height: 940.35rpx; height: 940.35rpx;
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/home_bg.png") no-repeat; background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/home_bg.png") no-repeat;
background-size: cover; background-size: cover;
} }
.search_wrapper { .search_wrapper {
width: 694.74rpx; width: 694.74rpx;
margin: 0 auto; margin: 0 auto;
} }
.tabs_wrapper { .tabs_wrapper {
width: 694.74rpx; width: 694.74rpx;
margin: 0 auto; margin: 0 auto;
margin-top: 0; margin-top: 0;
margin-bottom: 21.05rpx; margin-bottom: 21.05rpx;
::v-deep .u-tabs__wrapper__nav__item { ::v-deep .u-tabs__wrapper__nav__item {
padding: 0 !important; padding: 0 !important;
} }
} }
.empty_wrapper { .empty_wrapper {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.goods { .goods {
margin: 0 auto; margin: 0 auto;
width: 694.74rpx; width: 694.74rpx;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.goods_item { .goods_item {
width: 342.11rpx; width: 342.11rpx;
height: 491.23rpx; height: 491.23rpx;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: 10.53rpx; margin-bottom: 10.53rpx;
.goods_img { .goods_img {
width: 100%; width: 100%;
height: 294.74rpx; height: 294.74rpx;
} }
.botm { .botm {
flex: 1; flex: 1;
padding: 0 14.04rpx; padding: 0 14.04rpx;
padding-bottom: 21.05rpx; padding-bottom: 21.05rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.title { .title {
margin: 12px 0; margin: 12px 0;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.goods_info { .goods_info {
justify-content: space-between; justify-content: space-between;
.g_img { .g_img {
width: 60rpx; width: 60rpx;
height: 60rpx; height: 60rpx;
border-radius: 50%; border-radius: 50%;
} }
.g_name { .g_name {
margin-left: 8.77rpx; margin-left: 8.77rpx;
width: 100.63rpx; width: 100.63rpx;
text-overflow: ellipsis; text-overflow: ellipsis;
/* 溢出显示省略号 */ /* 溢出显示省略号 */
overflow: hidden; overflow: hidden;
/* 溢出隐藏 */ /* 溢出隐藏 */
white-space: nowrap; white-space: nowrap;
/* 强制不换行 */ /* 强制不换行 */
} }
.nice_box { .nice_box {
display: flex; display: flex;
align-items: center; align-items: center;
.isshow { .isshow {
color: #FE3530 !important; color: #FE3530 !important;
} }
.iconfont { .iconfont {
font-size: 30rpx; font-size: 30rpx;
} }
.icon-shoucang1 { .icon-shoucang1 {
color: #F84221; color: #F84221;
} }
.collect { .collect {
font-size: 24rpx; font-size: 24rpx;
margin-left: 5rpx; margin-left: 5rpx;
} }
} }
} }
} }
} }
} }
</style> </style>

View File

@ -1,7 +1,7 @@
<template> <template>
<view class="Circle_friends"> <view class="Circle_friends">
<view class="circle_friends_wrapper"> <view class="circle_friends_wrapper">
<zbpSwiper :isSelectPlace="true" @selectPlce="selectPlce"></zbpSwiper> <zbpSwiper></zbpSwiper>
<view class="shop_wrapper"> <view class="shop_wrapper">
<navigator class="l_yun" hover-class="none" <navigator class="l_yun" hover-class="none"
:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`"> :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`">
@ -162,7 +162,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
page { page {
background-color: #F5F5F5; background-color: #F5F5F5;
} }
@ -188,7 +188,7 @@
.l_yun { .l_yun {
width: 456.14rpx; width: 456.14rpx;
border-radius: 8px; border-radius: 16rpx;
background-image: url("@/static/images/zonghe.png"); background-image: url("@/static/images/zonghe.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
@ -223,7 +223,7 @@
.iconlihai { .iconlihai {
font-size: 24.56rpx; font-size: 24.56rpx;
margin-left: 8px; margin-left: 16rpx;
} }
} }
@ -250,7 +250,7 @@
background: url("@/static/images/lihaiyun.png") no-repeat; background: url("@/static/images/lihaiyun.png") no-repeat;
background-size: cover; background-size: cover;
box-sizing: border-box; box-sizing: border-box;
border-radius: 8px; border-radius: 16rpx;
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
@ -271,7 +271,7 @@
width: 694.74rpx; width: 694.74rpx;
margin: 0 auto; margin: 0 auto;
background-color: #fff; background-color: #fff;
border-radius: 8px; border-radius: 16rpx;
padding: 0 24.56rpx; padding: 0 24.56rpx;
box-sizing: border-box; box-sizing: border-box;