Browse Source

协销优化

zhengjinyi 6 months ago
parent
commit
671d005ef6

+ 9 - 6
pages/seller/cart/cart.vue

@@ -1591,7 +1591,7 @@ page {
 	.footer-ri {
 		width: 180rpx;
 		height: 84rpx;
-		background: linear-gradient(135deg, rgba(242, 143, 49, 1) 0%, rgba(225, 86, 22, 1) 100%);
+		background: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);
 		float: right;
 		display: flex;
 		justify-content: space-between;
@@ -1618,11 +1618,12 @@ page {
 		width: 400rpx;
 		height: 110rpx;
 		position: absolute;
-		padding-left: 200rpx;
 		background: #ffffff;
 		right: 0;
 		top: 0;
-		z-index: 1000;
+		z-index: 1000;
+        box-sizing: border-box;
+        padding: 15rpx 0;
 		&.show {
 			animation: showDelbtn 0s linear both;
 		}
@@ -1630,13 +1631,15 @@ page {
 			animation: hideDelbtn 0s linear both;
 		}
 		.btn {
-			width: 50%;
+			width: 190rpx;
 			height: 100%;
-			line-height: 110rpx;
+			line-height: 80rpx;
 			font-size: $font-size-28;
 			color: #ffffff;
 			text-align: center;
-			float: left;
+			float: left;
+            border-radius: 40rpx;
+            margin:0 4rpx;
 		}
 		.btn.btn-cancel {
 			background: #eec1ab;

+ 15 - 16
pages/seller/cart/components/immediatelyList.vue

@@ -18,7 +18,6 @@
 					<input
 						class="input"
 						type="text"
-						:focus="isFocus"
 						confirm-type="search"
 						v-model="searchInputVal"
 						placeholder="请输入商品关键词"
@@ -336,7 +335,7 @@ export default {
 	created() {
 		this.setScrollHeight()
 		this.initGetStotage()
-		this.isFocus = true
+		// this.isFocus = true
 	},
 	filters: {
 		NumFormat: function(text) {
@@ -643,7 +642,7 @@ export default {
 		},
 		onShowClose() {
 			//输入框失去焦点时触发
-			if (this.searchInputVal != '') {
+			if (this.searchInputVal !== '') {
 				this.isShowClose = true
 			} else {
 				this.isShowClose = false
@@ -757,11 +756,11 @@ export default {
 }
 .zuhe_title {
 	background: #ffffff;
-	height: 76rpx;
+	height: 68rpx;
 	font-size: 28rpx;
 	color: #1675e1;
 	border-bottom: 4rpx solid #1675e1;
-	line-height: 76rpx;
+	line-height: 68rpx;
 	padding-left: 30rpx;
 	&.active {
 		color: #FF5B00;
@@ -770,12 +769,12 @@ export default {
 }
 .tabstyle {
 	width: 128rpx;
-	height: 76rpx;
+	height: 68rpx;
 	font-size: 26rpx;
 	display: inline-block;
 	border-radius: 10rpx;
 	text-align: center;
-	line-height: 76rpx;
+	line-height: 68rpx;
 	border: 2rpx solid #eeeeee;
 	position: relative;
 	margin-right: 12rpx;
@@ -826,7 +825,7 @@ export default {
 	}
 }
 .good-search {
-	height: 80rpx;
+	height: 68rpx;
 	width: 100%;
 	padding: 24rpx;
 	background: #ffffff;
@@ -839,23 +838,23 @@ export default {
 	z-index: 19;
 	.search-from {
 		width: 420rpx;
-		height: 80rpx;
+		height: 68rpx;
 		background: #f7f7f7;
-		border-radius: 40rpx;
+		border-radius: 8rpx;
 		float: left;
 		position: relative;
 		.input {
 			width: 340rpx;
-			height: 80rpx;
+			height: 68rpx;
 			float: left;
-			line-height: 80rpx;
+			line-height: 68rpx;
 			color: $text-color;
 			font-size: $font-size-24;
 		}
 		.icon-iconfonticonfontsousuo1 {
 			width: 64rpx;
-			height: 80rpx;
-			line-height: 80rpx;
+			height: 68rpx;
+			line-height: 68rpx;
 			text-align: center;
 			display: block;
 			font-size: $font-size-38;
@@ -867,8 +866,8 @@ export default {
 			color: #999999;
 			position: absolute;
 			width: 120rpx;
-			height: 80rpx;
-			line-height: 80rpx;
+			height: 68rpx;
+			line-height: 68rpx;
 			top: 0;
 			right: 0;
 			text-align: center;

+ 56 - 50
pages/seller/club/club-active-details.vue

@@ -13,7 +13,7 @@
 				></image>
 				<view class="txt">暂无机构数据</view>
 			</view>
-			<view v-else class="club-list">
+			<view v-else class="club-list clearfix">
 				<scroll-view scroll-y="true">
 					<view class="list" v-for="(club, index) in clubList" :key="index">
 						<view class="list-cell-top">
@@ -26,7 +26,7 @@
 									"
 									mode=""
 								></image>
-								<text class="list-id">编号:{{ club.newClubId }}</text>
+								<!-- <text class="list-id">编号:{{ club.newClubId }}</text> -->
 								<text class="list-tips">{{ club.userIdentity === 2 ? '资质机构' : '个人机构' }}</text>
 							</view>
 							<view class="list-content">
@@ -35,7 +35,19 @@
 									<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>
-								</view>
+								</view>
+                                <view class="list-ntel" v-if="tabSmallCurrentIndex === 1">
+                                	<text class="list-link">销售:{{ club.serviceName ? club.serviceName : '' }}</text>
+                                </view>
+                                <view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
+                                	<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
+                                	<text class="list-texl" @click="handlePhone(club.contractMobile)">
+                                		{{ club.contractMobile ? club.contractMobile : '' }}
+                                	</text>
+                                </view>
+                                <view class="list-ntel" v-if="listQuery.type === 6">
+                                	<text class="list-link">分配时间:{{ club.providerTime | dateConversion }}</text>
+                                </view>
 								<view class="list-tags">
 									<text
 										class="tags"
@@ -54,18 +66,7 @@
 										{{ club.customerValue }} <text class="iconfont icon-xiayibu"></text>
 									</text>
 								</view>
-								<view class="list-ntel" v-if="tabSmallCurrentIndex === 1">
-									<text class="list-link">销售:{{ club.serviceName ? club.serviceName : '' }}</text>
-								</view>
-								<view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
-									<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
-									<text class="list-texl" @click="handlePhone(club.contractMobile)">
-										{{ club.contractMobile ? club.contractMobile : '' }}
-									</text>
-								</view>
-								<view class="list-ntel" v-if="listQuery.type === 6">
-									<text class="list-link">分配时间:{{ club.providerTime | dateConversion }}</text>
-								</view>
+								
 							</view>
 						</view>
 					</view>
@@ -211,19 +212,20 @@ page,
 }
 .club-tabs{
 	width: 100%;
-	height: 90rpx;
+	height: 70rpx;
 	position: fixed;
 	top: 0;
 	left: 0;
 	box-sizing: border-box;
-	padding: 20rpx 0;
-	background-color: #ffffff;
+	padding: 10rpx 0;
+	background-color: #ffffff;
+    z-index: 9999;
 	.btn {
 		width: 50%;
 		line-height: 50rpx;
 		box-sizing: border-box;
 		text-align: center;
-		font-size: $font-size-34;
+		font-size: $font-size-30;
 		float: left;
 		color: #333333;
 		position: relative;
@@ -233,7 +235,7 @@ page,
 			height: 4rpx;
 			background-color: #ffffff;
 			position: absolute;
-			bottom: -20rpx;
+			bottom: -10rpx;
 			left: 50%;
 			margin-left: -50rpx;
 		}
@@ -250,9 +252,11 @@ page,
 }
 .club-main {
 	width: 100%;
-	height: 100%;
-	padding-top: 114rpx;
-	float: left;
+	height: 100%;
+    padding: 20rpx;
+	padding-top: 94rpx;
+	float: left;
+    box-sizing: border-box;
 	.club-main-empty{
 		width: 100%;
 		height: 100%;
@@ -273,12 +277,14 @@ page,
 	}
 	.list {
 		width: 100%;
-		height: 200rpx;
-		padding: 24rpx;
+		height: auto;
+		padding: 20rpx;
 		box-sizing: border-box;
 		background: #ffffff;
-		position: relative;
-		border-bottom: 1px solid #ebebeb;
+		position: relative;
+        border-radius: 8rpx;
+        margin-bottom: 20rpx;
+        float: left;
 		.list-cell-top {
 			width: 100%;
 			height: 140rpx;
@@ -329,8 +335,8 @@ page,
 				}
 			}
 			.list-content {
-				width: 560rpx;
-				height: 150rpx;
+				width: 530rpx;
+				height: auto;
 				float: left;
 				padding-left: 20rpx;
 				box-sizing: border-box;
@@ -366,27 +372,27 @@ page,
 					}
 				}
 				.list-tags {
-					width: 100%;
-					height: 36rpx;
-					float: left;
-					line-height: 36rpx;
-					margin: 7rpx 0;
-					.tags {
-						display: inline-block;
-						height: 36rpx;
-						box-sizing: border-box;
-						padding: 0 8rpx 0 15rpx;
-						border-radius: 8rpx;
-						background: #faede5;
-						font-size: $font-size-22;
-						color: $color-system;
-						text-align: center;
-						line-height: 36rpx;
-						margin-right: 16rpx;
-						.icon-xiayibu {
-							font-size: 20rpx;
-							margin-left: 10rpx;
-						}
+					width: 100%;
+					height: auto;
+					float: left;
+					line-height: 36rpx;
+					margin: 7rpx 0;
+					.tags {
+						display: inline-block;
+						height: 36rpx;
+						box-sizing: border-box;
+						padding: 0 8rpx 0 15rpx;
+						border-radius: 8rpx;
+						background: rgba(0, 0, 0, 0.1);
+						font-size: 20rpx;
+						color: #666666;
+						text-align: center;
+						line-height: 36rpx;
+						margin-right: 16rpx;
+						.icon-xiayibu {
+							font-size: 20rpx;
+							margin-left: 10rpx;
+						}
 					}
 				}
 				.list-ntel {

+ 56 - 50
pages/seller/club/club-consult-details.vue

@@ -13,7 +13,7 @@
 				></image>
 				<view class="txt">暂无机构数据</view>
 			</view>
-			<view v-else class="club-list">
+			<view v-else class="club-list clearfix">
 				<scroll-view scroll-y="true">
 					<view class="list" v-for="(club, index) in clubList" :key="index">
 						<view class="list-cell-top">
@@ -26,7 +26,7 @@
 									"
 									mode=""
 								></image>
-								<text class="list-id">编号:{{ club.newClubId }}</text>
+								<!-- <text class="list-id">编号:{{ club.newClubId }}</text> -->
 								<text class="list-tips">{{ club.userIdentity === 2 ? '资质机构' : '个人机构' }}</text>
 							</view>
 							<view class="list-content">
@@ -35,7 +35,19 @@
 									<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>
-								</view>
+								</view>
+                                <view class="list-ntel" v-if="tabSmallCurrentIndex === 1">
+                                	<text class="list-link">销售:{{ club.serviceName ? club.serviceName : '' }}</text>
+                                </view>
+                                <view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
+                                	<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
+                                	<text class="list-texl" @click="handlePhone(club.contractMobile)">
+                                		{{ club.contractMobile ? club.contractMobile : '' }}
+                                	</text>
+                                </view>
+                                <view class="list-ntel" v-if="club.providerTime">
+                                	<text class="list-link">最近填写时间:{{ club.providerTime | dateConversion }}</text>
+                                </view>
 								<view class="list-tags">
 									<text
 										class="tags"
@@ -54,18 +66,6 @@
 										{{ club.customerValue }} <text class="iconfont icon-xiayibu"></text>
 									</text>
 								</view>
-								<view class="list-ntel" v-if="tabSmallCurrentIndex === 1">
-									<text class="list-link">销售:{{ club.serviceName ? club.serviceName : '' }}</text>
-								</view>
-								<view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
-									<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
-									<text class="list-texl" @click="handlePhone(club.contractMobile)">
-										{{ club.contractMobile ? club.contractMobile : '' }}
-									</text>
-								</view>
-								<view class="list-ntel">
-									<text class="list-link">最近填写时间:{{ club.providerTime | dateConversion }}</text>
-								</view>
 							</view>
 						</view>
 					</view>
@@ -212,19 +212,20 @@ page,
 }
 .club-tabs{
 	width: 100%;
-	height: 90rpx;
+	height: 70rpx;
 	position: fixed;
 	top: 0;
 	left: 0;
 	box-sizing: border-box;
-	padding: 20rpx 0;
-	background-color: #ffffff;
+	padding: 10rpx 0;
+	background-color: #ffffff;
+    z-index: 9999;
 	.btn {
 		width: 50%;
 		line-height: 50rpx;
 		box-sizing: border-box;
 		text-align: center;
-		font-size: $font-size-34;
+		font-size: $font-size-30;
 		float: left;
 		color: #333333;
 		position: relative;
@@ -234,7 +235,7 @@ page,
 			height: 4rpx;
 			background-color: #ffffff;
 			position: absolute;
-			bottom: -20rpx;
+			bottom: -10rpx;
 			left: 50%;
 			margin-left: -50rpx;
 		}
@@ -252,8 +253,10 @@ page,
 .club-main {
 	width: 100%;
 	height: 100%;
-	padding-top: 114rpx;
-	float: left;
+	padding: 20rpx;
+	padding-top: 94rpx;
+	float: left;
+	box-sizing: border-box;
 	.club-main-empty{
 		width: 100%;
 		height: 100%;
@@ -274,12 +277,14 @@ page,
 	}
 	.list {
 		width: 100%;
-		height: 240rpx;
-		padding: 24rpx;
+		height: auto;
+		padding: 20rpx;
 		box-sizing: border-box;
 		background: #ffffff;
-		position: relative;
-		border-bottom: 1px solid #ebebeb;
+		position: relative;
+        border-radius: 8rpx;
+        margin-bottom: 20rpx;
+        float: left;
 		.list-cell-top {
 			width: 100%;
 			height: 140rpx;
@@ -330,8 +335,8 @@ page,
 				}
 			}
 			.list-content {
-				width: 560rpx;
-				height: 150rpx;
+				width: 520rpx;
+				height: auto;
 				float: left;
 				padding-left: 20rpx;
 				box-sizing: border-box;
@@ -367,27 +372,27 @@ page,
 					}
 				}
 				.list-tags {
-					width: 100%;
-					height: 36rpx;
-					float: left;
-					line-height: 36rpx;
-					margin: 7rpx 0;
-					.tags {
-						display: inline-block;
-						height: 36rpx;
-						box-sizing: border-box;
-						padding: 0 8rpx 0 15rpx;
-						border-radius: 8rpx;
-						background: #faede5;
-						font-size: $font-size-22;
-						color: $color-system;
-						text-align: center;
-						line-height: 36rpx;
-						margin-right: 16rpx;
-						.icon-xiayibu {
-							font-size: 20rpx;
-							margin-left: 10rpx;
-						}
+					width: 100%;
+					height: auto;
+					float: left;
+					line-height: 36rpx;
+					margin: 7rpx 0;
+					.tags {
+						display: inline-block;
+						height: 36rpx;
+						box-sizing: border-box;
+						padding: 0 8rpx 0 15rpx;
+						border-radius: 8rpx;
+						background: rgba(0, 0, 0, 0.1);
+						font-size: 20rpx;
+						color: #666666;
+						text-align: center;
+						line-height: 36rpx;
+						margin-right: 16rpx;
+						.icon-xiayibu {
+							font-size: 20rpx;
+							margin-left: 10rpx;
+						}
 					}
 				}
 				.list-ntel {
@@ -401,7 +406,8 @@ page,
 					.list-link {
 						display: inline-block;
 						float: left;
-						margin-right: 12rpx;
+						margin-right: 12rpx;
+                        color: #999999;
 					}
 					.list-texl {
 						display: inline-block;

+ 39 - 39
pages/seller/club/club-list.vue

@@ -24,11 +24,12 @@
                             <view class="club-list-top">
                                 <view class="list-left">
                                     <view class="list-head">
-                                        <image :src="
-            											club.headpic
-            												? club.headpic
-            												: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
-            										" mode=""></image>
+                                        <image :src="club.shopPhoto ? 
+                                                     club.shopPhoto : 
+                                                     'https://static.caimei365.com/app/img/icon/default-head-new.png'" 
+                                                     mode=""
+                                        >
+                                        </image>
                                     </view>
                                 </view>
                                 <view class="list-item">
@@ -42,20 +43,14 @@
                                         <text class="list-hist" @click.stop="handleClickOper(5, club)"><text
                                                 class="iconfont icon-dingdanliebiao"></text>订单列表</text>
                                     </view>
-                                    <view class="list-opea">
-                                        <text class="tags sm" @click.stop="
-            											this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
-            										">{{ club.activeState }} <text class="iconfont icon-xiayibu"></text></text>
-                                        <text class="tags sm" @click.stop="
-            											this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
-            										">{{ club.customerValue }} <text class="iconfont icon-xiayibu"></text></text>
-                                    </view>
                                 </view>
                             </view>
                             <view class="club-list-bot">
-                                <view class="btn" @click.stop="handleClickOper(1, club)"> <text
-                                        class="iconfont icon-lijixiadan"></text> 立即下单</view>
-                                <!-- 							<view class="btn" @click.stop="handleClickOper(3, club)"> <text class="iconfont icon-zaicigoumai1"></text> 再次购买</view>
+                                <view class="btn buy" @click.stop="handleClickOper(1, club)"> 
+                                    <!-- <text class="iconfont icon-lijixiadan"></text> -->
+                                    立即下单
+                                </view>
+                                <!--   <view class="btn" @click.stop="handleClickOper(3, club)"> <text class="iconfont icon-zaicigoumai1"></text> 再次购买</view>
             							<view class="btn" @click.stop="handleClickOper(6, club)"> <text class="iconfont icon-youhuiquan"></text> 购买优惠券</view>
             							<view class="btn" @click.stop="handleShowBubble(club,index)"> 
             								<text class="iconfont icon-gengduo2"></text> 
@@ -316,7 +311,7 @@
                     align-items: center;
                     width: 100%;
                     height: auto;
-                    padding: 20rpx;
+                    padding: 18rpx 20rpx;
                     background: #ffffff;
                     position: relative;
                     float: left;
@@ -325,38 +320,38 @@
                     border-radius: 24rpx;
                     .club-list-top {
                         width: 100%;
-                        height: 140rpx;
+                        height: 100rpx;
                         float: left;
                         display: flex;
                         align-items: center;
                 
                         .list-left {
-                            height: 140rpx;
-                            flex: 2;
-                            margin-right: 10rpx;
+                            height: 100rpx;
+                            flex: 1;
+                            margin-right: 15rpx;
                 
                             .list-head {
-                                width: 140rpx;
-                                height: 140rpx;
+                                width: 100rpx;
+                                height: 100rpx;
                                 border-radius: 50%;
                 
                                 image {
-                                    width: 140rpx;
-                                    height: 140rpx;
+                                    width: 100rpx;
+                                    height: 100rpx;
                                     border-radius: 50%;
                                 }
                             }
                         }
                 
                         .list-item {
-                            height: 140rpx;
+                            height: 100rpx;
                             flex: 8;
                             display: flex;
                             flex-direction: column;
                 
                             .list-title {
                                 flex: 2;
-                                line-height: 80rpx;
+                                line-height: 100rpx;
                                 width: 100%;
                                 font-size: $font-size-28;
                                 color: $text-color;
@@ -400,14 +395,14 @@
                                 .list-hist {
                                     display: block;
                                     float: right;
-                                    color: #1890F9;
+                                    color: #999999;
                                     font-size: $font-size-24;
                                     text-align: right;
                                     padding-right: 30rpx;
                 
-                                    .icon-dingdanxuanzhong {
-                                        font-size: $font-size-34;
-                                        color: #1890F9;
+                                    .icon-dingdanliebiao {
+                                        font-size: $font-size-30;
+                                        color: #999999;
                                     }
                                 }
                             }
@@ -463,24 +458,29 @@
                 
                     .club-list-bot {
                         width: 100%;
-                        height: 80rpx;
+                        height: 60rpx;
                         float: left;
                         border-radius: 8rpx;
-                        margin-top: 20rpx;
                 
                         .btn {
-                            height: 80rpx;
+                            height: 60rpx;
                             box-sizing: border-box;
-                            line-height: 80rpx;
-                            padding: 0 28rpx;
+                            line-height: 60rpx;
+                            padding: 0 30rpx;
                             font-size: $font-size-24;
-                            background-color: #F1F1F1;
+                            background: #F1F1F1;
                             color: #333333; 
                             text-align: center;
                             float: right;
                             position: relative;
                             border-radius: 40rpx;
-                          
+                            &.buy{
+                                background:$btn-confirm;
+                                color: #FFFFFF;
+                                .iconfont {
+                                    color: #FFFFFF;
+                                }
+                            }
                             &:nth-child(2) {
                                 &:before {
                                     content: '';
@@ -506,7 +506,7 @@
                             }
                 
                             &:last-child {
-                                padding: 0 36rpx;
+                                // padding: 0 36rpx;
                 
                                 .iconfont {
                                     font-weight: bold;

+ 59 - 54
pages/seller/club/list.vue

@@ -68,20 +68,13 @@
             		></image>
             		<view class="txt">暂无机构数据</view>
             	</view>
-            	<view v-else class="club-list">
+            	<view v-else class="club-list clearfix">
             		<scroll-view scroll-y="true">
             			<view class="list" v-for="(club, index) in clubList" :key="index">
             				<view class="list-cell-top">
             					<view class="list-logo">
-            						<image
-            							:src="
-            								club.headpic
-            									? club.headpicx
-            									: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
-            							"
-            							mode=""
-            						></image>
-            						<text class="list-id">编号:{{ club.newClubId }}</text>
+            						<image src="https://static.caimei365.com/app/img/icon/icon-club@3x.png" mode=""></image>
+            						<!-- <text class="list-id">编号:{{ club.newClubId }}</text> -->
             						<text class="list-tips">{{ club.userIdentity === 2 ? '资质机构' : '个人机构' }}</text>
             					</view>
             					<view class="list-content">
@@ -91,6 +84,18 @@
             							<text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
             							<text class="tags xf" v-if="club.newDeal === 1">新分配</text>
             						</view>
+                                    <view class="list-ntel" v-if="tabSmallCurrentIndex === 1">
+                                    	<text class="list-link">销售:{{ club.serviceName ? club.serviceName : '' }}</text>
+                                    </view>
+                                    <view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
+                                    	<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
+                                    	<text class="list-texl" @click="handlePhone(club.contractMobile)">
+                                    		{{ club.contractMobile ? club.contractMobile : '' }}
+                                    	</text>
+                                    </view>
+                                    <view class="list-ntel" v-if="listQuery.type === 6">
+                                    	<text class="list-link">分配时间:{{ club.providerTime | dateConversion }}</text>
+                                    </view>
             						<view class="list-tags">
             							<text
             								class="tags"
@@ -109,27 +114,13 @@
             								{{ club.customerValue }} <text class="iconfont icon-xiayibu"></text>
             							</text>
             							<text class="tags-or" @click.stop="handleOrderHistory(club)">
-            								<text class="iconfont icon-dingdan"></text> 订单列表
-            								<text
-            									v-if="club.orderNum > 0"
-            									class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num"
-            								>
+            								订单列表
+            								<text v-if="club.orderNum > 0" class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num">
             									{{ showBadge(club.orderNum) }}
             								</text>
+                                            <text class="iconfont icon-dingdan"></text> 
             							</text>
             						</view>
-            						<view class="list-ntel" v-if="tabSmallCurrentIndex === 1">
-            							<text class="list-link">销售:{{ club.serviceName ? club.serviceName : '' }}</text>
-            						</view>
-            						<view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
-            							<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
-            							<text class="list-texl" @click="handlePhone(club.contractMobile)">
-            								{{ club.contractMobile ? club.contractMobile : '' }}
-            							</text>
-            						</view>
-            						<view class="list-ntel" v-if="listQuery.type === 6">
-            							<text class="list-link">分配时间:{{ club.providerTime | dateConversion }}</text>
-            						</view>
             					</view>
             				</view>
             				<view class="club-list-bot">
@@ -704,38 +695,49 @@ page,
 		background: #ffffff;
 		box-sizing: border-box;
 		padding: 20rpx 24rpx;
-		.tab-item {
-			width: 168rpx;
-			height: 64rpx;
-			line-height: 64rpx;
+		.tab-item {
+            padding: 0 20rpx;
+			height: 58rpx;
+			line-height: 58rpx;
 			text-align: center;
 			color: $text-color;
 			font-size: $font-size-28;
 			float: left;
-			border-radius: 32rpx;
+			border-radius: 8rpx;
 			border: 1px solid #b2b2b2;
-			margin-right: 32rpx;
+			margin-right: 20rpx;
 			&.current {
-				color: #ff5b00;
-				border: 1px solid #ff5b00;
+				color: #ffffff;
+				border: 1px solid #ff5b00;
+                background: #ff5b00;
 			}
 		}
 	}
 }
 .club-main {
 	width: 100%;
-	padding-top: 370rpx;
+	padding-top: 370rpx;
+    background: #F7F7F7;
+    .club-list{
+        width: 100%;
+        height: auto;
+        box-sizing: border-box;
+        padding: 0 15rpx;
+    }
 	.list {
 		width: 100%;
-		height: 320rpx;
-		padding: 24rpx;
+		height: auto;
+		padding: 15rpx;
 		box-sizing: border-box;
 		background: #ffffff;
 		position: relative;
-		border-bottom: 1px solid #ebebeb;
+        float: left;
+        margin-bottom: 15rpx;
+        border-radius: 8rpx;
+        overflow: hidden;
 		.list-cell-top {
 			width: 100%;
-			height: 140rpx;
+			height: auto;
 			box-sizing: border-box;
 			.list-logo {
 				width: 140rpx;
@@ -783,8 +785,8 @@ page,
 				}
 			}
 			.list-content {
-				width: 560rpx;
-				height: 180rpx;
+				width: 520rpx;
+				height: auto;
 				float: left;
 				padding-left: 20rpx;
 				box-sizing: border-box;
@@ -821,7 +823,7 @@ page,
 				}
 				.list-tags {
 					width: 100%;
-					height: 36rpx;
+					height: auto;
 					float: left;
 					line-height: 36rpx;
 					margin: 7rpx 0;
@@ -831,9 +833,9 @@ page,
 						box-sizing: border-box;
 						padding: 0 8rpx 0 15rpx;
 						border-radius: 8rpx;
-						background: #faede5;
-						font-size: $font-size-22;
-						color: $color-system;
+						background: rgba(0, 0, 0, 0.1);
+						font-size: 20rpx;
+						color: #666666;
 						text-align: center;
 						line-height: 36rpx;
 						margin-right: 16rpx;
@@ -846,19 +848,22 @@ page,
 						display: inline-block;
 						height: 36rpx;
 						box-sizing: border-box;
-						font-size: $font-size-22;
-						color: #1890f9;
+						font-size: 20rpx;
+						color: #666666;
 						text-align: center;
 						line-height: 36rpx;
-						position: relative;
+						position: relative;
+                        padding: 0 8rpx 0 15rpx;
+                        border-radius: 8rpx;
+                        background: rgba(0, 0, 0, 0.1);
 						.opea-badge {
 							position: absolute;
-							right: -30rpx;
+							right: -10rpx;
 							top: -15rpx;
 						}
-						.icon-xiayibu {
+						.icon-dingdan {
 							font-size: 22rpx;
-							color: #1890f9;
+							color: #999999;
 						}
 					}
 				}
@@ -935,7 +940,7 @@ page,
 					}
 				}
 				&:last-child {
-					padding: 0 28rpx;
+					padding: 0 24rpx;
 					.iconfont {
 						font-weight: bold;
 					}
@@ -945,7 +950,7 @@ page,
 						background: rgba(51, 51, 51, 0.8);
 						position: absolute;
 						top: -120rpx;
-						right: 0;
+						right: -7rpx;
 						border-radius: 8rpx;
 						&:before {
 							content: '';

+ 10 - 9
pages/seller/index/index.vue

@@ -5,9 +5,9 @@
 			<seller-home ref="home" v-if="isHomeData" />
 		</view>
 		<!-- 商品分类 -->
-		<view class="content-main" :style="{ display: show_index == 1 ? 'block' : 'none' }">
+<!-- 		<view class="content-main" :style="{ display: show_index == 1 ? 'block' : 'none' }">
 			<seller-category ref="category" v-if="isCategory" />
-		</view>
+		</view> -->
         <!-- 消息 -->
         <view class="content-main" :style="{ display: show_index == 2 ? 'block' : 'none' }">
         	<seller-message ref="message" v-if="isMessage" />
@@ -59,12 +59,12 @@ export default {
 					icon: 'https://static.caimei365.com/app/img/icon/icon-home@3x.png',
 					iconAc: 'https://static.caimei365.com/app/img/icon/icon-home-active@3x.png'
 				},
-				{
-					id: 1,
-					name: '分类',
-					icon: 'https://static.caimei365.com/app/img/icon/icon-sort@3x.png',
-					iconAc: 'https://static.caimei365.com/app/img/icon/icon-sort-active@3x.png'
-				},
+				// {
+				// 	id: 1,
+				// 	name: '分类',
+				// 	icon: 'https://static.caimei365.com/app/img/icon/icon-sort@3x.png',
+				// 	iconAc: 'https://static.caimei365.com/app/img/icon/icon-sort-active@3x.png'
+				// },
                 {
                 	id: 2,
                 	name: '消息',
@@ -182,7 +182,8 @@ export default {
 	.tabBar_list {
 		width: 86%;
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-between;
+        box-sizing: border-box;
 		image {
 			width: 48rpx;
 			height: 48rpx;

+ 51 - 20
pages/seller/notice/service/service.vue

@@ -6,24 +6,34 @@
             borderRadius="10rpx"
             :isLoading="true"
             :loadingType="5"
-        ></tui-skeleton>
-        <view class="container">
-            <tab-list v-model="params.type" />
-            <view v-for="(cell, index) in messageList" class="info-card" :key="index">
-                <view class="tui-notice clearfix">
-                    <tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
-                        <template v-slot:content>
-                            <notice-cell :cellType="1" :cell="cell" @trampInfo="trampInfo"></notice-cell>
-                        </template>
-                        <template v-slot:button>
-                            <view class="tui-custom-btn_box">
-                                <view class="tui-custom-btn" @click.stop="deleteBtn(cell.id, index)">
-                                    <text class="iconfont icon-shanchu3"></text>
-                                </view>
-                            </view>
-                        </template>
-                    </tui-swipe-action>
-                </view>
+        />
+        <view class="container" v-else>
+            <tab-list v-model="params.type" />
+            <template v-if="messageList.length > 0"> 
+                <view v-for="(cell, index) in messageList" class="info-card" :key="index" >
+                    <view class="tui-notice clearfix">
+                        <tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
+                            <template v-slot:content>
+                                <notice-cell :cellType="1" :cell="cell" @trampInfo="trampInfo"></notice-cell>
+                            </template>
+                            <template v-slot:button>
+                                <view class="tui-custom-btn_box">
+                                    <view class="tui-custom-btn" @click.stop="deleteBtn(cell.id, index)">
+                                        <text class="iconfont icon-shanchu3"></text>
+                                    </view>
+                                </view>
+                            </template>
+                        </tui-swipe-action>
+                    </view>
+                </view>
+            </template>
+            <view class="info-card-none" v-else>
+            	<image
+            		class="none-image"
+            		src="https://static.caimei365.com/app/img/icon/icon-remarks-empty@2x.png"
+            		mode=""
+            	></image>
+            	<view class="none-text">暂无通知~</view>
             </view>
         </view>
     </view>
@@ -40,7 +50,7 @@ export default {
     },
     data() {
         return {
-            skeletonShow: false, // 刷新
+            skeletonShow: true, // 刷新
             params: {
                 messageType: 3,
                 pageNum: 1,
@@ -78,7 +88,10 @@ export default {
             else {
                 this.messageList = [...this.messageList, ...data.list]
             }
-            this.isLastPage = data.isLastPage
+            this.isLastPage = data.isLastPage
+            setTimeout(()=>{
+                this.skeletonShow = false
+            },1000)
         },
         // 删除
         deleteBtn(id, index) {
@@ -135,6 +148,24 @@ export default {
 .info-card {
     margin-bottom: 24rpx;
     box-sizing: border-box;
+}
+.info-card-none{
+    width: 100%;
+    height: 900rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    .none-image {
+    	width: 180rpx;
+    	height: 180rpx;
+    	margin-bottom: 20rpx;
+    }
+    .none-text {
+    	font-size: $font-size-28;
+    	color: #999999;
+    	line-height: 44rpx;
+    }
 }
 page {
     background-color: #f7f7f7;

+ 5 - 5
services/sellse.service.js

@@ -26,7 +26,7 @@ export default class SellerService {
 	 *@param userID 协销ID
 	 */
     GetSellerHome (data = {}) {
-        return this.AjaxService.get({ url:'/user/seller/home', data, isLoading: true })
+        return this.AjaxService.get({ url:'/user/seller/home', data, isLoading: false })
     }
     /**
 	 *@协销拉机构上线(资料填写)
@@ -103,7 +103,7 @@ export default class SellerService {
         return this.AjaxService.get({ 
             url:'/order/seller/count', 
             data, 
-            isLoading: true ,
+            isLoading: false ,
         })
     }
     /**
@@ -413,7 +413,7 @@ export default class SellerService {
         return this.AjaxService.get({
             url:'/user/seller/club/livelyClub', 
             data, 
-            isLoading: true 
+            isLoading: false 
         })
     }
     /**
@@ -463,7 +463,7 @@ export default class SellerService {
         return this.AjaxService.get({
             url:'/user/login/auth/SpMessageList', 
             data, 
-            isLoading: true 
+            isLoading: false 
         })
     }
     /**
@@ -473,7 +473,7 @@ export default class SellerService {
         return this.AjaxService.get({
             url:'/user/login/auth/SpCount', 
             data, 
-            isLoading: true 
+            isLoading: false 
         })
     }
     /**