修改优化

common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.woff2?t=1701152770177') format('woff2'),
-       url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.woff?t=1701152770177') format('woff'),
-       url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.ttf?t=1701152770177') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_1519039_1dbk8r8fldb.woff2?t=1701851301194') format('woff2'),
+       url('//at.alicdn.com/t/c/font_1519039_1dbk8r8fldb.woff?t=1701851301194') format('woff'),
+       url('//at.alicdn.com/t/c/font_1519039_1dbk8r8fldb.ttf?t=1701851301194') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-gongyingshang1:before {
+  content: "\e760";
+}
+
+.icon-jigou1:before {
+  content: "\e761";
+}
+
+.icon-zhengpin1:before {
+  content: "\e75f";
+}
+
 .icon-youjiantou:before {
   content: "\e603";
 }

components/cm-module/homeIndex/banner.vue

@@ -1,5 +1,50 @@
 <template>
 	<view class="banner">
+		<view class="swiper-banner-msg">
+			<view class="content">
+				<view class="item le">
+					<view class="item-icon">
+						<text class="iconfont icon-zhengpin1"></text>
+					</view>
+					<view class="item-sm">
+						<text>正品保证</text>
+					</view>
+				</view>
+				<view class="item ce">
+					<view class="item-icon">
+						<text class="iconfont icon-jigou1"></text>
+					</view>
+					<view class="item-sm">
+						<text>12000+机构</text>
+					</view>
+				</view>
+				<view class="item ri">
+					<view class="item-sm">
+						<text>100+供应商</text>
+					</view>
+					<view class="item-icon">
+						<text class="iconfont icon-gongyingshang1"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="tui-rolling-view">
+			<view class="tui-rolling-content">
+				<view class="tui-rolling-news">
+					<text class="tui-roll-label">公告：</text>
+					<swiper vertical autoplay circular interval="3500" class="tui-swiper">
+						<swiper-item v-for="(item, index) in list" :key="index" class="tui-swiper-item">
+							<view class="tui-news-item" @tap="detail(item)">
+								<text class="news-dot"></text> {{ item.title }}
+							</view>
+						</swiper-item>
+					</swiper>
+					<view class="tui-roll-more" @tap="newsList(item)">
+						更多<text class="iconfont icon-xiayibu"></text>
+					</view>
+				</view>
+			</view>
+		</view>
 		<view class="swiper-banner-content">
 			<view class="swiper-banner-box">
 				<swiper
@@ -26,19 +71,6 @@
 				</view>
 			</view>
 		</view>
-		<view class="swiper-banner-msg">
-			<view class="content">
-				<view class="item le">
-					<text class="iconfont icon-zhengpin"><text class="sm">正品保证</text></text>
-				</view>
-				<view class="item ce">
-					<text class="iconfont icon-jigou"><text class="sm">12000+机构</text></text>
-				</view>
-				<view class="item ri">
-					<text class="iconfont icon-gongyingshang"><text class="sm">100+供应商</text></text>
-				</view>
-			</view>
-		</view>
 	</view>
 </template>
 
