commit -m 分配

pages.json

@@ -638,7 +638,8 @@
 				{
 					"path": "club/list",
 					"style": {
-						"navigationBarTitleText": "机构列表"
+						"navigationBarTitleText": "机构列表",
+						"navigationStyle": "custom"
 					}
 				},
 				{

pages/seller/club/list.vue

@@ -1,23 +1,51 @@
 <template>
 	<view class="container club clearfix" :style="{ paddingBottom: isIphoneX ? '140rpx' : '98rpx' }">
-		<view class="club-search clearfix">
-			<view class="search-top">
-				<view class="search-from name">
-					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+		<view class="club-search clearfix" :style="{ paddingTop: StatusBar + 'px' }">
+			<view class="search-top" :style="{ height: CustomBar - StatusBar + 'px' }">
+				<view
+					class="search-icon"
+					:style="{
+						width: CustomBar - StatusBar + 'px',
+						height: CustomBar - StatusBar + 'px',
+						lineHeight: CustomBar - StatusBar + 'px;'
+					}"
+				>
+					<text @click="handleNavigateBack" class="iconfont icon-fanhui"></text>
+				</view>
+				<view
+					class="search-from name"
+					:style="{ height: capsule.height + 'px', borderRadius: capsule.height / 2 + 'px' }"
+				>
+					<text
+						:style="{
+							width: capsule.height + 'px',
+							height: capsule.height + 'px',
+							lineHeight: capsule.height + 'px;'
+						}"
+						class="iconfont icon-iconfonticonfontsousuo1"
+					></text>
 					<input
 						class="input"
 						type="text"
 						confirm-type="search"
 						v-model="searchInputVal"
 						@input="onShowClose"
-						@confirm="initclubList()"
+						@confirm="GetSellerClubList()"
 						placeholder="机构名称/联系人"
 						maxlength="16"
+						:style="{ lineHeight: capsule.height + 'px' }"
 					/>
 					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 				</view>
-				<view class="search-btn">
-					<button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
+				<view
+					class="search-btn"
+					:style="{
+						width: CustomBar - StatusBar + 'px',
+						height: capsule.height + 'px',
+						lineHeight: capsule.height + 'px;'
+					}"
+				>
+					<text class="iconfont icon-shaixuan"></text>
 				</view>
 			</view>
 			<view class="search-tab">
@@ -31,6 +59,17 @@
 					<text class="item-text">{{ item.name }}<text class="line"></text></text>
 				</view>
 			</view>
+			<view class="search-smalltab">
+				<view
+					class="tab-item"
+					v-for="(item, index) in listItemTab"
+					:key="index"
+					:class="{ current: tabSmallCurrentIndex === index }"
+					@click="tabSmallCurrentClick(index)"
+				>
+					<text class="item-text">{{ item.name }}</text>
+				</view>
+			</view>
 		</view>
 		<view class="club-main">
 			<view v-if="isEmpty" class="empty-container">
@@ -44,41 +83,47 @@
 			<view v-else class="club-list">
 				<scroll-view scroll-y="true">
 					<view class="list" v-for="(club, index) in clubList" :key="index">
-						<view class="list-logo">
-							<image
-								:src="
-									club.headpic
-										? club.headpic
-										: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
-								"
-								mode=""
-							></image>
-						</view>
-						<view class="list-content">
-							<view class="list-name">
-								{{ club.userIdentity === 2 ? club.name : club.linkMan }}
-								<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 class="list-cell-top">
+							<view class="list-logo">
+								<image
+									:src="
+										club.headpic
+											? club.headpic
+											: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
+									"
+									mode=""
+								></image>
 							</view>
-							<view class="list-ntel">
-								<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
-								<text class="list-texl">{{ club.contractMobile ? club.contractMobile : '' }}</text>
-							</view>
-							<view class="list-opera">
-								<button class="btn org" @click.stop="checkData(club)">修改资料</button>
-								<view class="btn gre" @click.stop="orderHistory(club)">
-									历史订单
-									<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>
+							<view class="list-content">
+								<view class="list-name">
+									{{ club.userIdentity === 2 ? club.name : club.linkMan }}
+									<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 class="list-ntel">
+									<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
+									<text class="list-texl">{{ club.contractMobile ? club.contractMobile : '' }}</text>
 								</view>
-								<view class="btn org" @click.stop="handleClubinfo(club)" v-if="club.recordCount === 1">注册行为记录</view>
+								
 							</view>
 						</view>
+						<view class="list-cell-btn">
+							<view class="btn" @click.stop="checkData(club)">修改资料</view>
+							<view class="btn" @click.stop="orderHistory(club)">
+								历史订单
+								<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>
+							</view>
+							<view class="btn" @click.stop="checkData(club)">更换协销</view>
+							<view class="btn" @click.stop="handleClubinfo(club)" v-if="club.recordCount === 1"
+								>注册行为记录</view
+							>
+						</view>
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
@@ -119,6 +164,7 @@ export default {
 	data() {
 		return {
 			listTab: [{ name: '个人机构' }, { name: '资质机构' }],
+			listItemTab: [{ name: '我的机构' }, { name: '组员机构' }, { name: '待分配机构' }],
 			serviceProviderId: '',
 			shareClubUseId: 0,
 			shareIdentity: 0,
@@ -142,9 +188,13 @@ export default {
 			prevPage: '', //上一个页面
 			tabCurrentNum: 0,
 			tabCurrentIndex: 0,
+			tabSmallCurrentIndex:0,
 			listStatus: 90,
 			clubList: [],
 			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar,
+			StatusBar: this.StatusBar,
+			capsule: this.capsule,
 			show_index: 0 //控制显示那个组件
 		}
 	},
@@ -166,11 +216,7 @@ export default {
 				})
 			}, 500)
 		},
