zhengjinyi 4 vuotta sitten
vanhempi
commit
dbff1d1894

+ 5 - 2
common/css/iconfont.scss

@@ -4,7 +4,7 @@
 	font-family: iconfont;
 	font-weight: normal;
 	font-style: normal;
-	src: url('~@/static/iconfont/iconfont.ttf') format('truetype');
+	src: url('https://at.alicdn.com/t/font_1519039_7j33jbdaqau.ttf') format('truetype');
 }
 .iconfont {
 	font-family: "iconfont" !important;
@@ -13,6 +13,10 @@
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
+.icon-gou1:before {
+  content: "\e6df";
+}
+
 .icon-shouhuodizhiguanli:before {
   content: "\e6de";
 }
@@ -429,4 +433,3 @@
   content: "\e611";
 }
 
-

+ 201 - 0
h5/pages/activity/activity-list.vue

@@ -0,0 +1,201 @@
+<template>
+	<view class="activity-container">
+		<scroll-view scroll-y="true" >
+			<view class="list" v-for="(item, index) in list" :key="index">
+				<image class="list-image" :src="item.image" mode="scaleToFill"></image>
+				<view class="title">{{item.title}}</view>
+				<view class="time">
+					<view class="text">{{item.detail}}</view>
+				</view>
+			</view>
+			<!--加载loadding-->
+			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+			<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+			<!--加载loadding-->
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+	    data() {
+	        return {
+				isEmpty:false,
+				nomoreText: '上拉显示更多',
+				pageNum:1,
+				pageSize:10,
+				hasNextPage:false,
+				loadding: false,
+				pullUpOn: true,
+				pullFlag: true,
+				allowDataStatus:true,
+				wrapperHeight:'100%',
+				scrollHeight:'',
+			    list:[
+				   {
+					   "id":997,
+					   "status":2,
+					   "title":"采美优惠:双11第二波惊喜福利来袭!!!",
+					   "detail":"2020-10-29~2020-11-30",
+					   "link":"https://www.caimei365.com/page.html?id=274",
+					   "image":"https://img.caimei365.com/group1/M00/03/C2/Cmis2F-bzCOATrdjAAQxN7DRfks231.jpg",
+					   "beginTime":"2020-10-28T16:00:00.000+00:00",
+					   "endTime":"2020-11-30T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":996,
+					   "status":2,
+					   "title":"采美优惠 | 别让心爱的产品/仪器躺在购物车里让它躺在你的店里!",
+					   "detail":"2020-10-22~2020-11-30",
+					   "link":"https://www.caimei365.com/page.html?id=273",
+					   "image":"https://img.caimei365.com/group1/M00/03/C1/Cmis2F-SlLiAC2lgAAVioC57lLw433.jpg",
+					   "beginTime":"2020-10-21T16:00:00.000+00:00",
+					   "endTime":"2020-11-30T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":995,
+					   "status":2,
+					   "title":"采美优惠 | 德玛莉澎湃系列买十送二有了它们秋季护肤一点都不难",
+					   "detail":"2020-10-15~2020-11-15",
+					   "link":"https://www.caimei365.com/page.html?id=272",
+					   "image":"https://img.caimei365.com/group1/M00/03/CE/Cmis21-H8OSAGDhVAAMGgZ2d6vA013.jpg",
+					   "beginTime":"2020-10-14T16:00:00.000+00:00",
+					   "endTime":"2020-11-15T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":983,
+					   "status":3,
+					   "title":"采美优惠 | 晓宫主系列买三送一畅饮秋天里的N杯奶茶",
+					   "detail":"",
+					   "link":"https://www.caimei365.com/cmpage/info-4-271.html",
+					   "image":"https://img.caimei365.com/group1/M00/03/BC/Cmis2F9y9CuAGyhqAELYh8rIUkQ318.jpg",
+					   "beginTime":"2019-09-28T16:00:00.000+00:00",
+					   "endTime":"2020-10-29T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":982,
+					   "status":3,
+					   "title":"采美优惠 | 塑欣填充玻尿酸满十就送货比三家还是这里的风景独好",
+					   "detail":"",
+					   "link":"https://www.caimei365.com/cmpage/info-4-270.html",
+					   "image":"https://img.caimei365.com/group1/M00/03/BA/Cmis2F9sXoCAMew_AAVnnTEnzjs592.jpg",
+					   "beginTime":"2020-09-23T16:00:00.000+00:00",
+					   "endTime":"2020-10-24T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":981,
+					   "status":3,
+					   "title":"采美临期 | 点斗临期产品史上最低价格 1.9折 数量有限 欲购从先",
+					   "detail":"",
+					   "link":"https://www.caimei365.com/cmpage/info-4-269.html",
+					   "image":"https://img.caimei365.com/group1/M00/03/CA/Cmis219kIu6Ac7oqAAhfDhDakds337.jpg",
+					   "beginTime":"2020-09-17T16:00:00.000+00:00",
+					   "endTime":"2020-10-18T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":980,
+					   "status":3,
+					   "title":"9月10美博会仪器延期",
+					   "detail":"",
+					   "link":"https://www.caimei365.com/cmpage/info-4-268.html",
+					   "image":"https://img.caimei365.com/group1/M00/03/B5/Cmis2F9bLrGAG5UyAAMbOsIEo1I083.jpg",
+					   "beginTime":"2020-09-09T16:00:00.000+00:00",
+					   "endTime":"2020-09-18T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":979,
+					   "status":3,
+					   "title":"	采美优惠 | 瑞恺迪小气泡 美博会线上一口价11000元/台 代理商都拿不到的",
+					   "detail":"",
+					   "link":"https://www.caimei365.com/cmpage/info-4-267.html",
+					   "image":"https://img.caimei365.com/group1/M00/03/B4/Cmis2F9Z2NOAH7nUAANj_11D4Jo019.jpg",
+					   "beginTime":"2020-09-02T16:00:00.000+00:00",
+					   "endTime":"2020-10-02T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":955,
+					   "status":3,
+					   "title":"采美优惠 | 购买冷风机赠送价值5000元的口罩。",
+					   "detail":"",
+					   "link":"https://www.caimei365.com/cmpage/info-4-266.html",
+					   "image":"https://img.caimei365.com/group1/M00/03/B0/Cmis2F9HcJuAExCdAAT1g6O9xwM704.jpg",
+					   "beginTime":"2020-08-26T16:00:00.000+00:00",
+					   "endTime":"2020-09-27T15:59:59.000+00:00"
+				   },
+				   {
+					   "id":954,
+					   "status":3,
+					   "title":"采美优惠 | 买伯纳赫送点斗 买一送一送完为止!",
+					   "detail":"",
+					   "link":"https://www.caimei365.com/cmpage/info-4-265.html",
+					   "image":"https://img.caimei365.com/group1/M00/03/AF/Cmis2F8_K9-APOEpAANFhTKvw1A467.jpg",
+					   "beginTime":"2020-08-19T16:00:00.000+00:00",
+					   "endTime":"2020-09-20T15:59:59.000+00:00"
+				   }
+			   ],
+	        }
+	    },
+		onLoad(option) {
+			
+		},
+		methods:{
+			
+			navToDetailPage() {//跳转商品详情页
+				this.$api.navigateTo(`/pages/goods/product?id=${this.productID}`)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #FFFFFF;
+	}
+	.activity-container{
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+	}
+	.list{
+		width: 100%;
+		height: 318rpx;
+		float: left;
+		margin-bottom: 20rpx;
+		position: relative;
+		.list-image{
+			width: 100%;
+			height: 318rpx;
+			display: block;
+		}
+		.title{
+			width: 100%;
+			height: 72rpx;
+			line-height: 72rpx;
+			text-align: center;
+			background: rgba(254,246,243,0.8);
+			color: $color-system;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			font-size: $font-size-26;
+		}
+		.time{
+			width: 100%;
+			height: 48rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			.text{
+				width: 475rpx;
+				height: 48rpx;
+				font-size: $font-size-24;
+				margin: 0 auto;
+				line-height: 48rpx;
+				background:  linear-gradient(315deg, #f94b4b 0%, #bc3cff 100%);
+				color: #FFFFFF;
+				text-align: center;
+			}
+		}
+	}
+</style>

+ 12 - 0
pages.json

@@ -26,6 +26,11 @@
 			"style": {
 				"navigationBarTitleText": "搜索"
 			}
+		},{
+			"path": "pages/search/search-supplier",
+			"style": {
+				"navigationBarTitleText": "搜索供应商"
+			}
 		},{
 			"path": "pages/tabBar/cart/cart",
 			"style": {
@@ -479,6 +484,13 @@
 						"navigationBarTitleText": "新品上线",
 						"enablePullDownRefresh":true
 					}
+				},
+				{
+					"path": "pages/activity/activity-list",
+					"style": {
+						"navigationBarTitleText": "商品专题",
+						"enablePullDownRefresh":true
+					}
 				}
 			]	
 		},{

+ 571 - 0
pages/search/search-supplier.vue

@@ -0,0 +1,571 @@
+<template>
+	<view class="container supplier clearfix">
+		<view class="supplier-search clearfix">
+			<view class="search-from name">
+				<text class="iconfont icon-sousuo"></text>
+				<input class="input" 
+					   type="text" 
+					   confirm-type="search" 
+					   v-model="searchInputVal" 
+					   @input="onShowClose" 
+					   @confirm="initsupplierList()" 
+					   placeholder="请输入供应商名称" 
+					   maxlength="16"/>
+				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+			</view>
+			<view class="search-btn">
+				<button class="search-btn" type="default" @click.stop="searchsupplierList">搜索</button>
+			</view>
+		</view>
+		<view class="supplier-main">
+			<view v-if="isEmpty" class="empty-container">
+				<image class="supplier-empty-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png" mode="aspectFit"></image>
+				<view class="txt">暂无供应商数据</view>
+			</view>
+			<view v-else class="supplier-list">
+					<view class="list clearfix" v-for="(item, index) in supplierList" :key="index">
+						<view class="list-top">
+							<view class="list-top-supplier" @click="goSupplier">
+								<view class="logo"><img :src="item.image" alt=""></view>
+								<view class="main">
+									<view class="name">{{ item.name }}</view>
+									<view class="massgs">
+										<view class="label">满意度:</view>
+										<view class="p-stars">
+											<uni-stars :stars="6" :iconClass="iconClass" :iconColor="iconColor" :fontSize="36" :widthInfo="176"></uni-stars>
+										</view>
+									</view>
+								</view>
+								<view class="right"><text class="iconfont icon-xiayibu"></text></view>
+							</view>
+							<view class="list-top-msg">
+								<view class="msg-pin clearfix">
+									<view class="label">经营品项:</view>
+									<view class="label-li">
+										<text class="text" v-for="(label, idx) in item.labels" :key="idx">{{ label.text }}</text>
+									</view>
+								</view>
+								<view class="msg-pin clearfix">
+									<view class="label">经营品项:</view>
+									<view class="label-text">广东省深圳市</view>
+								</view>
+							</view>
+						</view>
+						<view class="list-bottom">
+							<view class="pros-item" v-for="(pros, pdx) in item.list" :key="pdx">
+								<image class="pros-item-image" :src="pros.image" mode="scaleToFill"></image>
+								<view class="pros-name">{{ pros.name }}</view>
+							</view>
+						</view>
+					</view>
+					<!--加载loadding-->
+					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<!--加载loadding-->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import authorize from '@/common/config/authorize.js'	
+	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
+	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import uniStars from '@/components/uni-stars/uni-stars.vue'
+	
+	import { getFindAllsupplierList } from "@/api/seller.js"
+	export default {
+		components:{
+			tuiLoadmore,
+			tuiNomore,
+			uniStars
+		},
+		data() {
+			return {
+				iconClass:'icon-aixin',
+				iconColor:'#ff9100',
+				serviceProviderId:'',
+				isShowClose:false,
+				searchInputVal:'',
+				isEmpty:false,
+				nomoreText: '上拉显示更多',
+				pageNum:1,
+				pageSize:10,
+				hasNextPage:false,
+				loadding: false,
+				pullUpOn: true,
+				pullFlag: true,
+				allowDataStatus:true,
+				wrapperHeight:'100%',
+				scrollHeight:'',
+				deleteAddressId:'',
+				currPage:'',//当前页面
+				prevPage:'',//上一个页面
+				tabCurrentIndex:0,
+				listStatus:1,
+				supplierList:[
+					{
+						image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+						name:'北京恩盛众成国际贸易有限公司',
+						labels:[
+							{text:'仪器护理类'},
+							{text:'仪器护理类'},
+							{text:'仪器护理类'},
+							{text:'仪器护理类'}
+						],
+						areatext:'广东省深圳市福田区',
+						list:[
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+						]
+					},{
+						image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+						name:'北京恩盛众成国际贸易有限公司',
+						labels:[
+							{text:'仪器护理类'},
+							{text:'仪器护理类'},
+							{text:'仪器护理类'},
+							{text:'仪器护理类'}
+						],
+						areatext:'广东省深圳市福田区',
+						list:[
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+						]
+					},{
+						image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+						name:'北京恩盛众成国际贸易有限公司',
+						labels:[
+							{text:'仪器护理类'},
+							{text:'仪器护理类'},
+							{text:'仪器护理类'},
+							{text:'仪器护理类'}
+						],
+						areatext:'广东省深圳市福田区',
+						list:[
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+						]
+					},{
+						image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+						name:'北京恩盛众成国际贸易有限公司',
+						labels:[
+							{text:'仪器护理类'},
+							{text:'仪器护理类'},
+							{text:'仪器护理类'},
+							{text:'仪器护理类'}
+						],
+						areatext:'广东省深圳市福田区',
+						list:[
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+							{
+								image:'https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png',
+								name:'北京恩盛众成国际贸易有限公司',
+							},
+						]
+					},
+				],
+				isIphoneX:this.$store.state.isIphoneX,
+				show_index:0,//控制显示那个组件
+			}
+		},
+		onLoad(){				
+			this.setScrollHeight();
+		},
+		methods: {
+			setScrollHeight() {
+				// 窗口高度 - 底部距离
+				setTimeout(()=> {
+					const query = wx.createSelectorQuery().in(this);
+					query.selectAll('.add-btn').boundingClientRect();
+					query.exec(res => {
+						if(res[0][0]){
+							let winHeight = this.$api.getWindowHeight(),
+								eleTop = res[0][0].top - 1;
+								this.scrollHeight =  eleTop;
+						}
+					})
+				}, 500)
+			},
+			searchsupplierList(){
+				this.pageNum=1
+				this.initsupplierList()
+			},
+			initsupplierList(){	
+				let params = { searchWord:this.searchInputVal,pageNum:1,pageSize:this.pageSize }
+				getFindAllsupplierList(params).then(response =>{
+					let responseData = response.data
+					if(responseData.results&&responseData.results.length > 0){
+						this.isEmpty = false
+						this.hasNextPage = response.data.hasNextPage
+						this.supplierList =responseData.results
+						this.pullFlag = false;
+						setTimeout(()=>{this.pullFlag = true;},500)
+						if(this.hasNextPage){
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						}else{
+							this.pullUpOn = true
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}else{
+						this.isEmpty = true
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},	
+			getOnReachBottomData(){
+				this.pageNum+=1
+				let params = {searchWord:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize }
+				getFindAllsupplierList(params).then(response =>{
+					let responseData = response.data
+					if(responseData.results&&responseData.results.length > 0){
+						this.hasNextPage = response.data.hasNextPage
+						this.supplierList = this.supplierList.concat(responseData.results) 
+						this.pullFlag = false;// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true;},500)
+						if(this.hasNextPage){
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						}else{
+							this.pullUpOn = false
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			goOperator(item){
+				this.$api.setStorage('orderUserInfo',item)
+				this.$api.navigateTo('/seller/pages/supplier/addoperator')
+			},
+			onShowClose () {//输入框失去焦点时触发
+				if(this.searchInputVal != ''){
+					this.isShowClose = true
+				}else{					
+					this.isShowClose = false
+					this.pageNum=1
+					this.initsupplierList()
+				}
+			},
+			delInputText(){//清除输入框内容
+				this.searchInputVal = ''
+				this.isShowClose = false
+				this.pageNum=1
+				this.initsupplierList()
+			},
+			hidePhone(val){
+				let phone
+				if(val==null || val==""){
+					phone = ""	
+				}else{
+					phone = this.$reg.hidePhone(val)
+				}
+				return phone
+			},
+			checkData (value){
+				let data;
+				if(value == null || value ==""){
+					data = ''
+				}else{
+					data = value
+				}
+				return data
+			},
+			desensitizationName(val){
+				let name = this.$reg.desensitizationName(val)
+				return name
+			}
+		},
+		onReachBottom() {
+			if(this.hasNextPage){
+				this.loadding = true
+				this.pullUpOn = true
+				this.getOnReachBottomData()
+			}	
+		},
+		onShow() {
+			this.$api.getStorage().then(response =>{
+				this.serviceProviderId = response.serviceProviderID
+				this.pageNum = 1;
+				this.initsupplierList();
+			})
+		}
+	}
+</script>
+
+<style lang='scss'>
+	page {
+		height: auto;
+	}
+	page,.container{
+		/* padding-bottom: 120upx; */
+		background: #F7F7F7;
+	}
+	.container{
+		position: relative;
+	}
+	.supplier {
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+	}
+	.supplier-search{
+		height: 64rpx;
+		width: 702rpx;
+		padding: 24rpx;
+		background: #FFFFFF;
+		display: flex;
+		align-items: center;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		.search-from{
+			width: 582rpx;
+			height: 64rpx;
+			background: #F7F7F7;
+			border-radius: 32rpx;
+			float: left;
+			position: relative;
+			.input{
+				width: 500rpx;
+				height: 64rpx;
+				float: left;
+				line-height: 64rpx;
+				color: $text-color;
+				font-size: $font-size-24;
+			}
+			.icon-sousuo{
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				display: block;
+				font-size: $font-size-38;
+				float: left;
+				color: #999999;
+			}
+			.icon-shanchu1{
+				font-size: $font-size-32;
+				color: #999999;
+				position: absolute;
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				top: 0;
+				right: 0;
+				z-index: 10;
+			}
+		}
+		.search-btn{
+			width: 120rpx;
+			line-height: 64rpx;
+			text-align: center;
+			font-size: $font-size-28;
+			color: $text-color;
+			float: left;
+			background: #FFFFFF;
+		}
+	}
+	.supplier-main{
+		padding-top: 112rpx;
+	}
+	.list{
+		box-sizing: border-box;
+		padding: 0 24rpx;
+		background-color:#FFFFFF ;
+		margin-bottom: 20rpx;
+	}
+	.list-top{
+		width: 100%;
+		height: auto;
+	}
+	.list-top-msg{
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding-left: 115rpx;
+		.msg-pin{
+			width: 100%;
+			height: auto;
+			margin-bottom: 16rpx;
+			.label{
+				float: left;
+				line-height: 37rpx;
+				font-size: $font-size-26;
+				color: #999999;
+			}
+			.label-li{
+				width: 476rpx;
+				float: left;
+				line-height: 37rpx;
+				.text{
+					display: inline-block;
+					padding: 0 8rpx;
+					height: 33rpx;
+					border-radius: 6rpx;
+					background-color: #86b2fb;
+					color: #FFFFFF;
+					line-height: 33rpx;
+					float: left;
+					font-size: $font-size-20;
+					text-align: center;
+					margin: 10rpx;
+				}
+			}
+			.label-text{
+				line-height: 37rpx;
+				font-size: $font-size-26;
+				color: #999999;
+				margin-left: 10rpx;
+				float: left;
+			}
+		}
+	}
+	.list-top-supplier{
+		width: 100%;
+		height: 140rpx;
+		padding: 30rpx 0 10rpx 0;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		position: relative;
+		box-sizing: border-box;
+		.logo{
+			width: 90rpx;
+			height: 72rpx;
+			float: left;
+			border: 1px solid #efefef;
+			border-radius: 6rpx;
+			image{
+				width: 100%;
+				height: 100%;
+				display: block;
+				border-radius: 6rpx;
+			}
+		}
+		.main{
+			width: 470rpx;
+			height: 92rpx;
+			float: left;
+			margin-left: 20rpx;
+			.name{
+				width: 100%;
+				line-height: 46rpx;
+				float: left;
+				font-size: $font-size-28;
+				color: $text-color;
+				float: right;
+				overflow: hidden;
+				text-overflow:ellipsis;
+				white-space: nowrap;
+				text-align: left;
+			}
+			.massgs{
+				width: 100%;
+				line-height: 46rpx;
+				float: left;
+				font-size: $font-size-24;
+				color: #999999;
+				.label{
+					float: left;
+				}
+				.p-stars{
+					float: left;
+					margin-left: 20rpx;
+				}
+			}
+		}
+		.icon-xiayibu{
+			line-height: 154rpx;
+			display: inline-block;
+			position: absolute;
+			width: 48rpx;
+			top: 0;
+			right: 0;
+			color: #b2b2b2;
+		}
+	}
+	.list-bottom{
+		width: 100%;
+		height: auto;
+		float: left;
+		padding: 20rpx 0;
+		.pros-item{
+			width: 220rpx;
+			height: auto;
+			float: left;
+			margin-right: 20rpx;
+			&:last-child{
+				margin-right: 0;
+			}
+			.pros-item-image{
+				width: 218rpx;
+				height: 218rpx;
+				display: block;
+				float: left;
+				border: 1px solid #EBEBEB;
+				border-radius: 6rpx;
+			}
+			.pros-name{
+				width: 100%;
+				height: 54rpx;
+				line-height: 54rpx;
+				box-sizing: border-box;
+				padding: 0 10rpx;
+				font-size: $font-size-24;
+				color: #666666;
+				white-space: normal;
+				word-break: break-all;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+			}
+		}
+	}
+</style>
+

+ 0 - 1
seller/pages/club/allClub-list.vue

@@ -23,7 +23,6 @@
 				<view class="txt">暂无机构数据</view>
 			</view>
 			<view v-else class="club-list">
-				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
 							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>