@@ -50,6 +82,9 @@ export default {
 	props: {
 		list: {
 			type: Array
+		},
+		newsList: {
+			type: Array
 		}
 	},
 	data() {
@@ -61,6 +96,12 @@ export default {
 	created() {},
 	computed: {},
 	methods: {
+		detail(item){// 跳转公告详情
+			this.$api.navigateTo(`/pages/service/news-detailes?id=${item.id}`)
+		},
+		newsList(){// 公告列表
+			this.$api.navigateTo('/pages/service/news-list')
+		},
 		swiperChange(e) {
 			//轮播图切换
 			const index = e.detail.current
@@ -68,7 +109,7 @@ export default {
 		},
 		NavToDetailPage(item) {
 			//跳转
-			this.cmsSysStatistics(1,item.id)
+			this.cmsSysStatistics(1, item.id)
 			this.$api.FlooryNavigateTo(item)
 		}
 	}
@@ -77,16 +118,14 @@ export default {
 
 <style lang="scss" scoped>
 .banner {
-	background-color: #f7f7f7;
+	margin-top: 50px;
+	background: #f7f7f7;
 }
 .swiper-banner-content {
 	width: 100%;
 	height: auto;
-	margin-top: 55px;
-	background: url(https://static.caimei365.com/app/img/bg/new_home_cumres@2x.png) no-repeat;
 	position: relative;
-	background-size: cover;
-	background-position-y: -170rpx;
+	background: linear-gradient(180deg, #FFFFFF 0%, rgba(255,255,255,0) 100%);
 }
 .swiper-banner-box {
 	width: 100%;
@@ -94,18 +133,19 @@ export default {
 	position: relative;
 	background-size: cover;
 	display: flex;
+	opacity: 1;
+	background: linear-gradient(180deg, #FFFFFF 0%, rgba(255,255,255,0) 100%);
 }
 .tui-banner-swiper {
 	width: 700rpx;
 	margin: 0 auto;
 	height: 340rpx;
-	border-radius: 24rpx;
+	border-radius: 16rpx;
 	overflow: hidden;
 	transform: translateY(0);
-	box-shadow: 0px 3px 6px rgba(225, 86, 22, 0.08);
-	margin-top: 16rpx;
+	background: linear-gradient(180deg, #FFFFFF 0%, rgba(255,255,255,0) 100%);
 	.banner-item {
-		border-radius: 24rpx;
+		border-radius: 16rpx;
 	}
 	.tui-slide-image {
 		width: 100%;
@@ -142,41 +182,123 @@ export default {
 }
 .swiper-banner-msg {
 	width: 100%;
-	height: 54rpx;
+	height: 48rpx;
 	box-sizing: border-box;
+	background-color: #ff5b00;
 	padding: 0 24rpx;
-	margin-top: 24rpx;
 	.content {
 		width: 100%;
-		height: 54rpx;
+		height: 48rpx;
 		box-sizing: border-box;
-		padding: 0 34rpx;
-		background-color: #fff0e9;
+		padding: 0 24rpx;
 		border-radius: 16rpx;
 		.item {
-			width: 33.33%;
-			height: 54rpx;
-			line-height: 54rpx;
-			font-size: $font-size-24;
-			color: $color-system;
+			width: 30%;
+			height: 48rpx;
 			float: left;
+			.item-icon{
+				height: 48rpx;
+				line-height: 48rpx;
+				float: left;
+				margin-right: 2px;
+				.iconfont {
+					color: #ffffff;
+					font-size: $font-size-28;
+				}
+			}
+			.item-sm{
+				line-height: 48rpx;
+				font-size: $font-size-22;
+				color: #ffffff;
+				float: left;
+			}
 			&.le {
+				width: 37%;
 				text-align: left;
 			}
 			&.ce {
+				width: 25%;
 				text-align: center;
 			}
 			&.ri {
-				text-align: right;
-			}
-			.iconfont {
-				color: $color-system;
-				font-size: $font-size-32;
-				.sm {
-					font-size: $font-size-26;
+				width: 37%;
+				.item-icon{
+					float: right;
+				}
+				.item-sm{
+					float: right;
 				}
 			}
 		}
 	}
 }
+.tui-rolling-view {
+	width: 100%;
+	height: 96rpx;
+	background-color: #FF5B00;
+}
+.tui-rolling-content{
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	padding: 20rpx 24rpx;
+	border-radius: 24rpx 24rpx 0 0;
+	background-color: #FFFFFF;
+}
+.tui-rolling-news {
+	width: 100%;
+	padding: 0 20rpx;
+	border-radius: 8rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-wrap: nowrap;
+	line-height: 56rpx;
+	background: #fff7f3;
+	background-size: cover;
+	.tui-roll-label {
+		font-weight: bold;
+		font-size: $font-size-26;
+		color: #ff5b00;
+	}
+	.tui-roll-more {
+		font-size: $font-size-24;
+		color: #999999;
+		.icon-xiayibu {
+			font-size: $font-size-22;
+		}
+	}
+}
+
+.tui-swiper {
+	font-size: 28rpx;
+	height: 50rpx;
+	flex: 1;
+}
+
+.tui-swiper-item {
+	display: flex;
+	align-items: center;
+}
+
+.tui-news-item {
+	width: 480rpx;
+	line-height: 28rpx;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	font-size: $font-size-24;
+	color: #666666;
+	.news-dot {
+		display: inline-block;
+		width: 10rpx;
+		height: 10rpx;
+		background-color: #999999;
+		border-radius: 50%;
+		margin-right: 8rpx;
+		float: left;
+		margin-top: 10rpx;
+	}
+}
 </style>

components/cm-module/homeIndex/customer.vue

@@ -25,6 +25,13 @@
                 <view class="search-icon"><text class="iconfont icon-iconfonticonfontsousuo1"></text></view>
                 <view class="search-text">{{ hotSearchText }}</view>
             </view>
+			<view class="gosearch-kf">
+				<!-- #ifdef MP-WEIXIN -->
+				<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
+				    <text class="iconfont icon-zixunrexian"></text>
+				</button>
+				<!-- #endif -->
+			</view>
         </view>
     </view>
 </template>
@@ -84,7 +91,11 @@ export default {
             uni.switchTab({
                 url: '/pages/tabBar/home/index'
             })
-        }
+        },
+		handleContact(e) {
+		    console.log(e.detail.path)
+		    console.log(e.detail.query)
+		}
     },
     onShow() {}
 }
@@ -97,12 +108,12 @@ export default {
     top: 0;
     z-index: 100000;
     box-sizing: border-box;
-    background: url(https://static.caimei365.com/app/img/bg/new_home_cumres@2x.png) no-repeat;
+    background: #FF5B00;
     background-position-y: -50rpx;
     border-bottom: none;
 }
 .opacityNav {
-    background: linear-gradient(180deg, #FF5B00 0%, rgba(255,91,0, 1) 100%) !important;
+    background: #FF5B00;
 }
 .navbar-text {
     font-size: 30rpx;
@@ -142,15 +153,14 @@ export default {
 }
 .search-input {
     width: 100%;
-    height: 110rpx;
-    padding: 20rpx 24rpx;
+    height: 100rpx;
+    padding: 20rpx 24rpx 10rpx 24rpx;
     box-sizing: border-box;
     .gosearch-btn {
-        width: 100%;
+        width: 632rpx;
         height: 100%;
         border-radius: 40rpx;
         background: #f0f0f0;
-        margin: 0 auto;
         font-size: 28rpx;
         line-height: 70rpx;
         color: #8a8a8a;
@@ -158,6 +168,7 @@ export default {
         position: relative;
         box-sizing: border-box;
         padding-left: 80rpx;
+		float: left;
         .search-icon {
             width: 80rpx;
             height: 70rpx;
@@ -179,5 +190,24 @@ export default {
             color: #8a8a8a;
         }
     }
+	.gosearch-kf{
+		width: 70rpx;
+		height: 70rpx;
+		border-radius: 50%;
+		float: left;
+		line-height: 70rpx;
+		text-align: center;
+		.contact-btn {
+		    width: 70rpx;
+		    height: 70rpx;
+		    background-color: rgba(0, 0, 0, 0);
+		    line-height: 70rpx;
+			text-align: center;
+		    .iconfont {
+		        font-size: $font-size-48;
+		        color: #ffffff;
+		    }
+		}
+	}
 }
 </style>

components/cm-module/homeIndex/hotFloor.vue

@@ -79,6 +79,7 @@ export default {
 	box-sizing: border-box;
 	padding: 0 24rpx;
 	float: left;
+	border-radius: 16rpx;
 }
 .tui-group-name {
 	width: 100%;
@@ -86,6 +87,7 @@ export default {
 	box-sizing: border-box;
 	padding: 40rpx 0 20rpx 0;
 	position: relative;
+	border-radius: 16rpx 16rpx 0 0;
 	.tui-group-r {
 		width: 144rpx;
 		height: 54rpx;

components/cm-module/homeIndex/navbars.vue

@@ -61,8 +61,7 @@
 		width: 94%;
 		height: auto;
 		box-sizing: border-box;
-		margin-top: 24rpx;
-        padding: 32rpx 0;
+        padding: 20rpx 0 0 0;
         background-color: #fff;
         border-radius: 16rpx;
 		.nav-item{

components/cm-module/homeIndex/notice.vue

@@ -1,124 +0,0 @@
-<template>
-	<view>
-		<view class="tui-rolling-view">
-			<view class="tui-rolling-news">
-				<text class="tui-roll-label">公告：</text>
-				<swiper vertical autoplay circular interval="3500" class="tui-swiper">
-					<swiper-item v-for="(item,index) in list" :key="index" class="tui-swiper-item">
-						<view class="tui-news-item" @tap='detail(item)'>
-							<text class="news-dot"></text>
-							{{item.title}}
-						</view>
-					</swiper-item>
-				</swiper>
-				<view class="tui-roll-more" @tap='newsList(item)'>
-					更多<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'address',
-		props:{
-			list:{
-				type:Array
-			}
-		},
-		data() {
-			return{
-				
-			}
-		},
-		created(){
-			
-		},
-		computed: {
-	
-		},
-		methods:{
-			detail(item){// 跳转公告详情
-				this.$api.navigateTo(`/pages/service/news-detailes?id=${item.id}`)
-			},
-			newsList(){// 公告列表
-				this.$api.navigateTo('/pages/service/news-list')
-			},
-			swiperChange(e) {//轮播图切换
-				const index = e.detail.current
-				this.current = index
-			},
-			NavToDetailPage(floor) {//跳转
-				this.$api.FlooryNavigateTo(floor)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.tui-rolling-view{
-		width: 100%;
-		height: 88rpx;
-		background-color: #F7F7F7;
-		box-sizing: border-box;
-		padding: 24rpx 24rpx 0 24rpx;
-	}
-	.tui-rolling-news {
-		width: 100%;
-		padding: 0 20rpx;
-		border-radius: 8rpx;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-wrap: nowrap;
-		line-height: 56rpx;
-		background: url('https://static.caimei365.com/app/img/bg/icon-newsbg@2x.png') no-repeat;
-		background-size: cover;
-		.tui-roll-label{
-			font-weight: bold;
-			font-size: $font-size-26;
-			color: #FF5B00;
-		}
-		.tui-roll-more{
-			font-size: $font-size-24;
-			color: #666666;
-			.icon-xiayibu{
-				font-size: $font-size-22;
-			}
-		}
-	}
-	
-	.tui-swiper {
-		font-size: 28rpx;
-		height: 50rpx;
-		flex: 1;
-	}
-	
-	.tui-swiper-item {
-		display: flex;
-		align-items: center
-	}
-	
-	.tui-news-item {
-		width: 480rpx;
-		line-height: 28rpx;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		font-size: $font-size-24;
-		color: #666666;
-		.news-dot{
-			display: inline-block;
-			width: 10rpx;
-			height: 10rpx;
-			background-color: #999999;
-			border-radius: 50%;
-			margin-right: 8rpx;
-			float: left;
-			margin-top: 10rpx;
-		}
-	}
-	
-</style>

components/cm-module/homeIndex/quickOperation.vue

@@ -1,35 +1,24 @@
 <template>
     <!-- 快捷运营 -->
-    <view class="quick-oprea">
-        <swiper class="swiper" :autoplay="false" @change="swiperChange" :circular="true">
-            <swiper-item v-for="(item, index) in footList" :key="index" class="swiper-item">
-                <view class="content" v-for="(i, o) in item" :key="i" @click="NavToDetailPage(i)">
-                    <view class="list">
-                        <div class="list-icon">
-                            <image :src="i.icon" style="width: 100%;height: 100%;" mode=""></image>
-                        </div>
-                        <div class="list-title">
-                            <div class="title-1">
-                                <div class="title-1-item">
-                                    <view style="display: inline-block;">{{ i.name }}</view>
-                                    <text class="title-2-item">GO></text>
-                                </div>
-                            </div>
-                            <div class="title-2">{{i.remark || ''}}</div>
-                        </div>
-                    </view>
-                </view>
-            </swiper-item>
-        </swiper>
-        <view class="swiper__dots-box">
-            <view
-                v-for="(item, idx) in footList"
-                :key="idx"
-                :class="[idx === current ? 'swiper__dots-long' : 'none']"
-                :data-index="current"
-                class="swiper__dots-item"
-            ></view>
-        </view>
+    <view class="container-pages">
+		<scroll-view scroll-x>
+			<view class="tui-goods__list">
+				<view class="tui-goods__item" v-for="(item, index) in list"  @click="NavToDetailPage(item)">
+					<view class="list-title">
+						<view class="title-1">
+							<view class="title-1-item">
+								<view style="display: inline-block;">{{ item.name }}</view>
+								<text class="title-2-item">GO></text>
+							</view>
+						</view>
+						<view class="title-2">{{item.remark || ''}}</view>
+					</view>
+					<view class="list-icon">
+						<image class="image" :src="item.icon" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</scroll-view>	
     </view>
 </template>
 
@@ -46,27 +35,15 @@ export default {
     },
     data() {
         return {
+			shortcutList:[],
             current: 0 // 切换轮播
         }
     },
+	created() {
+		this.shortcutList = this.list
+	},
     computed: {
         ...mapState(['hasLogin']),
-        // 快捷运营列表
-        footList() {
-            let newArr = [],
-                a = []
-            this.list.map((item, index) => {
-                if (index !== 0 && index % 4 === 0) {
-                    newArr.push(a)
-                    a = []
-                    a.push(item)
-                } else a.push(item)
-                if (this.list.length === index + 1) {
-                    newArr.push(a)
-                }
-            })
-            return newArr
-        }
     },
     watch: {},
     mounted() {},
@@ -84,96 +61,67 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.quick-oprea {
-    background-color: #f7f7f7;
-    padding: 20rpx;
-    position: relative;
-    height: 400rpx;
-    .swiper__dots-box {
-        position: absolute;
-        left: 0;
-        right: 0;
-        bottom: 32rpx;
-        display: flex;
-        flex: 1;
-        flex-direction: row;
-        justify-content: center;
-        align-items: center;
-        .swiper__dots-item {
-            width: 14rpx;
-            height: 5rpx;
-            border-radius: 100%;
-            margin-left: 6px;
-            background-color: #e15621;
-            opacity: 0.2;
-        }
-        .swiper__dots-long {
-            width: 26rpx;
-            height: 5rpx;
-            border-radius: 4rpx;
-            background-color: #e15621;
-            transition: all 0.4s;
-            opacity: 1;
-        }
-    }
-}
-.swiper {
-    height: 340rpx;
-    .swiper-item {
-        display: grid;
-        grid-template-columns: repeat(2, 1fr);
-        grid-template-rows: repeat(2, 1fr);
-        grid-gap: 18rpx;
-        .content {
-            box-sizing: border-box;
-            border-radius: 16rpx;
-            background-color: #fff;
-            display: flex;
-            align-items: center;
-            background: linear-gradient(180deg, #FFF1EB 0%, #FFFFFF 100%);
-            .list {
-                width: 100%;
-                display: flex;
-                height: 80rpx;
-                .list-icon {
-                    width: 80rpx;
-                    height: 100%;
-                    border-radius: 50%;
-                    margin-left: 24rpx;
-                    overflow: hidden;
-                }
-                .list-title {
-                    margin-left: 16rpx;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: space-between;
-                    .title-1 {
-                        .title-1-item {
-                            color: #333333;
-                            font-size: 28rpx;
-                            width: 222rpx;
-                            display: flex;
-                            align-items: center;
-                            .title-2-item {
-                                width: 62rpx;
-                                height: 32rpx;
-                                background: #ff5b00;
-                                border-radius: 14rpx;
-                                font-size: 22rpx;
-                                text-align: center;
-                                height: 32rpx;
-                                color: white;
-                                margin-left: 6rpx;
-                            }
-                        }
-                    }
-                    .title-2 {
-                        color: #999999;
-                        font-size: 22rpx;
-                    }
-                }
-            }
-        }
-    }
+	
+.container-pages {
+	width: 100%;
+	height: 152rpx;
+	padding: 24rpx 24rpx 0 24rpx;
+	float: left;
+	background-color: #f7f7f7;
+	box-sizing: border-box;
+	background-color: #f7f7f7;
+	overflow: hidden;
+	display: flex;
+	align-items: center;
+	.tui-goods__list {
+		display: flex;
+		align-items: center;
+		.tui-goods__item {
+			background-color: #fff;
+			height: 128rpx;
+			border-radius: 16rpx;
+			box-sizing: border-box;
+			margin-right: 16rpx;
+			padding:24rpx 12rpx 24rpx 18rpx;
+			display: flex;
+			align-items: center;
+			background: linear-gradient(180deg, #FFF1EB 0%, #FFFFFF 100%);
+			.list-title {
+			    .title-1 {
+			        .title-1-item {
+			            color: #333333;
+			            font-size: 28rpx;
+			            width: 196rpx;
+			            display: flex;
+			            align-items: center;
+			            .title-2-item {
+			                width: 62rpx;
+			                height: 32rpx;
+			                background: #ff5b00;
+			                border-radius: 16rpx;
+			                font-size: 22rpx;
+			                text-align: center;
+			                height: 32rpx;
+			                color: white;
+			                margin-left: 6rpx;
+			            }
+			        }
+			    }
+			    .title-2 {
+			        color: #999999;
+			        font-size: 22rpx;
+			    }
+			}
+			.list-icon {
+			    height: 100%;
+			    border-radius: 50%;
+			    overflow: hidden;
+				.image{
+					width: 80rpx;
+					height: 100%;
+				}
+			}
+		}	
+	}
 }
 </style>

components/cm-module/scrollTop/scrollTop.vue

@@ -16,7 +16,7 @@
             ></image>
         </view>
         <view class="scrollTop" :style="{ bottom: bottom + 'rpx' }">
-            <view class="icon msg">
+            <view class="icon msg" v-if="isShowKefu">
                 <!-- #ifdef MP-WEIXIN -->
                 <button class="contact-btn" open-type="contact" @bindcontact="handleContact">
                     <text class="iconfont icon-zixunrexian"></text>
@@ -42,6 +42,10 @@ export default {
             type: Boolean,
             default: false
         },
+		isShowKefu:{
+			type: Boolean,
+			default: true
+		},
         isShowSupplier: {
             // 是否展示供应商服务图标
             type: Boolean,

pages.json

@@ -5,7 +5,7 @@
 			"style": {
 				"navigationBarTitleText": "采美采购商城",
 				"enablePullDownRefresh": true,
-				"backgroundColor": "#F28F31",
+				"backgroundColor": "#ff5b00",
 				"backgroundTextStyle": "light",
 				"navigationStyle": "custom"
 			}

pages/seller/club/club-active-details.vue

@@ -31,7 +31,7 @@
 							</view>
 							<view class="list-content">
 								<view class="list-name">
-									{{ club.userIdentity === 2 ? club.name : club.linkMan }}
+									{{ club.name }}
 									<text class="tags" v-if="club.vipFlag == 0 && club.userIdentity === 2">VIP</text>
 									<text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
 									<text class="tags xf" v-if="club.newDeal === 1">新分配</text>
@@ -127,10 +127,9 @@ export default {
 			try{
 				const res = await this.SellerService.getClubList(this.listQuery)
 				const data = res.data
-				const club = data.clubList
-				if (club.list && club.list.length > 0) {
-					this.hasNextPage = club.hasNextPage
-					this.clubList =club.list
+				if (data.results && data.results.length > 0) {
+					this.hasNextPage = data.hasNextPage
+					this.clubList =data.results
 					this.isEmpty = false
 					this.pullFlag = false
 					setTimeout(() => {
@@ -155,9 +154,8 @@ export default {
 			try{
 				const res = await this.SellerService.getClubList(this.listQuery)
 				const data = res.data
-				const club = data.clubList
-				this.hasNextPage = data.clubList.hasNextPage
-				this.clubList = this.clubList.concat(club.list)
+				this.hasNextPage = data.hasNextPage
+				this.clubList = this.clubList.concat(data.results)
 				this.pullFlag = false // 防上拉暴滑
 				setTimeout(() => {
 					this.pullFlag = true

pages/seller/club/club-board.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container clearfix">
 		<tui-skeleton
-			v-if="skeletonShow"
+			v-if="!skeletonShow"
 			backgroundColor="#fafafa"
 			borderRadius="10rpx"
 			:isLoading="true"
@@ -13,20 +13,16 @@
 				<view class="charts-box charts-box0" id="charts-box0">
 					<echart-active
 						ref="echart-active"
-						:clubId="clubInfo.clubId"
-						:totalAmount="totalData.orderTotalAmount"
-						:totalNum="totalData.orderTotal"
-						v-if="isRequest"
+						:portraitMap="portraitMap"
+						v-if="skeletonShow"
 					/>
 				</view>
 				<!-- 机构填写咨询记录统计 -->
 				<view class="charts-box charts-box1" id="charts-box1">
 					<echart-consult
 						ref="echart-consult"
-						:clubId="clubInfo.clubId"
-						:totalAmount="totalData.orderTotalAmount"
-						:totalNum="totalData.orderTotal"
-						v-if="isRequest"
+						:remark="remark"
+						v-if="skeletonShow"
 					/>
 				</view>
 			</view>
@@ -49,113 +45,32 @@ export default {
 	},
 	data() {
 		return {
-			skeletonShow: true,
-			isRequest: false,
-			clubInfo: {},
-			clubUserInfo: {},
-			tabCurrentIndex: 0,
-			anchorList: [], // 锚点元素节点信息
-			anchorStatus: [0, 0, 0, 0, 0], // 分别代表5个锚点区域的开关 0:关  1:开
-			totalData: {
-				orderTotalAmount: 0, // 订单总金额
-				orderTotal: 0, // 订单总量
-				remarksTotal: 0, // 所有咨询记录条数
-				totalKeywords: 0 // 所有关键词条数
-			}
+			skeletonShow: false,
+			remark: [],
+			portraitMap: [],
 		}
 	},
 	onLoad(option) {
-		this.getClubInfo(option.userId)
+		this.getLivelyClub()
 	},
 	onReady() {
-		console.log('onReady')
-		setTimeout(() => {
-			this.getAnchorSection()
-		}, 2000)
+		
 	},
 	methods: {
-		async getClubInfo(userId) {
-			//获取机构信息
-			try {
-				const clubRes = await this.UserService.OrganizationUpdateModifyInfo({ userId: 666747 })
-				this.clubInfo =  clubRes.data.club
-				this.clubUserInfo =  clubRes.data.user
-				const tialRes = await this.UserService.userClubInitial({ clubId: this.clubInfo.clubId })
-				this.totalData.orderTotal = tialRes.data.orderTotal
-				this.totalData.orderTotalAmount = tialRes.data.orderTotalAmount
-				this.totalData.remarksTotal = tialRes.data.remarksTotal
-				this.totalData.totalKeywords = tialRes.data.totalKeywords
+		async getLivelyClub() {
+			try{
+				const userInfo = await this.$api.getStorage()
+				const { data: data } = await this.SellerService.getLivelyClub({ spId: userInfo.serviceProviderId })
+				this.portraitMap = data.portraitMap
+				this.remark = data.remark
 				setTimeout(() => {
-					this.skeletonShow = false
-					this.isRequest = true
+					this.skeletonShow = true
 				}, 1000)
-			} catch (error) {
-				console.log(error)
+			}catch(error){
+				//TODO handle the exception
+				console.log('error',error)
 			}
 		},
-		tabChange(index) {
-			this.tabCurrentIndex = index
-			this.scrollToAnchor()
-		},
-		// 获取锚点元素信息
-		getAnchorSection() {
-			const query = uni.createSelectorQuery().in(this)
-			query
-				.selectAll('.charts-box')
-				.boundingClientRect(data => {
-					if (data.length > 0) {
-						this.anchorList = data
-						this.anchorList.forEach((dom, index) => {
-							uni.createSelectorQuery()
-								.select('.charts-content')
-								.boundingClientRect(data => {
-									//目标节点、也可以是最外层的父级节点
-									uni.createSelectorQuery()
-										.select(`#${dom.id}`)
-										.boundingClientRect(res => {
-											//dom
-											dom.top = res.top - data.top + 8
-										})
-										.exec()
-								})
-								.exec()
-						})
-						console.log(this.anchorList)
-						this.observerAnchor(data)
-					}
-				})
-				.exec()
-		},
-		// 滚动到锚点
-		scrollToAnchor() {
-			let scrollTop = 0
-			const query = uni.createSelectorQuery().in(this)
-			if (this.tabCurrentIndex > 0) {
-				scrollTop = this.anchorList[this.tabCurrentIndex].top
-			}
-			uni.pageScrollTo({
-				scrollTop: scrollTop
-			})
-		},
-		// 为需要观测的区域创建观测者
-		observerAnchor(selectorList = []) {
-			const height = uni.getSystemInfoSync().windowHeight - 70
-			selectorList.forEach((selector, index) => {
-				observers[selector.id] = uni.createIntersectionObserver(this)
-				observers[selector.id].relativeToViewport({ bottom: -height }).observe(`#${selector.id}`, res => {
-					if (res.intersectionRatio > 0) {
-						this.anchorStatus[index] = 1
-						// console.log(index, `当前区域为${selector.id}标签选择器的区域...`)
-					} else {
-						this.anchorStatus[index] = 0
-						// console.log(index, `离开区域为${selector.id}标签选择器的区域...`)
-					}
-				})
-			})
-		}
-	},
-	onPageScroll(e) {
-		this.scrollTop = e.scrollTop
 	},
 	onShow() {}
 }
@@ -276,7 +191,7 @@ page {
 		}
 		.echart-mains {
 			width: 100%;
-			min-height: 350rpx;
+			min-height: 450rpx;
 			float: left;
 			&.demand{
 				min-height: 200rpx;

pages/seller/club/club-consult-details.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="container club clearfix">
 		<view class="club-tabs">
-			<view class="btn edit" :class="tabCurrentIndex === 4 ? 'active': '' " @click.stop="handleClick(4)">已填写</view>
-			<view class="btn" :class="tabCurrentIndex === 5 ? 'active': '' " @click.stop="handleClick(5)">未填写</view>
+			<view class="btn edit" :class="tabCurrentIndex === 1 ? 'active': '' " @click.stop="handleClick(1)">已填写</view>
+			<view class="btn" :class="tabCurrentIndex === 2 ? 'active': '' " @click.stop="handleClick(2)">未填写</view>
 		</view>
 		<view class="club-main">
 			<view v-if="isEmpty" class="club-main-empty">
@@ -31,7 +31,7 @@
 							</view>
 							<view class="list-content">
 								<view class="list-name">
-									{{ club.userIdentity === 2 ? club.name : club.linkMan }}
+									{{ club.name }}
 									<text class="tags" v-if="club.vipFlag == 0 && club.userIdentity === 2">VIP</text>
 									<text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
 									<text class="tags xf" v-if="club.newDeal === 1">新分配</text>
@@ -83,7 +83,7 @@ import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {
 	spId: 0,
 	status: 90,
-	type: 4,
+	type: 1,
 	pageNum: 1,
 	pageSize: 10
 }
@@ -97,7 +97,7 @@ export default {
 			loadding: false,
 			pullUpOn: true,
 			pullFlag: true,
-			tabCurrentIndex: 4,
+			tabCurrentIndex: 1,
 			clubList: []
 		}
 	},
@@ -121,16 +121,16 @@ export default {
 			// 初始化
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.spId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-			this.getClubList()
+			this.getIsRemarkClub()
 		},
-		async getClubList() {
+		async getIsRemarkClub() {
 			try{
-				const res = await this.SellerService.getClubList(this.listQuery)
+				this.listQuery.pageNum = 1
+				const res = await this.SellerService.getIsRemarkClub(this.listQuery)
 				const data = res.data
-				const club = data.clubList
-				if (club.list && club.list.length > 0) {
-					this.hasNextPage = club.hasNextPage
-					this.clubList =club.list
+				if (data.results && data.results.length > 0) {
+					this.hasNextPage = data.hasNextPage
+					this.clubList =data.results
 					this.isEmpty = false
 					this.pullFlag = false
 					setTimeout(() => {
@@ -153,11 +153,10 @@ export default {
 		},
 		async getOnReachBottomData() {
 			try{
-				const res = await this.SellerService.getClubList(this.listQuery)
+				const res = await this.SellerService.getIsRemarkClub(this.listQuery)
 				const data = res.data
-				const club = data.clubList
-				this.hasNextPage = data.clubList.hasNextPage
-				this.clubList = this.clubList.concat(club.list)
+				this.hasNextPage = data.hasNextPage
+				this.clubList = this.clubList.concat(data.results)
 				this.pullFlag = false // 防上拉暴滑
 				setTimeout(() => {
 					this.pullFlag = true
@@ -177,7 +176,7 @@ export default {
 		},
 		handleClick(index){
 			this.tabCurrentIndex = this.listQuery.type = index
-			this.getClubList()
+			this.getIsRemarkClub()
 		},
 		// 拨打电话
 		handlePhone(phoneNumber) {

pages/seller/club/components/cm-club-drawer.vue

@@ -62,15 +62,17 @@
 									</picker>
 								</view>
 							</view>
-							<view class="drawer-main-name">升级状态<text class="small">（个人机构升级为资质机构）</text>：</view>
-							<view class="drawer-main-radiov">
-								<view class="drawer-main-radio">
-									<picker @change="bindPickerChange(3,$event)" :value="index" :range="clubStatusActions" range-key="name">
-										<input class="input" type="text" disabled="false" v-model="clubStatusText" value="" placeholder="请选择"/>
-										<text class="iconfont icon-xiangyou"></text>
-									</picker>
+							<template v-if="queryData.userIdentity === 4">
+								<view class="drawer-main-name">升级状态<text class="small">（个人机构升级为资质机构）</text>：</view>
+								<view class="drawer-main-radiov">
+									<view class="drawer-main-radio">
+										<picker @change="bindPickerChange(3,$event)" :value="index" :range="clubStatusActions" range-key="name">
+											<input class="input" type="text" disabled="false" v-model="clubStatusText" value="" placeholder="请选择"/>
+											<text class="iconfont icon-xiangyou"></text>
+										</picker>
+									</view>
 								</view>
-							</view>
+							</template>
 							<view class="drawer-main-name">活跃状态：</view>
 							<view class="drawer-main-radiov">
 								<view class="drawer-main-radio">
@@ -128,7 +130,10 @@ export default {
 			queryData: {
 				startTime:'',
 				endTime:'',
-				serviceProviderId: 0
+				userIdentity:'',
+				serviceProviderId: 0,
+				activeState: '',
+				customerValue:''
 			},
 			clubTypeActions:[
 				{name:'个人机构',value:4},
@@ -140,11 +145,11 @@ export default {
 				{name:'升级失败',value:92}
 			],
 			clubActiveActions:[
-				{name:'活跃用户',value:90},
+				{name:'活跃用户',value:1},
 				{name:'不活跃用户',value:1}
 			],
 			customerValueActions:[
-				{name:'高价值客户',value:90},
+				{name:'高价值客户',value:1},
 				{name:'一般价值客户',value:1},
 				{name:'潜在价值客户',value:1},
 				{name:'低价值客户',value:1}
@@ -199,11 +204,11 @@ export default {
 					break
 				case 4:
 					this.clubActiveText = this.clubActiveActions[e.target.value].name
-					// this.queryData.status = this.clubActiveActions[e.target.value].value
+					this.queryData.activeState = this.clubActiveActions[e.target.value].name
 					break
 				case 5:
 					this.customerValueText = this.customerValueActions[e.target.value].name
-					// this.queryData.status = this.customerValueActions[e.target.value].value
+					this.queryData.customerValue = this.customerValueActions[e.target.value].name
 					break
 			}
 		},

pages/seller/club/components/echart-active.vue

@@ -26,47 +26,23 @@ import chartMixin from './mixins/chart.mixin.js'
 export default {
 	mixins: [chartMixin],
 	props:{
-		clubId:{
-			type:Number,
-			default:0
-		},
-		totalAmount:{
-			type:Number,
-			default:0
-		},
-		totalNum:{
-			type:Number,
-			default:0
+		portraitMap:{
+			type:Array,
+			default:[]
 		}
 	},
 	data() {
 		return {
 			isEmpty:false,
-			current: 0,
 			orderChartData:null,
-			orderTotal:0,
-			orderTotalAmount:0, 
-			orderData:{
-			    startTime: '',
-			    endTime: '',
-			    orderScopeNum:0,
-				orderScopeTotalFee:0,
-			},
-			params:{
-			    clubId:0,//  机构id
-			    dateType:3,//   日期类别 0日 1月 2半年 3全年
-			    startTime:'',//   开始时间
-			    endTime:'',//   结束时间
-			    type:0	//  统计类别 0订单 1搜索关键词 2咨询记录 3访问记录 4初始状态
-			},
 			opts: {
 				timing: 'easeOut',
 				duration: 50,
 				rotate: false,
 				rotateLock: false,
 				color: [
-					'#1890FF',
-					'#91CB74',
+					'#3AA0FF',
+					'#36CBCB',
 					'#FAC858',
 					'#EE6666',
 					'#73C0DE',
@@ -157,46 +133,29 @@ export default {
 		}
 	},
 	created() {
-		this.params.clubId = this.clubId
-		console.log('orderTotal',this.orderTotal)
-		this.orderTotal = this.totalNum
-		this.orderTotalAmount = this.totalAmount
-		this.userClubPortrait(0)
+		console.log('portraitMap',this.portraitMap)
+		this.getSetOrderData(this.portraitMap)
 	},
 	methods: {
-		async userClubPortrait(type){
-			this.params.type = type
-			try {
-				const res = await this.UserService.userClubPortrait(this.params)
-				const data = res.data
-				this.orderData.orderScopeNum = data.portrait.orderScopeNum
-				this.orderData.orderScopeTotalFee = data.portrait.orderScopeTotalFee
-				this.orderData.startTime = this.params.startTime = data.portrait.startTime
-				this.orderData.endTime = this.params.endTime = data.portrait.endTime
-				if(data.order){
-					this.isEmpty = false
-				    this.getSetOrderData(data.order)
-				}else{
-					this.isEmpty = true  
-				}
-			} catch (error) {
-			   this.$util.msg(error.msg, 2000)
-			}
-		},
 		getSetOrderData(data) {
 			//模拟从服务器获取数据时的延时
-			setTimeout(() => {
-				//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-				let res = {
-					series: [
-						{
-							format: 'pieDemo1',
-							data: data.orderList
-						}
-					]
-				}
-				this.orderChartData = JSON.parse(JSON.stringify(res))
-			}, 500)
+			if(data.length>0){
+				this.isEmpty = false
+				setTimeout(() => {
+					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+					let res = {
+						series: [
+							{
+								format: 'pieDemo1',
+								data: data
+							}
+						]
+					}
+					this.orderChartData = JSON.parse(JSON.stringify(res))
+				}, 500)
+			}else{
+				this.isEmpty = true  
+			}
 		},
 		handClick(){
 			this.$api.navigateTo(`/pages/seller/club/club-active-details`)

pages/seller/club/components/echart-consult.vue

@@ -26,47 +26,23 @@ import chartMixin from './mixins/chart.mixin.js'
 export default {
 	mixins: [chartMixin],
 	props:{
-		clubId:{
-			type:Number,
-			default:0
-		},
-		totalAmount:{
-			type:Number,
-			default:0
-		},
-		totalNum:{
-			type:Number,
-			default:0
+		remark:{
+			type:Array,
+			default:[]
 		}
 	},
 	data() {
 		return {
 			isEmpty:false,
-			current: 0,
 			orderChartData:null,
-			orderTotal:0,
-			orderTotalAmount:0, 
-			orderData:{
-			    startTime: '',
-			    endTime: '',
-			    orderScopeNum:0,
-				orderScopeTotalFee:0,
-			},
-			params:{
-			    clubId:0,//  机构id
-			    dateType:3,//   日期类别 0日 1月 2半年 3全年
-			    startTime:'',//   开始时间
-			    endTime:'',//   结束时间
-			    type:0	//  统计类别 0订单 1搜索关键词 2咨询记录 3访问记录 4初始状态
-			},
 			opts: {
 				timing: 'easeOut',
 				duration: 50,
 				rotate: false,
 				rotateLock: false,
 				color: [
-					'#1890FF',
-					'#91CB74',
+					'#975FE4',
+					'#FAD337',
 					'#FAC858',
 					'#EE6666',
 					'#73C0DE',
@@ -157,46 +133,29 @@ export default {
 		}
 	},
 	created() {
-		this.params.clubId = this.clubId
-		console.log('orderTotal',this.orderTotal)
-		this.orderTotal = this.totalNum
-		this.orderTotalAmount = this.totalAmount
-		this.userClubPortrait(0)
+		console.log('remark',this.remark)
+		this.getSetOrderData(this.remark)
 	},
 	methods: {
-		async userClubPortrait(type){
-			this.params.type = type
-			try {
-				const res = await this.UserService.userClubPortrait(this.params)
-				const data = res.data
-				this.orderData.orderScopeNum = data.portrait.orderScopeNum
-				this.orderData.orderScopeTotalFee = data.portrait.orderScopeTotalFee
-				this.orderData.startTime = this.params.startTime = data.portrait.startTime
-				this.orderData.endTime = this.params.endTime = data.portrait.endTime
-				if(data.order){
-					this.isEmpty = false
-				    this.getSetOrderData(data.order)
-				}else{
-					this.isEmpty = true  
-				}
-			} catch (error) {
-			   this.$util.msg(error.msg, 2000)
-			}
-		},
 		getSetOrderData(data) {
 			//模拟从服务器获取数据时的延时
-			setTimeout(() => {
-				//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-				let res = {
-					series: [
-						{
-							format: 'pieDemo1',
-							data: data.orderList
-						}
-					]
-				}
-				this.orderChartData = JSON.parse(JSON.stringify(res))
-			}, 500)
+			if(data.length>0){
+				this.isEmpty = false
+				setTimeout(() => {
+					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+					let res = {
+						series: [
+							{
+								format: 'pieDemo1',
+								data: data
+							}
+						]
+					}
+					this.orderChartData = JSON.parse(JSON.stringify(res))
+				}, 500)
+			}else{
+				this.isEmpty = true  
+			}
 		},
 		handClick(){
 			this.$api.navigateTo(`/pages/seller/club/club-consult-details`)

pages/seller/club/list.vue

@@ -24,7 +24,7 @@
 						confirm-type="search"
 						v-model="listQuery.name"
 						@input="onShowClose"
-						@confirm="GetSellerClubList()"
+						@confirm="getList"
 						placeholder="机构名称/联系人/手机号"
 						maxlength="16"
 						:style="{ lineHeight: capsule.height + 'px' }"
@@ -231,12 +231,12 @@ import cmClubDrawer from './components/cm-club-drawer'
 import cmSellerPopup from '../components/cm-seller-popup'
 
 const defaultListQuery = {
-	userIdentity: 4,
+	userIdentity: '',
 	name: '',
 	pageNum: 1,
 	pageSize: 10,
 	spId: 0,
-	status: 90,
+	status: '',
 	type: 1,
 	groupServiceId: 0
 }
@@ -305,64 +305,64 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.spId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 			this.salesParams.choseServiceId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-			this.GetSellerClubList()
+			this.getList()
 		},
-		GetSellerClubList() {
-			this.SellerService.GetSellerClubList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.isEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList = data.list.map((el, index) => {
-							el.bubble = false
-							return el
-						})
-						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 = '已至底部'
-						}
+		async getList() {
+			try{
+				const res = await this.SellerService.GetSellerClubList(this.listQuery)
+				const data = res.data
+				if (data.list && data.list.length > 0) {
+					this.isEmpty = false
+					this.hasNextPage = data.hasNextPage
+					this.clubList = data.list.map((el, index) => {
+						el.bubble = false
+						return el
+					})
+					this.pullFlag = false
+					setTimeout(() => {
+						this.pullFlag = true
+					}, 500)
+					if (this.hasNextPage) {
+						this.pullUpOn = false
+						this.nomoreText = '上拉显示更多'
 					} else {
-						this.isEmpty = true
+						this.pullUpOn = true
+						this.loadding = false
+						this.nomoreText = '已至底部'
 					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+				} else {
+					this.isEmpty = true
+				}
+			}catch(error){
+				//TODO handle the exception
+				this.$util.msg(error.msg, 2000)
+			}
 		},
-		getOnReachBottomData() {
-			this.listQuery.pageNum += 1
-			this.SellerService.GetSellerClubList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList = this.clubList.concat(data.list)
-						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 = '已至底部'
-						}
+		async getOnReachBottomData() {
+			try{
+				this.listQuery.pageNum ++
+				const res = await this.SellerService.GetSellerClubList(this.listQuery)
+				const data = res.data
+				if (data.list && data.list.length > 0) {
+					this.hasNextPage = data.hasNextPage
+					this.clubList = this.clubList.concat(data.list)
+					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)
-				})
+				}
+			}catch(error){
+				//TODO handle the exception
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		userClubChoseSales(param) {
 			//分配或更换协销
@@ -370,7 +370,7 @@ export default {
 				.then(response => {
 					this.$util.msg('操作成功~', 2000, true, 'success')
 					setTimeout(() => {
-						this.GetSellerClubList()
+						this.getList()
 					}, 1000)
 				})
 				.catch(error => {
@@ -391,7 +391,7 @@ export default {
 					this.listQuery.status = 92
 					break
 			}
-			this.GetSellerClubList()
+			this.getList()
 		},
 		tabCurrentClick(index) {
 			//商品详情&&供应商信息tab切换
@@ -402,13 +402,13 @@ export default {
 					this.listQuery.status = 90
 					this.listQuery.pageNum = 1
 					this.listQuery.userIdentity = 4
-					this.GetSellerClubList()
+					this.getList()
 					break
 				case 1:
 					this.listQuery.pageNum = 1
 					this.listQuery.status = 90
 					this.listQuery.userIdentity = 2
-					this.GetSellerClubList()
+					this.getList()
 					break
 			}
 		},
@@ -419,24 +419,21 @@ export default {
 				case 0:
 					this.tabCurrentIndex = 0
 					this.listQuery.type = 1
-					this.listQuery.status = 90
 					this.listQuery.pageNum = 1
 					this.listQuery.groupServiceId = 0
-					this.GetSellerClubList()
+					this.getList()
 					break
 				case 1:
 					this.listQuery.type = this.isManage ? 2 : 6
-					this.listQuery.status = 90
 					this.listQuery.pageNum = 1
 					this.listQuery.groupServiceId = 0
-					this.GetSellerClubList()
+					this.getList()
 					break
 				case 2:
 					this.listQuery.type = 6
-					this.listQuery.status = 90
 					this.listQuery.pageNum = 1
 					this.listQuery.groupServiceId = 0
-					this.GetSellerClubList()
+					this.getList()
 					break
 			}
 		},
@@ -445,7 +442,7 @@ export default {
 			//确定筛选
 			this.listQuery = { ...this.listQuery, ...data }
 			this.listQuery.pageNum = 1
-			this.GetSellerClubList()
+			this.getList()
 		},
 		handleChoiceaSellerData(data) {
 			// 确定搜索
@@ -461,7 +458,6 @@ export default {
 			/**
 			 * 1：机构画像 2：填写咨询记录 3：商城访问记录 4：修改资料 5：更换协销
 			 * */
-
 			console.log('type', type)
 			switch (type) {
 				case 1:
@@ -571,7 +567,7 @@ page {
 page,
 .container {
 	/* padding-bottom: 120upx; */
-	background: #f7f7f7;
+	background: #FFFFFF;
 }
 .container {
 	position: relative;
@@ -794,7 +790,7 @@ page,
 			}
 			.list-content {
 				width: 560rpx;
-				height: 150rpx;
+				height: 180rpx;
 				float: left;
 				padding-left: 20rpx;
 				box-sizing: border-box;

pages/seller/components/category.vue

@@ -1,5 +1,5 @@
 <template>
-	<view id="category" :style="{paddingTop:CustomBar+'px'}">
+	<view class="category" id="category" :style="{paddingTop:CustomBar+'px'}">
 		<!--顶部搜索导航栏-->
 		<view class="'search-input-fixed" :style="{top:CustomBar/2+'px'}">
 			<cat-search :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" @click="hanldTabClick"></cat-search>
@@ -145,8 +145,12 @@
 	}
 </script>
 <style lang="scss">
-	page {
-		background-color: #fff;
+	.category {
+		width: 100%;
+		height: 100%;
+		position: relative;
+		background: #FFFFFF;
+		box-sizing: border-box;
 	}
 	.search-input-fixed{
 		width: 100%;

pages/seller/components/home.vue

@@ -2,32 +2,30 @@
 	<view class="container home clearfix" :style="{paddingTop:CustomBar+'px'}">
 		<customer ref="customer" :isScroll="isScroll" :navbar-data='nvabarData'></customer>
 		<!-- 主页内容 -->
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5" />
 		<view class="container-home tui-skeleton">
 			<!-- 轮播 -->
-			<banner :list="bannerImageList" v-if="isNavRequest"></banner>
+			<banner :list="bannerImageList" v-if="isNavRequest" />
 			<!-- 金刚区菜单 -->
-			<navbars :list="navBarsList" v-if="isNavRequest"></navbars>
+			<navbars :list="navBarsList" v-if="isNavRequest" />
             <!-- 快捷运营 -->
-            <quick-opera :list="quickOpreaList" v-if="isNavRequest && quickOpreaList.length > 0"/>
-			<!-- 轮播公告 -->
-			<notice :list="newsList" v-if="isNavRequest && newsList.length>0 "></notice>
+            <quick-opera :list="shortcutList" v-if="isNavRequest && shortcutList.length > 0"/>
 			<!-- 直播 -->
-			<page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
+			<page-special :templateData="templateData" v-if="isLiveRequest" />
 			<!-- 新品橱窗 -->
-			<hot-floor :list="hotListPageFloor" :usserIdentity="userIdentity" v-if="isRequest"></hot-floor>
+			<hot-floor :list="hotListPageFloor" :usserIdentity="userIdentity" v-if="isRequest" />
 		</view>	
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
-			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest"></page-floor>
-			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
+			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest" />
+			<supplier-list :supplierObj="supplierObj" v-if="isRequest" />
 		</view>
 		<!-- 资质证书 -->
-		<Certificate v-if="isRequest"></Certificate>
+		<Certificate v-if="isRequest" />
 		<!-- 活动弹窗 -->
-		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
+		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick" />
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :isShowSupplier="true" :bottom="130"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :isShowSupplier="true" :isShowKefu='false' :bottom="130" />
 	</view>
 </template>
 
@@ -36,7 +34,6 @@
 	import customer from '@/components/cm-module/homeIndex/customer.vue'
 	import banner from '@/components/cm-module/homeIndex/banner.vue'
 	import navbars from '@/components/cm-module/homeIndex/navbars.vue'
-	import notice from '@/components/cm-module/homeIndex/notice.vue'
 	import hotFloor from '@/components/cm-module/homeIndex/hotFloor.vue'
 	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
 	import Certificate from '@/components/cm-module/homeIndex/certificate.vue'
@@ -49,7 +46,6 @@
 			customer,
 			banner,
 			navbars,
-			notice,
 			hotFloor,
 			pageFloor,
 			Certificate,
@@ -88,7 +84,7 @@
 				isRequest:false,
 				isNavRequest:false,
 				isLiveRequest:false,
-                quickOpreaList: [], // 快捷运营
+                shortcutList: [], // 快捷运营
                 isScroll: false
 			}
 		},
@@ -137,7 +133,7 @@
 					this.skeletonShow = false
 					this.navBarsList = data.topMenuList
 					this.newsList = data.annlist
-                    this.quickOpreaList = data.shortcutList || [] // 快捷运营
+                    this.shortcutList = data.shortcutList || [] // 快捷运营
 					this.isNavRequest = true
 					this.GetHomeTopDataInfo()
 					this.GetHomeFloorInfo()
@@ -189,7 +185,7 @@
 
 <style lang="scss">
 	page{
-		background-color: #FFFFFF;
+		background-color: #ff5b00;
 	}
 	.container-section{
 		width: 100%;

pages/seller/components/message.vue

@@ -6,7 +6,7 @@
     		borderRadius="10rpx"
     		:isLoading="true"
     		:loadingType="5"
-    	></tui-skeleton>
+    	/>
     	<view v-else>
     		<view class="navbar-wrap" :style="{ height: CustomBar + 'px', paddingTop: StatusBar + 'px' }">
     			<view
@@ -113,6 +113,13 @@
 </script>
 
 <style lang="scss" scoped>
+.notice {
+	width: 100%;
+	height: 100%;
+	position: relative;
+	background: #FFFFFF;
+	box-sizing: border-box;
+}
 .navbar-wrap {
 	position: fixed;
 	width: 100%;

pages/seller/components/user.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container user clearfix">
-		<cm-custom :navbar-data="nvabarData"></cm-custom>
+		<cm-custom :navbar-data="nvabarData" />
 		<view class="user-section">
 			<view
 				class="header"

pages/seller/index/index.vue

@@ -1,20 +1,20 @@
 <template>
-	<view class="content" :style="{ paddingBottom: isIphoneX ? '140rpx' : '98rpx' }">
+	<view class="seller-content" :style="{ paddingBottom: isIphoneX ? '140rpx' : '98rpx' }" >
 		<!-- 采美采购商城 -->
-		<view :style="{ display: show_index == 0 ? 'block' : 'none' }">
-			<seller-home ref="home" v-if="isHomeData"></seller-home>
+		<view class="content-main" :style="{ display: show_index == 0 ? 'block' : 'none' }">
+			<seller-home ref="home" v-if="isHomeData" />
 		</view>
 		<!-- 商品分类 -->
-		<view :style="{ display: show_index == 1 ? 'block' : 'none' }">
-			<seller-category ref="category" v-if="isCategory"></seller-category>
+		<view class="content-main" :style="{ display: show_index == 1 ? 'block' : 'none' }">
+			<seller-category ref="category" v-if="isCategory" />
 		</view>
         <!-- 消息 -->
-        <view :style="{ display: show_index == 2 ? 'block' : 'none' }">
-        	<seller-message ref="message" v-if="isMessage"></seller-message>
+        <view class="content-main" :style="{ display: show_index == 2 ? 'block' : 'none' }">
+        	<seller-message ref="message" v-if="isMessage" />
         </view>
 		<!-- 账户中心 -->
-		<view :style="{ display: show_index == 3 ? 'flex' : 'none' }">
-			<seller-user ref="user" v-if="isUserData"></seller-user>
+		<view class="content-main" :style="{ display: show_index == 3 ? 'flex' : 'none' }">
+			<seller-user ref="user" v-if="isUserData" />
 		</view>
 		<!-- isIphoneX判断是否为刘海屏在main.js里，好像uniapp有一个css变量获取刘海屏的安全区域 -->
 		<view class="tabBar" :style="{ height: isIphoneX ? '140rpx' : '98rpx' }">
@@ -151,7 +151,14 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+.seller-content{
+	height: 100%;
+	box-sizing: border-box;
+	.content-main{
+		height: 100%;
+	}
+}	
 .tabBar {
 	width: 100%;
 	height: 98rpx;

pages/seller/remarks/add-record.vue

@@ -479,13 +479,11 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.remarksParams.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 		},
-		getUserRemarksVisitDetail(remarksId) {
+		async getUserRemarksVisitDetail(remarksId) {
 			//修改回显资料备注信息
-			this.UserService.getUserRemarksVisitDetail({
-				remarksId : remarksId
-			})
-			.then(response => {
-				let data = response.data
+			try{
+				const res = await this.UserService.getUserRemarksVisitDetail({ remarksId : remarksId })
+				const data = res.data
 				this.reportInfo.questionMan = data.questionMan
 				this.reportInfo.questionManId = data.questionManId
 				this.questionMan = data.questionMan
@@ -570,10 +568,10 @@ export default {
 				this.genderText = this.genderActionsFilters(data.customerGender)
 				this.additiveText = this.additiveActionsFilters(data.groupAddition)
 				this.initGetStotage()
-			})
-			.catch(error => {
-				this.$util.msg(error.msg, 2000)
-			})
+			}catch(error){
+				//TODO handle the exception
+				console.log('备注信息回显查询失败~')
+			}
 		},
 		async getPriorKeyword() {
 			//查询优先展示标签
@@ -602,6 +600,11 @@ export default {
 			}
 		},
 		editButtonConfim() {
+			if (this.remarksParams.communicationSituation === '') {
+				this.$util.msg('请选择沟通情况', 2000)
+				return
+			}
+			
 			if(this.current === 0){
 				if (this.remarksParams.consult == '') {
 					this.$util.msg('请选择咨询类别', 2000)

pages/seller/remarks/add.vue

@@ -661,6 +661,12 @@ export default {
 			if (this.isConfirmLoding) {
 				return
 			}
+			
+			if (this.remarksParams.communicationSituation === '') {
+				this.$util.msg('请选择沟通情况', 2000)
+				return
+			}
+			
 			if(this.current === 0){
 				if (this.remarksParams.questionMan == '') {
 					this.$util.msg('请输入咨询人姓名', 2000)

pages/seller/remarks/record-club-list.vue

@@ -8,9 +8,9 @@
 						class="input"
 						type="text"
 						confirm-type="search"
-						v-model="listQuery.keyWord"
+						v-model="listQuery.search"
 						@input="onShowClose"
-						@confirm="getUserClubRemarksList"
+						@confirm="getClubRemarksList"
 						placeholder="搜索关键词/咨询人/机构名称/手机号"
 						maxlength="16"
 					/>
@@ -97,7 +97,7 @@
 						</view>
 					</view>
 					<view class="tui-remarks-content">
-						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarks" :key="labelIndex">
+						<text class="tui-remarks-span" v-for="(label, labelIndex) in remark.remarkLabel" :key="labelIndex">
 							{{ label.label }}
 						</text>
 					</view>
@@ -129,18 +129,8 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 const defaultListQuery = {
-	startAddTime: '',
-	endAddTime: '',
-	consult: '',
-	pinceSensitve: 0, //价格敏感度
-	satisfied: 0, // 意向程度
-	followup: 0, // 跟进状态
-	leaderId: 0,
-	groupId: 0,
-	manager: 0,
-	newDeal: 0, // 新增分配机构
-	status: 0, // 报备状态
-	serviceProviderId: 0,
+	clubId: 0,
+	search:'',
 	pageNum: 1,
 	pageSize: 10
 }
@@ -182,7 +172,6 @@ export default {
 			handleRemarksId: 0,
 		}
 	},
-	onLoad() {},
 	filters: {
 		statusFilters(value) {
 			// 订单来源
@@ -217,79 +206,78 @@ export default {
 			}
 		}
 	},
+	onLoad(option) {
+		console.log('option',option)
+		this.listQuery.clubId = option.clubId
+		this.getClubRemarksList()
+	},
 	computed: {
 		...mapState(['hasLogin', 'userInfo'])
 	},
 	methods: {
 		...mapMutations(['login', 'logout']),
-		async initGetStotage() {
-			const userInfo = await this.$api.getStorage()
-			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-			this.listQuery.manager = userInfo.manager ? userInfo.manager : 0
-			this.getUserClubRemarksList()
-		},
-		getUserClubRemarksList() {
-			this.remarksList = []
-			this.listQuery.pageNum = 1
-			this.UserService.getUserClubRemarksList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.results && data.results.length > 0) {
-						this.isEmpty = false
-						this.hasNextPage = data.hasNextPage
-						this.totalRecord = data.totalRecord
-						this.remarksList = data.results
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							if (this.remarksList.length < 8) {
-								this.pullUpOn = true
-							} else {
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '已至底部'
-							}
-						}
+		async getClubRemarksList() {
+			try{
+				this.remarksList = []
+				this.listQuery.pageNum = 1
+				const res = await this.SellerService.getClubAllRemark(this.listQuery)
+				const data = res.data
+				if (data.results && data.results.length > 0) {
+					this.isEmpty = false
+					this.hasNextPage = data.hasNextPage
+					this.totalRecord = data.totalRecord
+					this.remarksList = data.results
+					this.pullFlag = false
+					setTimeout(() => {
+						this.pullFlag = true
+					}, 500)
+					if (this.hasNextPage) {
+						this.pullUpOn = false
+						this.nomoreText = '上拉显示更多'
 					} else {
-						this.isEmpty = true
-					}
-					this.isRequest = true
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		GetOnReachBottomData(index) {
-			//上拉加载
-			this.listQuery.pageNum += 1
-			this.UserService.getUserClubRemarksList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.results && data.results.length > 0) {
-						this.hasNextPage = data.hasNextPage
-						this.remarksList = this.remarksList.concat(data.results)
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
+						if (this.remarksList.length < 8) {
+							this.pullUpOn = true
 						} else {
 							this.pullUpOn = false
 							this.loadding = false
 							this.nomoreText = '已至底部'
 						}
 					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+				} else {
+					this.isEmpty = true
+				}
+				this.isRequest = true
+			}catch(error){
+				//TODO handle the exception
+				this.$util.msg(error.msg, 2000)
+			}
+		},
+		async GetOnReachBottomData(index) {
+			//上拉加载
+			try{
+				this.listQuery.pageNum ++
+				const res = await this.SellerService.getClubAllRemark(this.listQuery)
+				const data = res.data
+				if (data.results && data.results.length > 0) {
+					this.hasNextPage = data.hasNextPage
+					this.remarksList = this.remarksList.concat(data.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){
+				//TODO handle the exception
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		deleteRemark(remarksId) {
 			this.handleRemarksId = remarksId
@@ -319,7 +307,7 @@ export default {
 				.then(response => {
 					this.$util.msg('已删除', 2000, true, 'success')
 					setTimeout(() => {
-						this.getUserClubRemarksList()
+						this.getClubRemarksList()
 					}, 2000)
 				})
 				.catch(error => {
@@ -333,7 +321,7 @@ export default {
 			} else {
 				this.isShowClose = false
 				this.listQuery.pageNum = 1
-				this.getUserClubRemarksList()
+				this.getClubRemarksList()
 			}
 		},
 		delInputText() {
@@ -341,7 +329,7 @@ export default {
 			this.listQuery.keyWord = ''
 			this.isShowClose = false
 			this.listQuery.pageNum = 1
-			this.getUserClubRemarksList()
+			this.getClubRemarksList()
 		},
 		hideMobel() {
 			this.modal = false
@@ -370,7 +358,7 @@ export default {
 		}, 200)
 	},
 	onShow() {
-		this.initGetStotage()
+
 	}
 }
 </script>

pages/seller/remarks/record-list.vue

@@ -430,12 +430,6 @@ export default {
 			} catch (error) {
 				console.log('=======>添加咨询人失败~')
 			}
-			this.UserService.getUserClubVisitorSave({
-				name: data,
-				serviceProviderId: this.listQuery.serviceProviderId
-			})
-				.then(response => {})
-				.catch(error => {})
 		},
 		handleClick(e) {
 			//取消收藏

pages/supplier/components/category.vue

@@ -1,5 +1,5 @@
 <template>
-	<view id="category" :style="{paddingTop:CustomBar+'px'}">
+	<view class="category" id="category" :style="{paddingTop:CustomBar+'px'}">
 		<!--顶部搜索导航栏-->
 		<view class="'search-input-fixed" :style="{top:CustomBar/2+'px'}">
 			<cat-search :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" @click="hanldTabClick"></cat-search>
@@ -145,8 +145,12 @@
 	}
 </script>
 <style lang="scss">
-	page {
-		background-color: #fff;
+	.category {
+		width: 100%;
+		height: 100%;
+		position: relative;
+		background: #FFFFFF;
+		box-sizing: border-box;
 	}
 	.search-input-fixed{
 		width: 100%;

pages/supplier/components/home.vue

@@ -1,220 +1,195 @@
 <template>
-    <view class="container home clearfix" :style="{ paddingTop: CustomBar + 'px' }">
-        <customer ref="customer" :isScroll="isScroll" :navbar-data="nvabarData"></customer>
-        <!-- 主页内容 -->
-        <tui-skeleton
-            v-if="skeletonShow"
-            backgroundColor="#fafafa"
-            borderRadius="10rpx"
-            :isLoading="true"
-            :loadingType="5"
-        ></tui-skeleton>
-        <view class="container-home tui-skeleton">
-            <!-- 轮播 -->
-            <banner :list="bannerImageList" v-if="isNavRequest"></banner>
-            <!-- 金刚区菜单 -->
-            <navbars :list="navBarsList" v-if="isNavRequest"></navbars>
+	<view class="container home clearfix" :style="{paddingTop:CustomBar+'px'}">
+		<customer ref="customer" :isScroll="isScroll" :navbar-data='nvabarData'></customer>
+		<!-- 主页内容 -->
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5" />
+		<view class="container-home tui-skeleton">
+			<!-- 轮播 -->
+			<banner :list="bannerImageList" v-if="isNavRequest" />
+			<!-- 金刚区菜单 -->
+			<navbars :list="navBarsList" v-if="isNavRequest" />
             <!-- 快捷运营 -->
-            <quick-opera :list="quickOpreaList" v-if="isNavRequest && quickOpreaList.length > 0"/>
-            <!-- 轮播公告 -->
-            <notice :list="newsList" v-if="isNavRequest && newsList.length > 0"></notice>
-            <!-- 直播 -->
-            <page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
-            <!-- 新品橱窗 -->
-            <hot-floor :list="hotListPageFloor" :usserIdentity="userIdentity" v-if="isRequest"></hot-floor>
-        </view>
-        <!-- 楼层 -->
-        <view class="container-section tui-skeleton">
-            <page-floor :list="pageList" :userIdentity="userIdentity" :pageType="1" v-if="isRequest"></page-floor>
-            <supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
-        </view>
-        <!-- 资质证书 -->
-        <Certificate v-if="isRequest"></Certificate>
-        <!-- 活动弹窗 -->
-        <activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
-        <!-- 侧边 -->
-        <scroll-top :isScrollTop="isScrollTop" :isShowSupplier="true" :bottom="130"></scroll-top>
-    </view>
+            <quick-opera :list="shortcutList" v-if="isNavRequest && shortcutList.length > 0"/>
+			<!-- 直播 -->
+			<page-special :templateData="templateData" v-if="isLiveRequest" />
+			<!-- 新品橱窗 -->
+			<hot-floor :list="hotListPageFloor" :usserIdentity="userIdentity" v-if="isRequest" />
+		</view>	
+		<!-- 楼层 -->
+		<view class="container-section tui-skeleton">
+			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest" />
+			<supplier-list :supplierObj="supplierObj" v-if="isRequest" />
+		</view>
+		<!-- 资质证书 -->
+		<Certificate v-if="isRequest" />
+		<!-- 活动弹窗 -->
+		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick" />
+		<!-- 侧边 -->
+		<scroll-top :isScrollTop="isScrollTop" :isShowSupplier="true" :isShowKefu='false' :bottom="130" />
+	</view>
 </template>
 
 <script>
-import authorize from '@/common/config/authorize.js'
-import customer from '@/components/cm-module/homeIndex/customer.vue'
-import banner from '@/components/cm-module/homeIndex/banner.vue'
-import navbars from '@/components/cm-module/homeIndex/navbars.vue'
-import notice from '@/components/cm-module/homeIndex/notice.vue'
-import hotFloor from '@/components/cm-module/homeIndex/hotFloor.vue'
-import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
-import Certificate from '@/components/cm-module/homeIndex/certificate.vue'
-import pageSpecial from '@/components/cm-module/homeIndex/pageSpecial.vue'
-import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
-import quickOpera from '@/components/cm-module/homeIndex/quickOperation.vue'
-import { mapState, mapMutations } from 'vuex'
-export default {
-    components: {
-        customer,
-        banner,
-        navbars,
-        notice,
-        hotFloor,
-        pageFloor,
-        Certificate,
-        pageSpecial,
-        supplierList,
-        quickOpera
-    },
-    data() {
-        return {
-            nvabarData: {
-                //顶部自定义导航
-                showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-                showSearch: 0,
-                title: '采美采购商城', // 导航栏 中间的标题
-                haveBack: false,
-                textLeft: this.$store.state.isIphone,
-                textColor: '#FFFFFF'
-            },
-            CustomBar: this.CustomBar, // 顶部导航栏高度
-            userID: 0,
-            clubStatus: '',
-            current: 0,
-            mode: 'round',
-            modallayer: false,
-            isLogin: false,
-            skeletonShow: true,
-            userIdentity: '',
-            flootData: [], //楼层
-            bannerImageList: [], //轮播
-            navBarsList: [], //导航分类
-            newsList: [], // 公告
-            templateData: {},
-            hotListPageFloor: [], // 新品橱窗
-            pageList: [], //楼层
-            supplierObj: {}, //供应商列表
-            isScrollTop: false,
-            isRequest: false,
-            isNavRequest: false,
-            isLiveRequest: false,
-            isScroll: false,
-            quickOpreaList: []
-        }
-    },
-    created() {
-        this.$api.getStorage().then(resolve => {
-            this.userID = resolve.userId ? resolve.userId : 0
-            this.userIdentity = resolve.userIdentity
-            this.getHomeInformation()
-        })
-    },
-    filters: {
-        NumFormat: function(text) {
-            //处理金额
-            return Number(text).toFixed(2)
-        }
-    },
-    computed: {
-        ...mapState(['hasLogin', 'userInfo', 'isActivity'])
-    },
-    methods: {
-        ...mapMutations(['login', 'logout']),
-        GetHomeTopDataInfo() {
-            //直播、活动、文章模块
-            this.CommonService.GetHomeTopDataInfo({ source: 2 })
-                .then(response => {
-                    this.templateData = response.data
-                    this.isLiveRequest = true
-                })
-                .catch(error => {
-                    this.$util.msg(error.msg, 2000)
-                })
-        },
-        GetHomeFloorInfo() {
-            //初始化首页楼层数据
-            this.CommonService.GetHomeDataInfo({ userId: this.userID, source: 2 })
-                .then(response => {
-                    let data = response.data
-                    this.pageList = data.homePageFloor
-                    this.hotListPageFloor = data.pageFloorList
-                    console.log('hotListPageFloor', this.hotListPageFloor)
-                    this.supplierObj = data.supplierImage
-                    this.isRequest = true
-                })
-                .catch(error => {
-                    this.$util.msg(error.msg, 2000)
-                })
-        },
-        getHomeInformation() {
-            //初始化首页数据
-            this.CommonService.GetHomeModulesDataInfo({ source: 2 })
-                .then(res => {
-                    let data = res.data
-                    this.bannerImageList = data.bannerList
-                    this.mallPageModules = data.mallPageModules
-                    this.skeletonShow = false
-                    this.navBarsList = data.topMenuList
-                    this.newsList = data.annlist
-                    this.quickOpreaList = data.shortcutList || []
-                    this.isNavRequest = true
-                    this.GetHomeTopDataInfo()
-                    this.GetHomeFloorInfo()
-                })
-                .catch(error => {
-                    this.$util.msg(error.msg, 2000)
-                })
-        },
-        handleClick(data) {
-            this.$api.navigateTo('/pages/h5/activity/meobohui')
-            this.$store.commit('setActivity', data)
-        },
-        handleCancelClick(data) {
-            this.$store.commit('setActivity', data)
-        }
-    },
-    onPageScroll(e) {
-        //实时获取到滚动的值
-        if (e.scrollTop > 0) {
-            this.isScroll = true
-        } else {
-            this.isScroll = false
-        }
-        console.log(e, this.isScroll)
-        if (e.scrollTop > 50) {
-            this.inputActive = 'fixed'
-        } else {
-            this.inputActive = 'float'
-        }
-        if (e.scrollTop > 400) {
-            this.isScrollTop = true
-        } else {
-            this.isScrollTop = false
-        }
-    },
-    onPullDownRefresh() {
-        //下拉刷新
-        this.getHomeInformation()
-        uni.stopPullDownRefresh()
-    },
-    onShareAppMessage(res) {
-        //分享转发
-        if (res.from === 'button') {
-            // 来自页面内转发按钮
-        }
-        return {
-            title: '生美医美正品采购服务平台',
-            path: 'pages/tabBar/home/index',
-            imageUrl: 'https://static.caimei365.com/app/img/bg/min-banner.jpg'
-        }
-    }
-}
+	import authorize from '@/common/config/authorize.js'
+	import customer from '@/components/cm-module/homeIndex/customer.vue'
+	import banner from '@/components/cm-module/homeIndex/banner.vue'
+	import navbars from '@/components/cm-module/homeIndex/navbars.vue'
+	import hotFloor from '@/components/cm-module/homeIndex/hotFloor.vue'
+	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
+	import Certificate from '@/components/cm-module/homeIndex/certificate.vue'
+	import pageSpecial from '@/components/cm-module/homeIndex/pageSpecial.vue'
+	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
+    import quickOpera from '@/components/cm-module/homeIndex/quickOperation.vue'
+	import { mapState,mapMutations} from 'vuex'
+	export default {
+		components:{
+			customer,
+			banner,
+			navbars,
+			hotFloor,
+			pageFloor,
+			Certificate,
+			pageSpecial,
+			supplierList,
+            quickOpera
+		},
+		data() {
+			return {
+				nvabarData: {//顶部自定义导航
+					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '采美采购商城', // 导航栏 中间的标题
+					haveBack:false,
+					textLeft:this.$store.state.isIphone,
+					textColor:'#FFFFFF'
+				},
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				userID:0,
+				clubStatus:'',
+				current:0,
+				mode:'round',
+				modallayer:false,
+				isLogin:false,
+				skeletonShow: true,
+				userIdentity:'',
+				flootData:[],//楼层
+				bannerImageList:[],//轮播
+				navBarsList:[],//导航分类
+				newsList:[],				// 公告
+				templateData:{},
+				hotListPageFloor:[],					// 新品橱窗
+				pageList:[],//楼层
+				supplierObj:{},//供应商列表
+				isScrollTop:false,
+				isRequest:false,
+				isNavRequest:false,
+				isLiveRequest:false,
+                shortcutList: [], // 快捷运营
+                isScroll: false
+			}
+		},
+		created() {
+			this.$api.getStorage().then((resolve) =>{
+				this.userID = resolve.userId ? resolve.userId : 0
+				this.userIdentity = resolve.userIdentity
+				this.getHomeInformation()
+			})
+		},
+		filters: {
+			NumFormat:function(text) {//处理金额
+				return Number(text).toFixed(2)
+			},
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo','isActivity'])
+		},
+		methods: {
+			...mapMutations(['login','logout']),
+			GetHomeTopDataInfo(){//直播、活动、文章模块
+				this.CommonService.GetHomeTopDataInfo({source:2}).then(response =>{
+					this.templateData = response.data
+					this.isLiveRequest = true
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			GetHomeFloorInfo(){//初始化首页楼层数据
+				this.CommonService.GetHomeDataInfo({userId:this.userID,source:2}).then(response =>{
+					let data = response.data
+					this.pageList = data.homePageFloor
+					this.hotListPageFloor =  data.pageFloorList
+					console.log('hotListPageFloor',this.hotListPageFloor)
+					this.supplierObj = data.supplierImage
+					this.isRequest = true
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			getHomeInformation(){//初始化首页数据	
+				this.CommonService.GetHomeModulesDataInfo({ source: 2 }).then(res =>{
+					let data = res.data
+					this.bannerImageList = data.bannerList
+					this.mallPageModules = data.mallPageModules
+					this.skeletonShow = false
+					this.navBarsList = data.topMenuList
+					this.newsList = data.annlist
+                    this.shortcutList = data.shortcutList || [] // 快捷运营
+					this.isNavRequest = true
+					this.GetHomeTopDataInfo()
+					this.GetHomeFloorInfo()
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			handleClick(data){
+				this.$api.navigateTo('/pages/h5/activity/meobohui')
+				this.$store.commit('setActivity',data)
+			},
+			handleCancelClick(data){
+				this.$store.commit('setActivity',data)
+			}
+		},
+		onPageScroll(e){//实时获取到滚动的值
+            if (e.scrollTop > 0) {
+                this.isScroll = true
+            } else {
+                this.isScroll = false
+            }
+			if(e.scrollTop>50){
+				this.inputActive = 'fixed'
+			}else{
+				this.inputActive = 'float'
+			}	
+			if(e.scrollTop>400){
+				this.isScrollTop = true
+			}else{
+				this.isScrollTop = false
+			}	
+		},
+		onPullDownRefresh() {//下拉刷新
+			this.getHomeInformation()
+			uni.stopPullDownRefresh()
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: '生美医美正品采购服务平台',
+			  path: 'pages/tabBar/home/index',
+			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-page {
-    background-color: #ffffff;
-}
-.container-section {
-    width: 100%;
-    height: auto;
-    background-color: #f7f7f7;
-}
+	page{
+		background-color: #ff5b00;
+	}
+	.container-section{
+		width: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+	}
 </style>

pages/supplier/components/notice.vue

@@ -6,7 +6,7 @@
 			borderRadius="10rpx"
 			:isLoading="true"
 			:loadingType="5"
-		></tui-skeleton>
+		/>
 		<view v-else>
 			<view class="navbar-wrap" :style="{ height: CustomBar + 'px', paddingTop: StatusBar + 'px' }">
 				<view
@@ -124,6 +124,13 @@ export default {
 </script>
 
 <style lang="scss">
+.notice {
+	width: 100%;
+	height: 100%;
+	position: relative;
+	background: #FFFFFF;
+	box-sizing: border-box;
+}		
 .navbar-wrap {
 	position: fixed;
 	width: 100%;

pages/supplier/index/index.vue

@@ -1,20 +1,20 @@
 <template>
-	<view class="content" :style="{ paddingBottom: isIphoneX ? '140rpx' : '98rpx' }">
+	<view class="seller-content" :style="{ paddingBottom: isIphoneX ? '140rpx' : '98rpx' }">
 		<!-- 采美采购商城 -->
-		<view :style="{ display: show_index == 0 ? 'block' : 'none' }">
-			<supplier-home ref="home" v-if="isHomeData"></supplier-home>
+		<view class="content-main" :style="{ display: show_index == 0 ? 'block' : 'none' }">
+			<supplier-home ref="home" v-if="isHomeData" />
 		</view>
 		<!-- 商品分类 -->
-		<view :style="{ display: show_index == 1 ? 'block' : 'none' }">
-			<supplier-category ref="category" v-if="isCategory"></supplier-category>
+		<view class="content-main" :style="{ display: show_index == 1 ? 'block' : 'none' }">
+			<supplier-category ref="category" v-if="isCategory" />
 		</view>
 		<!-- 通知消息 -->
-		<view :style="{ display: show_index == 2 ? 'block' : 'none' }">
-			<supplier-notice ref="notice" v-if="isNotice"></supplier-notice>
+		<view class="content-main" :style="{ display: show_index == 2 ? 'block' : 'none' }">
+			<supplier-notice ref="notice" v-if="isNotice" />
 		</view>
 		<!-- 账户中心 -->
-		<view :style="{ display: show_index == 3 ? 'flex' : 'none' }">
-			<supplier-user ref="user" v-if="isUserData"></supplier-user>
+		<view class="content-main" :style="{ display: show_index == 3 ? 'flex' : 'none' }">
+			<supplier-user ref="user" v-if="isUserData" />
 		</view>
 		<!-- isIphoneX判断是否为刘海屏在main.js里，好像uniapp有一个css变量获取刘海屏的安全区域 -->
 		<view class="tabBar" :style="{ height: isIphoneX ? '140rpx' : '98rpx' }">
@@ -171,6 +171,13 @@ export default {
 </script>
 
 <style lang="scss">
+.seller-content{
+	height: 100%;
+	box-sizing: border-box;
+	.content-main{
+		height: 100%;
+	}
+}	
 .tabBar {
 	width: 100%;
 	height: 98rpx;

pages/tabBar/home/index.js

@@ -5,7 +5,35 @@ import authorize from '@/common/config/authorize.js'
 const homeMiXins = {
     data() {
         return {
-            bankInfo:{}
+            userID: 0,
+            clubId: 0,
+            clubStatus: '',
+            current: 0,
+            mode: 'round',
+            isLogin: false,
+            skeletonShow: true,
+            userIdentity: 0,
+            isRequest: false,
+            isNavRequest: false,
+            isLiveRequest: false,
+            isActivityBean: false,
+            beansType: 1,
+            beanNumber: 50,
+            couponEntry: 2,
+            autoplay: true,
+            isScroll: false,
+            suid: 0, // 协销id
+            options: {}, // 分享数据
+            bankInfo:{},
+            flootData: [], // 楼层
+            bannerImageList: [], // 轮播
+            navBarsList: [], // 导航分类
+            shortcutList: [], // 快捷运营
+            newsList: [], // 公告
+            templateData: {},
+            hotListPageFloor: [], // 新品橱窗
+            pageList: [], // 楼层
+            supplierObj: {}, // 供应商列表
         }
     },
     computed: {
@@ -99,7 +127,7 @@ const homeMiXins = {
         			this.navBarsList = data.topMenuList
         			this.couponEntry = data.couponEntry
         			this.newsList = data.annlist
-                    this.quickOpreaList = data.shortcutList || [] // 快捷运营
+                    this.shortcutList = data.shortcutList || [] // 快捷运营
         			if (!this.hasLogin && this.couponEntry === 1) {
                         this.$store.commit('updateCouponEntry', data.couponEntry)
         				if (uni.getStorageSync('isActivitySwitch')) {

pages/tabBar/home/index.vue

@@ -8,39 +8,37 @@
 			borderRadius="10rpx"
 			:isLoading="true"
 			:loadingType="5"
-		></tui-skeleton>
+		/>
 		<view class="container-home tui-skeleton">
 			<!-- 轮播 -->
-			<banner :list="bannerImageList" v-if="isNavRequest"></banner>
+			<banner :list="bannerImageList" :newsList="newsList"  v-if="isNavRequest" />
 			<!-- 金刚区菜单 -->
-			<navbars :list="navBarsList" v-if="isNavRequest"></navbars>
+			<navbars :list="navBarsList" v-if="isNavRequest" />
             <!-- 快捷运营 -->
-            <quick-opera :list="quickOpreaList" v-if="isNavRequest && quickOpreaList.length > 0"/>
-			<!-- 轮播公告 -->
-			<notice :list="newsList" v-if="isNavRequest && newsList.length > 0"></notice>
+            <quick-opera :list="shortcutList" v-if="isNavRequest && shortcutList.length > 0"/>
 			<!-- 优惠券入口 -->
-			<coupon v-if="isNavRequest && couponEntry == 1"></coupon>
+			<coupon v-if="isNavRequest && couponEntry == 1" />
 			<!-- 直播 -->
-			<page-special :templateData="templateData" v-if="isLiveRequest"></page-special>
+			<page-special :templateData="templateData" v-if="isLiveRequest" />
 			<!-- 新品橱窗 -->
 			<hot-floor
 				:list="hotListPageFloor"
 				:usserIdentity="userIdentity"
 				:autoplay="autoplay"
 				v-if="isRequest && hotListPageFloor.length > 0"
-			></hot-floor>
+			/>
 		</view>
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
-			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType="1" v-if="isRequest"></page-floor>
-			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
+			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType="1" v-if="isRequest" />
+			<supplier-list :supplierObj="supplierObj" v-if="isRequest" />
 		</view>
 		<!-- 资质证书 -->
-		<Certificate v-if="isRequest"></Certificate>
+		<Certificate v-if="isRequest" />
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :isShowSupplier="true" :bottom="130"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :isShowSupplier="true" :isShowKefu='false' :bottom="130" />
 		<!-- 活动弹窗 -->
-		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
+		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick" />
 		<!-- 采美豆提示弹窗 -->
 		<activityBean
 			v-if="isActivityBean"
@@ -48,17 +46,15 @@
 			:beansType="beansType"
 			:beanNumber="beanNumber"
 			@cancel="handleBeanlClick"
-		></activityBean>
-        <cm-seller-modal :suid="suid"></cm-seller-modal>
+		/>
+        <cm-seller-modal :suid="suid" />
 	</view>
 </template>
-
 <script>
 import { mapState, mapMutations } from 'vuex'
 import customer from '@/components/cm-module/homeIndex/customer.vue'
 import banner from '@/components/cm-module/homeIndex/banner.vue'
 import navbars from '@/components/cm-module/homeIndex/navbars.vue'
-import notice from '@/components/cm-module/homeIndex/notice.vue'
 import coupon from '@/components/cm-module/homeIndex/coupon.vue'
 import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
 import hotFloor from '@/components/cm-module/homeIndex/hotFloor.vue'
@@ -76,7 +72,6 @@ export default {
 		customer,
 		banner,
 		navbars,
-		notice,
 		coupon,
 		pageFloor,
 		hotFloor,
@@ -100,35 +95,7 @@ export default {
 				textColor: '#FFFFFF'
 			},
 			CustomBar: this.CustomBar, // 顶部导航栏高度
-			userID: 0,
-			clubId: 0,
-			clubStatus: '',
-			current: 0,
-			mode: 'round',
-			isLogin: false,
-			skeletonShow: true,
-			userIdentity: 0,
-			flootData: [], // 楼层
-			bannerImageList: [], // 轮播
-			navBarsList: [], // 导航分类
-            quickOpreaList: [], // 快捷运营
-			newsList: [], // 公告
-			templateData: {},
-			hotListPageFloor: [], // 新品橱窗
-			pageList: [], // 楼层
-			supplierObj: {}, // 供应商列表
 			isScrollTop: false,
-			isRequest: false,
-			isNavRequest: false,
-			isLiveRequest: false,
-			isActivityBean: false,
-			beansType: 1,
-			beanNumber: 50,
-			couponEntry: 2,
-			autoplay: true,
-            isScroll: false,
-            suid: 0, // 协销id
-            options: {}, // 分享数据
 		}
 	},
 	onLoad(option) {
@@ -199,7 +166,7 @@ export default {
 
 <style lang="scss">
 page {
-	background-color: #ffffff;
+	background-color: #ff5b00;
 }
 .container-section {
 	width: 100%;

services/sellse.service.js

@@ -417,7 +417,27 @@ export default class SellerService {
         })
     }
     /**
-     * 获取机构列表
+     * 获取相关咨询记录机构信息
+     */
+    getIsRemarkClub(data = {}) {
+        return this.AjaxService.get({
+            url:'/user/seller/getIsRemarkClub', 
+            data, 
+            isLoading: true 
+        })
+    }
+    /**
+     * 机构所有咨询记录
+     */
+    getClubAllRemark(data = {}) {
+        return this.AjaxService.get({
+            url:'/user/seller/getClubAllRemark', 
+            data, 
+            isLoading: true 
+        })
+    }
+    /**
+     * 机构活跃分析列表
      */
     getClubList(data = {}) {
         return this.AjaxService.get({