-		searchClubList() {
-			this.pageNum = 1
-			this.initclubList()
-		},
-		initclubList() {
+		GetSellerClubList() {
 			this.SellerService.GetSellerClubList({
 				userIdentity: this.userIdentity,
 				name: this.searchInputVal,
@@ -252,7 +298,7 @@ export default {
 					this.listStatus = 92
 					break
 			}
-			this.initclubList()
+			this.GetSellerClubList()
 		},
 		tabCurrentClick(index) {
 			//商品详情&&供应商信息tab切换
@@ -262,17 +308,21 @@ export default {
 					this.tabCurrentIndex = 0
 					this.userIdentity = 4
 					this.listStatus = 90
-                    this.pageNum = 1
-					this.initclubList()
+					this.pageNum = 1
+					this.GetSellerClubList()
 					break
 				case 1:
-                    this.pageNum = 1
+					this.pageNum = 1
 					this.userIdentity = 2
 					this.listStatus = 90
-					this.initclubList()
+					this.GetSellerClubList()
 					break
 			}
 		},
+		tabSmallCurrentClick(index){
+			//商品详情&&供应商信息tab切换
+			this.tabSmallCurrentIndex = index
+		},
 		checkData(club) {
 			//修改机构资料
 			switch (this.tabCurrentNum) {
@@ -289,7 +339,7 @@ export default {
 			this.$api.setStorage('orderUserInfo', club)
 			this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${club.clubId}&listType=0`)
 		},
-		handleClubinfo(club){
+		handleClubinfo(club) {
 			//跳转机构信息
 			this.$api.navigateTo(`/pages/seller/club/club-info?clubId=${club.clubId}`)
 		},
@@ -314,6 +364,9 @@ export default {
 				num = n
 			}
 			return num
+		},
+		handleNavigateBack() {
+			this.$api.navigateBack(1)
 		}
 	},
 	onReachBottom() {
@@ -327,7 +380,7 @@ export default {
 		this.$api.getStorage().then(response => {
 			this.serviceProviderId = response.serviceProviderId
 			this.pageNum = 1
-			this.initclubList()
+			this.GetSellerClubList()
 		})
 	}
 }
@@ -348,7 +401,6 @@ page,
 .club-search {
 	height: auto;
 	width: 100%;
-	padding: 24rpx 0 0 0;
 	background: #ffffff;
 	display: flex;
 	flex-direction: column;
@@ -360,26 +412,28 @@ page,
 		flex: 1;
 		display: flex;
 		align-items: center;
-		padding: 24rpx;
+		box-sizing: border-box;
+		.search-icon {
+			text-align: center;
+			float: left;
+			.icon-fanhui {
+				font-size: 44rpx;
+				color: #333333;
+			}
+		}
 		.search-from {
-			width: 582rpx;
-			height: 64rpx;
+			width: 382rpx;
 			background: #f7f7f7;
-			border-radius: 32rpx;
 			float: left;
 			position: relative;
 			.input {
-				width: 500rpx;
-				height: 64rpx;
+				width: 300rpx;
+				height: 100%;
 				float: left;
-				line-height: 64rpx;
 				color: $text-color;
 				font-size: $font-size-24;
 			}
 			.icon-iconfonticonfontsousuo1 {
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
 				text-align: center;
 				display: block;
 				font-size: $font-size-38;
@@ -400,13 +454,15 @@ page,
 			}
 		}
 		.search-btn {
-			width: 120rpx;
-			line-height: 64rpx;
 			text-align: center;
 			font-size: $font-size-28;
 			color: $color-system;
 			float: left;
 			background: #ffffff;
+			.icon-shaixuan {
+				font-size: 44rpx;
+				color: #333333;
+			}
 		}
 	}
 	.search-tab {
@@ -443,118 +499,134 @@ page,
 			}
 		}
 	}
+	.search-smalltab{
+		width: 100%;
+		height: 104rpx;
+		background: #ffffff;
+		box-sizing: border-box;
+		padding:20rpx 10rpx;
+		.tab-item {
+			width: 180rpx;
+			height: 64rpx;
+			line-height: 64rpx;
+			text-align: center;
+			color: $text-color;
+			font-size: $font-size-28;
+			float: left;
+			&.current {
+				background-color: $color-system;
+				color: #fff;
+				border-radius: 32rpx;
+			}
+		}
+	}
 }
 .club-main {
-	padding-top: 224rpx;
+	padding-top: 374rpx;
 	.list {
 		width: 100%;
-		height: 228rpx;
+		height: 268rpx;
 		padding: 24rpx;
 		box-sizing: border-box;
 		background: #ffffff;
 		position: relative;
 		border-bottom: 1px solid #ebebeb;
-		.list-logo {
-			width: 180rpx;
-			height: 180rpx;
-			float: left;
-			image {
-				width: 180rpx;
-				height: 180rpx;
-				border-radius: 8rpx;
-			}
-		}
-		.list-content {
-			width: 498rpx;
-			height: 180rpx;
-			float: right;
-			.list-name {
-				width: 100%;
-				height: 50rpx;
+		.list-cell-top{
+			width: 100%;
+			height: 140rpx;
+			box-sizing: border-box;
+			.list-logo {
+				width: 140rpx;
+				height: 140rpx;
 				float: left;
-				line-height: 50rpx;
-				text-align: left;
-				font-size: $font-size-26;
-				color: #333333;
-				.tags {
-					display: inline-block;
-					height: 36rpx;
-					box-sizing: border-box;
-					padding: 0 15rpx;
+				image {
+					width: 140rpx;
+					height: 140rpx;
 					border-radius: 8rpx;
-					background: #f0cb72;
-					font-size: $font-size-22;
-					color: #4e4539;
-					text-align: center;
-					line-height: 36rpx;
-					margin-left: 20rpx;
-					margin-top: 7rpx;
-					&.sv {
-						background: #333333;
-						color: #f0cb72;
-					}
-					&.xf {
-						background-color: #F94B4B;
-						color: #ffffff;
-					}
 				}
 			}
-			.list-ntel {
-				width: 100%;
-				height: 50rpx;
+			.list-content {
+				width: 498rpx;
+				height: 140rpx;
 				float: left;
-				line-height: 50rpx;
-				text-align: left;
-				font-size: $font-size-24;
-				color: #666666;
-				.list-link {
-					display: inline-block;
+				padding-left: 30rpx;
+				.list-name {
+					width: 100%;
+					height: 50rpx;
 					float: left;
-					margin-right: 40rpx;
+					line-height: 50rpx;
+					text-align: left;
+					font-size: $font-size-26;
+					color: #333333;
+					.tags {
+						display: inline-block;
+						height: 36rpx;
+						box-sizing: border-box;
+						padding: 0 15rpx;
+						border-radius: 8rpx;
+						background: #f0cb72;
+						font-size: $font-size-22;
+						color: #4e4539;
+						text-align: center;
+						line-height: 36rpx;
+						margin-left: 20rpx;
+						margin-top: 7rpx;
+						&.sv {
+							background: #333333;
+							color: #f0cb72;
+						}
+						&.xf {
+							background-color: #f94b4b;
+							color: #ffffff;
+						}
+					}
 				}
-				.list-texl {
-					display: inline-block;
+				.list-ntel {
+					width: 100%;
+					height: 50rpx;
 					float: left;
-				}
-			}
-			.list-opera {
-				width: 100%;
-				height: 60rpx;
-				display: flex;
-				color: #166ce1;
-				flex-direction: row;
-				align-items: center;
-				float: left;
-				margin-top: 20rpx;
-				.btn {
-					height: 60rpx;
-					box-sizing: border-box;
-					padding: 0 15rpx;
-					line-height: 60rpx;
-					border-radius: 30rpx;
+					line-height: 50rpx;
+					text-align: left;
 					font-size: $font-size-24;
-					color: $text-color;
-					text-align: center;
-					margin: 0 20rpx 0 0;
-					position: relative;
-					.opea-badge {
-						position: absolute;
-						right: -10rpx;
-						top: -20rpx;
-					}
-					&.org {
-						border: 1px solid #2769d5;
-						color: #2769d5;
+					color: #666666;
+					.list-link {
+						display: inline-block;
+						float: left;
+						margin-right: 40rpx;
 					}
-					&.gre {
-						border: 1px solid #e15616;
-						color: #e15616;
-					}
-					&.doc {
-						border: 1px solid #627386;
-						color: #627386;
+					.list-texl {
+						display: inline-block;
+						float: left;
 					}
 				}
+			}	
+		}
+		.list-cell-btn{
+			width: 100%;
+			height: 60rpx;
+			display: flex;
+			color: #166ce1;
+			flex-direction: row;
+			align-items: center;
+			float: left;
+			margin-top: 20rpx;
+			.btn {
+				height: 60rpx;
+				box-sizing: border-box;
+				padding: 0 20rpx;
+				line-height: 60rpx;
+				border-radius: 30rpx;
+				font-size: $font-size-24;
+				color: $text-color;
+				text-align: center;
+				margin: 0 20rpx 0 0;
+				position: relative;
+				border: 1px solid #999999;
+				.opea-badge {
+					position: absolute;
+					right: -10rpx;
+					top: -20rpx;
+				}
 			}
 		}
 	}
@@ -568,7 +640,7 @@ page,
 	bottom: 0px;
 	left: 0px;
 	right: 0px;
-    z-index: 99;
+	z-index: 99;
 	display: flex;
 	align-items: center;
 	justify-content: center;