123

pages/index/directory.vue

@@ -1,7 +1,10 @@
 <template>
-	<view style="background-color: #EBF4F7;letter-spacing: 1rpx;min-height: 100vh">
+	<view style="background-color: #EBF4F7;letter-spacing: 1rpx;" @touchmove="preventTouchMove">
 		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
 			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<!-- <view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view> -->
 				<view class="tn-margin-top"
 					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
 
@@ -11,48 +14,65 @@
 			</view>
 		</tn-nav-bar>
 		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-			<view class="tn-flex tn-flex-center tn-flex-col-center" @click="openMode" style="padding: 30rpx;">
+			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin">
-				<view>
-					<text v-if="tabbarIndex == 0" style="font-size: 34rpx;font-weight: 600;">所属行业</text>
-					<text v-if="tabbarIndex == 1" style="font-size: 34rpx;font-weight: 600;">所属区域</text>
-					<text v-if="tabbarIndex == 2" style="font-size: 34rpx;font-weight: 600;">组织架构</text>
-					<text class="tn-icon-down-triangle" style="margin-left: 10rpx;"></text>
-				</view>
-				<view style="margin-left: 10rpx;">
-					<view v-if="!isSerach">{{ tabRightInfo.name }}</view>
-					<view v-if="isSerach">全部</view>
-				</view>
-			</view>
-			<view class="tn-flex tn-flex-row-between tn-flex-col-center" style="padding: 20rpx;">
 				<view class="justify-content-item align-content-item" style="width: 100%;">
 					<view class="tn-flex tn-flex-col-center"
-						style="border-radius: 100rpx;padding: 10rpx 20rpx 10rpx 20rpx;width: 98%;background-color: #ffffff;">
+						style="border-radius: 100rpx;padding: 10rpx 20rpx 10rpx 20rpx;width: 95%;background-color: #ffffff;">
 						<text
 							class="tn-icon-search justify-content-item tn-padding-right-xs tn-color-gray tn-text-lg"></text>
-						<input v-model="serach_content" class="justify-content-item" placeholder="输入想要搜索的内容"
+						<input v-model="serach_content" class="justify-content-item" placeholder="会员姓名/手机号" name="input"
-							name="input" placeholder-style="color:#AAAAAA" style="width: 90%;"></input>
+							placeholder-style="color:#AAAAAA" style="width: 90%;"></input>
 					</view>
 				</view>
 				<view class="align-content-item">
 					<view class="justify-content-item tn-text-center">
-						<tn-button @click="serach_do" backgroundColor="#ffffff" shape="round" padding="20rpx 20rpx"
+						<tn-button @click="serach_do" backgroundColor="#3668fc" shape="round" padding="20rpx 20rpx"
-							width="120rpx">
+							width="150rpx">
-							<text class="tn-color-black">搜索</text>
+							<text class="tn-color-white">搜 索</text>
 						</tn-button>
+
 					</view>
 				</view>
 			</view>
-			<template v-for="(item,index) in list">
+			<!-- <view class="tn-flex tn-flex-col-center tn-flex-row-between" @click="selectShow= true"
-				<view v-if="item.neirong">
+				style="padding: 30rpx;">
-					<view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-center"
+				<view>
-						style="margin-top: 20rpx;">
+					<text>{{HomeTitle}}</text>
-						<view style="background: #d9d9d980;height: 3rpx;width: 35%;"></view>
+					<text class="tn-icon-down-triangle"></text>
-						<view style="margin: 0rpx 30rpx;font-size: 32rpx;">{{ item.position_name }}</view>
-						<view style="background: #d9d9d980;height: 3rpx;width: 35%;"></view>
 				</view>
-					<view v-for="(v,k) in item.neirong" @click="tn('/pages/index/my_card?id='+v.member_id)"
+				<view>
-						style="padding-left: 20rpx;"
+					<text>筛选</text>
+				</view>
+			</view> -->
+		</view>
+		<view class="tn-classify__container">
+			<view class="tn-classify__container__wrap tn-flex tn-flex-nowrap tn-flex-row-around my-page"
+				style="background-color: #EBF4F7;">
+				<!-- 左边容器 -->
+				<view class="tn-classify__left-box left-width">
+					<view v-for="(item, index) in industry_list" :key="index" :id="`tabbar_item_${index}`"
+						style="padding-left: 20rpx;" class="tn-classify__tabbar__item tn-flex tn-flex-col-center"
+						:class="[tabbarItemClass(index)]" @tap.stop="clickClassifyNav(index)">
+						<view class="tn-classify__tabbar__item__title">{{ item.industry_name }}</view>
+					</view>
+				</view>
+
+				<!-- 右边容器 -->
+				<scroll-view class="tn-classify__right-box" @scroll="getScroll" :scroll-top="top" scroll-y
+					style="width: 72%">
+					<block>
+						<view class="tn-classify__content">
+							<!-- 分类内容子栏目 -->
+							<view class="tn-classify__content__sub-classify__content " style="padding-bottom: 120rpx;">
+								<view v-for="(item,index) in list" :key="index">
+									<view v-if="item.neirong"
+										style="font-weight: 300;;background-color: #EBF4F7;color:#4AA2EF;width: 100%;height: 60rpx;line-height: 60rpx;text-align: center;">
+										{{item.position_name}}
+									</view>
+									<view v-if="item.neirong" v-for="(v,k) in item.neirong"
+										@click="tn('/pages/index/my_card?id='+v.member_id)"
 										class="tn-classify__content__sub-classify__content__item tn-flex tn-flex-center  tn-flex-col-center">
+										<!-- 标题，有需要可以显示出来 -->
 										<view style="width: 100rpx;height: 100rpx">
 											<image :src="apiImgUrl+v.photo_image"
 												style="width: 100rpx;height: 100rpx;border-radius:50%;">
@@ -61,90 +81,60 @@
 										<view style="margin-left: 20rpx;">
 											<view style="font-size: 28rpx;">
 												<text>{{v.nikename}}</text>
+												<text style="margin-left: 50rpx;">{{v.nation}}</text>
 											</view>
-							<view class="tn-text-ellipsis-2" style="font-size: 24rpx;margin-top: 10rpx;">
+											<view class="tn-text-ellipsis-2"
-								<text>{{ v.enterprise_name }}</text>
+												style="font-size: 24rpx;margin-top: 10rpx;">
+												<text>{{v.enterprise_name==null?'':v.enterprise_name}}</text>
 											</view>
 										</view>
 									</view>
 								</view>
-			</template>
+								<view v-if="list.length==0" style="text-align: center;padding: 20rpx">
-		</view>
+									暂无
-		<tn-popup v-model="screenMode" mode="bottom" width="100%" height="100%" :customStyle="{position: 'fixed'}">
-			<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
-				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
-					<view class="tn-margin-top"
-						style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
-
-						<tn-tabs :list="[{name:'通讯录'}]" :current="topCurrent" activeColor="#000" :bold="false"
-							:fontSize="36"></tn-tabs>
-					</view>
-				</view>
-			</tn-nav-bar>
-			<view style="background: #EBF4F7;height: 100%;">
-				<view :style="{paddingTop: vuex_custom_bar_height +'px'}"></view>
-				<view class="tn-flex">
-					<view style="width: 400rpx;">
-						<view v-for="(item,index) in tabList" @click="tabbarIndexCur(index)"
-							class="tn-flex  tn-flex-col-center"
-							:style="{'background-color': tabbarIndex==index?'#ffffff':'transparent',padding:'20rpx 0rpx'}">
-							<view :class="tabbarIndex==index?'actBackground':''"
-								style="height: 50rpx;width: 15rpx;border-radius: 0px 10rpx 10rpx 0px;">
-							</view>
-							<view
-								:style="{'margin-left':' 20rpx','color':tabbarIndex==index?'#3f8bf2':'#000000','font-size':'30rpx'}">
-								{{ item }}
 								</view>
 							</view>
 						</view>
-					<view style="background-color: #ffffff;width: 100%;max-height: 1300rpx;overflow: scroll">
+					</block>
-						<template v-for="(item,index) in tabRightList">
+				</scroll-view>
-							<view class="tn-flex tn-flex-col-center" style="padding:20rpx 0rpx;"
-								@click="tabRightListCur(index)">
-								<view :class="tabRightIndex==index?'actBackground':''"
-									style="height: 50rpx;width: 15rpx;border-radius: 0px 10rpx 10rpx 0px;">
-								</view>
-								<view
-									:style="{'margin-left': '30rpx','color':tabRightIndex==index? '#3f8bf2':'#000000','font-size':'30rpx'}">
-									{{ item.name }}
 			</view>
 		</view>
-							<view v-if="index<tabRightList.length-1"
+		<!--		<view @click="tn('/pages/index/apply_in')" style="line-height: 40rpx;text-align: center;position: fixed;bottom:15%;right: 20rpx;width: 120rpx;height: 120rpx;border-radius: 50%;background: linear-gradient(270deg, #EE7E45, #EE9657);-->
-								style="width: 100%;background: #d9d9d9cc;height: 1rpx;margin-left: 40rpx"></view>
+		<!--box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">-->
-						</template>
+		<!--			<view style="color: #fff;letter-spacing: 2rpx;padding: 20rpx;font-size: 32rpx;">申请入会-->
-					</view>
+		<!--			</view>-->
-				</view>
+		<!--		</view>-->
-				<view class="tn-flex tn-flex-row-around" style="position: fixed;bottom: 100rpx;width: 100%;">
+		<tn-select :safeAreaInsetBottom="true" v-model="selectShow" mode="single" :list="selectList"
-					<tn-button @click="delMode" width="330rpx" height="80rpx" backgroundColor="#ffffff"
+			@confirm="confirm"></tn-select>
-						fontColor="#000000">取消
-					</tn-button>
-					<tn-button @click="serach_do" width="330rpx" height="80rpx" backgroundColor="#3f8bf2"
-						fontColor="#ffffff">筛选
-					</tn-button>
-				</view>
-			</view>
-		</tn-popup>
 	</view>
 </template>
 
 <script>
 	import {
 		addressList,
-		getPosition,
+		associationIndex,
-		newIndustryIndex,
+		newIndustryIndex
-		getRegion
 	} from '@/util/api.js';
 	import store from "@/store";
-
 	export default {
 		data() {
 			return {
-				screenMode: false,
 				serach_content: '',
 				list: [],
-				tabList: ['所属行业', '所属区域', '组织架构'],
 				topCurrent: 0,
 				tabbarIndex: 0,
+				// 分类菜单item的信息
+				tabbarItemInfo: [],
+				// scrollView的top值
+				scrollViewBasicTop: 0,
+				// scrollView的高度
+				scrollViewHeight: 0,
+				// 左边scrollView的滚动高度
+				leftScrollViewTop: 0,
+				// 右边scrollView的滚动高度
+				rightScrollViewTop: 0,
+				// 当前选中的tabbar序号
+				currentTabbarIndex: 0,
 				apiImgUrl: this.$store.state.imgUrl,
 				industry_list: [],
 				leftId: 0,
@@ -153,134 +143,72 @@
 				selectList: [],
 				gid: store.state.Gid,
 				top: 0,
-				tabRightList: '',
-				tabRightIndex: 0,
-				tabRightInfo: {},
-				isSerach: false,
 			}
 		},
-		mounted() {
+		computed: {
-			// console.log(d.id);
+			tabbarItemClass() {
-			// if (typeof(d.id) != 'undefined') {
+				return index => {
-			// 	this.gid = d.id;
+					if (index === this.currentTabbarIndex) {
-			// }
+						return 'tn-classify__tabbar__item--active tn-bg-white'
-			this.loadTabData();
+					} else {
+						let clazz = ''
+						if (this.currentTabbarIndex > 0 && index === this.currentTabbarIndex - 1) {
+							clazz += ' tn-classify__tabbar__item--active--prev'
+						}
+						if (this.currentTabbarIndex < this.industry_list.length && index === this.currentTabbarIndex +
+							1) {
+							clazz += ' tn-classify__tabbar__item--active--next'
+						}
+						return clazz
+					}
+				}
+			}
+		},
+		onLoad(d) {
+			console.log(d.id);
+			if (typeof(d.id) != 'undefined') {
+				this.gid = d.id;
+			}
+			this.getIndustryList();
+			this.getAssociationIndex();
 		},
 		methods: {
-			async loadTabData() {
+			preventTouchMove() {
-				if (this.tabbarIndex === 0) {
+
-					await this.getIndustryList();
-				}
-				if (this.tabbarIndex === 1) {
-					await this.getRegionList();
-				}
-				if (this.tabbarIndex === 2) {
-					await this.getPositionList();
-				}
-				console.log(this.tabRightInfo);
-				this.getAddressList();
-			},
-			openMode() {
-				uni.$emit('showTab', {
-					index: false
-				})
-				this.screenMode = true;
-			},
-			delMode() {
-				uni.$emit('showTab', {
-					index: true
-				})
-				this.screenMode = false;
 			},
 			serach_do() {
 				this.list = [];
-				this.isSerach = false;
-				this.serach_content = '';
 				this.getAddressList();
 			},
-			getAddressList() {
+			getScroll(d) {
-				var industry_id = 0;
+				this.top = d.scrollTop;
-				var position_id = 0;
-				var region_id = 0;
-				if (this.serach_content == '') {
-					this.isSerach = false;
-					if (this.tabbarIndex == 0) {
-						industry_id = this.tabRightInfo.id;
-					} else if (this.tabbarIndex == 1) {
-						region_id = this.tabRightInfo.id;
-					} else {
-						position_id = this.tabRightInfo.id;
-					}
-				} else {
-					this.isSerach = true;
-					industry_id = 0;
-					position_id = 0;
-					region_id = 0;
-				}
-				addressList({
-						association_id: this.gid,
-						industry_id: industry_id,
-						position_id: position_id,
-						region_id: region_id,
-						nikename: this.serach_content,
-					})
-					.then(res => {
-						console.log(res);
-						if (res.code == 1) {
-							this.list = res.data.ret;
-						}
-						this.delMode();
-					})
-					.catch(error => {
-						uni.showToast({
-							title: error,
-							icon: 'none',
-							duration: 2000
-						});
-					})
 			},
-			tabbarIndexCur(d) {
+			onload() {
-				this.tabRightIndex = 0;
+				this.gid = store.state.Gid;
-				this.tabbarIndex = d;
-				if (d == 0) {
 				this.getIndustryList();
-				}
+				this.getAssociationIndex();
-				if (d == 1) {
-					this.getRegionList();
-				}
-				if (d == 2) {
-					this.getPositionList();
-				}
-			},
-			tabRightListCur(d) {
-				this.tabRightIndex = d;
-				this.tabRightInfo = this.tabRightList[d];
 			},
 			confirm(d) {
 				var info = d[0];
 				this.list = [];
 				this.gid = info.value;
+				this.getAssociationIndex();
 				this.getIndustryList();
 			},
-			getRegionList() {
+			getAssociationIndex() {
-				return new Promise((resolve, reject) => {
+				associationIndex()
-					getRegion({
-							association_id: this.gid
-						})
 					.then(res => {
+						console.log(res);
 						if (res.code == 1) {
 							var key = res.data;
-								var transformedSelectList = key.map(item => ({
+							const transformedSelectList = key.map(item => ({
-									id: item.id,
+								value: item.id,
-									name: item.region_name
+								label: item.association_name
 							}));
-								transformedSelectList.unshift({
+							const foundNumber = transformedSelectList.find((element) => element.value == this.gid);
-									id: 0,
+							this.HomeTitle = foundNumber.label;
-									name: '全部'
+							this.selectList = transformedSelectList;
-								});
-								this.tabRightList = transformedSelectList;
 						}
-							resolve(); // 当操作成功时调用resolve
 					})
 					.catch(error => {
 						uni.showToast({
@@ -289,72 +217,29 @@
 							duration: 2000
 						});
 					})
-				})
-
-			},
-			getPositionList() {
-				return new Promise((resolve, reject) => {
-					getPosition({
-							association_id: this.gid
-						})
-						.then(res => {
-							if (res.code == 1) {
-								var key = res.data;
-								var transformedSelectList = key.map(item => ({
-									id: item.id,
-									name: item.position_name
-								}));
-								transformedSelectList.unshift({
-									id: 0,
-									name: '全部'
-								});
-								this.tabRightList = transformedSelectList;
-							}
-							resolve(); // 当操作成功时调用resolve
-						})
-						.catch(error => {
-							uni.showToast({
-								title: error,
-								icon: 'none',
-								duration: 2000
-							});
-						})
-				})
-
-			},
-			onload() {
-				//this.tabbarIndex = 0;
-				//this.gid = store.state.Gid;
-				//this.getIndustryList();
-				//this.getAddressList();
-				//this.getAssociationIndex();
 			},
 			getIndustryList() {
-				return new Promise((resolve, reject) => {
 				newIndustryIndex({
 						association_id: this.gid
 					})
 					.then(res => {
 						console.log(res);
 						if (res.code == 1) {
-								var key = res.data;
+							this.industry_list = res.data;
-								key.push({
+							this.industry_list.push({
-									id: 0,
+								id: -1,
 								industry_name: '其他行业'
 							});
-								var transformedSelectList = key.map(item => ({
+							this.industry_list.unshift({
-									id: item.id,
-									name: item.industry_name
-								}));
-								transformedSelectList.unshift({
 								id: 0,
-									name: '全部'
+								industry_name: '组织架构'
 							});
-								this.tabRightList = transformedSelectList;
+							this.leftId = res.data[0].id;
-								this.tabRightInfo = transformedSelectList[0];
+							uni.showLoading({
-
+								title: '加载中...'
+							});
+							this.getAddressList();
 						}
-							resolve(); // 当操作成功时调用resolve
 					})
 					.catch(error => {
 						uni.showToast({
@@ -363,8 +248,64 @@
 							duration: 2000
 						});
 					})
+			},
+			getAddressList() {
+				addressList({
+						position_id: 0,
+						association_id: this.gid,
+						industry_id: this.leftId,
+						nikename: this.serach_content
 					})
-
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.list = res.data.ret;
+						}
+						setTimeout(function() {
+							uni.hideLoading();
+						}, 2000);
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			clickClassifyNav(index) {
+				uni.showLoading({
+					title: '加载中...'
+				});
+				this.currentTabbarIndex = index;
+				this.leftId = this.industry_list[index].id;
+				this.list = [];
+				this.top = this.randomBetween();
+				this.getAddressList();
+				//this.handleLeftScrollView(index)
+				//this.switchClassifyContent();
+			},
+			randomBetween() {
+				let baseRandom = Math.random() * (0.99999 - 0.00001) + 0.00001;
+				return baseRandom.toFixed(5); //
+			},
+			// 点击分类后，处理scrollView滚动到居中位置
+			handleLeftScrollView(index) {
+				const tabbarItemTop = this.tabbarItemInfo[index].top - this.scrollViewBasicTop
+				if (tabbarItemTop > this.scrollViewHeight / 2) {
+					this.leftScrollViewTop = tabbarItemTop - (this.scrollViewHeight / 2) + this.tabbarItemInfo[index]
+						.height
+				} else {
+					this.leftScrollViewTop = 0
+				}
+			},
+			// 切换对应分类的数据
+			switchClassifyContent() {
+				this.rightScrollViewTop = 1
+				this.$nextTick(() => {
+					this.rightScrollViewTop = 0
+				})
+				//this.classifyContent.subClassify[0].title = this.tabbar[this.currentTabbarIndex]
 			},
 			tn(url) {
 				uni.navigateTo({
@@ -494,7 +435,8 @@
 		/* 分类内容 end */
 	}
 
-	.actBackground {
+	.my-page {
-		background: #3f8bf2
+		height: calc(100vh - 286rpx);
+		padding-bottom: 100rpx;
 	}
 </style>

pages/index/event_info.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="letter-spacing: 1rpx;">
+	<view style="letter-spacing: 1rpx;" v-cloak>
 		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
 			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between">
 				<view class="tn-flex tn-flex-col-center tn-flex-row-left">
@@ -157,15 +157,18 @@
 					</view>
 					<view class="tn-margin-top"
 						style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
-            <tn-tabs :list="[{name:'报名详情'}]" :current="topCurrent" activeColor="#000"
+						<tn-tabs :list="[{name:'报名详情'}]" :current="topCurrent" activeColor="#000" :bold="false"
-                     :bold="false" :fontSize="24"></tn-tabs>
+							:fontSize="24"></tn-tabs>
 					</view>
 				</view>
 			</tn-nav-bar>
 			<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
-        <view  v-if="info.list.length!=0" class="tn-flex tn-flex-center tn-flex-col-center" v-for="(item,index) in info.list" @click="openUrl('/pages/index/my_card?id='+item.id)" style="margin-top: 20rpx;padding: 20rpx;">
+				<view v-if="info.list.length!=0" class="tn-flex tn-flex-center tn-flex-col-center"
+					v-for="(item,index) in info.list" @click="openUrl('/pages/index/my_card?id='+item.id)"
+					style="margin-top: 20rpx;padding: 20rpx;">
 					<view>
-            <image :src="apiImgUrl+item.photo_image" style="width: 100rpx;height: 100rpx;border-radius: 50%"></image>
+						<image :src="apiImgUrl+item.photo_image"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%"></image>
 					</view>
 					<view style="margin-left: 20rpx;">
 						<view style="font-size: 30rpx;font-weight: 600">{{item.nikename}}</view>
@@ -215,7 +218,9 @@
 				},
 				topCurrent: 0,
 				id: 0,
-				info: {},
+				info: {
+					list: []
+				},
 				apiImgUrl: this.$store.state.imgUrl
 			}
 		},

pages/index/home.vue

@@ -107,8 +107,7 @@
 					style="width: 90rpx;height: 90rpx;position: absolute; right: 10rpx;bottom: 0;"></image>
 			</view>
 		</view>
-		<!-- 	<view
+		<!-- <view style="width: 92%;background-color: #ffffff;border-radius: 16rpx;margin: 20rpx auto;overflow: hidden;"> -->
-			style="width: 92%;background-color: #ffffff;border-radius: 16rpx;margin: 0 auto;overflow: hidden;margin-top: 10rpx;"> -->
 		<!-- <tn-list-cell>
 				<view class="list-icon-text">
 					<view class="list__left">

pages/index/index.vue

@@ -10,11 +10,11 @@
 				<Service ref="service"></Service>
 			</scroll-view>
 		</view> -->
-		<view v-if="tabberPageLoadFlag[1]" :style="{display: currentIndex === 1 ? '' : 'none'}">
+		<view @touchmove="preventTouchMove" v-if=" tabberPageLoadFlag[1]"
-			<scroll-view :class="tabShow?'custom-tabbar-page':''" scroll-y enable-back-to-top
+			:style="{display: currentIndex === 1 ? '' : 'none'}">
-				@scrolltolower="tabbarPageScrollLower">
+			<view :class="tabShow?'custom-tabbar-page':''">
 				<Directory ref="directory"></Directory>
-			</scroll-view>
+			</view>
 		</view>
 		<!-- <view v-if="tabberPageLoadFlag[2]" :style="{display: currentIndex === 2 ? '' : 'none'}">
 			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
@@ -134,7 +134,9 @@
 			}
 		},
 		methods: {
+			preventTouchMove() {
 
+			},
 			childEvent(data) {
 				console.log(123);
 				console.log(data);

pages/index/my_card.vue

@@ -61,7 +61,8 @@
 					<view style="font-size: 24rpx;color: #666666;margin-left: 30rpx;">
 						<view style="font-size: 36rpx;font-weight: 600;color: #000000">{{userThisInfo.enterprise_name}}
 						</view>
-						<view style="margin: 15rpx 0rpx">所属行业：{{userThisInfo.industry_name}}</view>
+						<view style="margin: 15rpx 0rpx">
+							所属行业：{{userThisInfo.industry_id==-1?'其他行业':userThisInfo.industry_name}}</view>
 						<view>企业地址：{{userThisInfo.enterprise_location}}</view>
 					</view>
 				</view>

pages/index/my_edit.vue

@@ -399,10 +399,14 @@
 					.then(res => {
 						if (res.code == 1) {
 							var key = res.data;
-							const transformedSelectList = key.map(item => ({
+							var transformedSelectList = key.map(item => ({
 								value: item.id,
 								label: item.industry_name
 							}));
+							transformedSelectList.push({
+								value: -1,
+								label: '其他行业'
+							});
 							this.industry_list = transformedSelectList;
 						}
 					})

pages/index/user.vue

@@ -6,14 +6,16 @@
 			<view class="tn-flex tn-flex-center tn-flex-col-center" style="padding: 30rpx;width: 100%;">
 				<view v-if="login && userInfo.photo_image">
 					<image :src="apiImgUrl+userInfo.photo_image"
+						@click="tn_ru('/pages/index/my_card?id='+userInfo.member_id)"
 						style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
 				</view>
 				<view v-if="!login || !userInfo.photo_image">
 					<image src="/static/def.png" style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
 				</view>
 				<view style="width: 100%;">
-					<view v-if="login" class="tn-flex tn-flex-col-center tn-flex-row-between" @click="tn_ru('/pages/index/my_card?id='+userInfo.member_id)">
+					<view v-if="login" class="tn-flex tn-flex-col-center tn-flex-row-between">
-						<view style="margin-left: 20rpx;color: #fff">
+						<view style="margin-left: 20rpx;color: #fff"
+							@click="tn_ru('/pages/index/my_card?id='+userInfo.member_id)">
 							<view style="font-size: 35rpx;">{{ userInfo.nikename }}</view>
 							<view style="font-size: 24rpx;margin-top: 10rpx;">{{userInfo.position_name}}</view>
 						</view>
@@ -204,7 +206,10 @@
 		mounted() {
 			var uid = uni.getStorageSync('uid');
 			this.uid = uid;
+			if (uid) {
 				this.getUserInfo();
+			}
+
 			this.getcheckCode();
 		},
 		methods: {

unpackage/dist/dev/mp-weixin/pages/index/directory.js

@@ -88,8 +88,8 @@ try {
     tnButton: function () {
       return Promise.all(/*! import() | tuniao-ui/components/tn-button/tn-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("tuniao-ui/components/tn-button/tn-button")]).then(__webpack_require__.bind(null, /*! @/tuniao-ui/components/tn-button/tn-button.vue */ 309))
     },
-    tnPopup: function () {
+    tnSelect: function () {
-      return Promise.all(/*! import() | tuniao-ui/components/tn-popup/tn-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("tuniao-ui/components/tn-popup/tn-popup")]).then(__webpack_require__.bind(null, /*! @/tuniao-ui/components/tn-popup/tn-popup.vue */ 366))
+      return __webpack_require__.e(/*! import() | tuniao-ui/components/tn-select/tn-select */ "tuniao-ui/components/tn-select/tn-select").then(__webpack_require__.bind(null, /*! @/tuniao-ui/components/tn-select/tn-select.vue */ 317))
     },
   }
 } catch (e) {
@@ -113,11 +113,20 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var g0 = _vm.tabRightList.length
+  var l0 = _vm.__map(_vm.industry_list, function (item, index) {
+    var $orig = _vm.__get_orig(item)
+    var m0 = _vm.tabbarItemClass(index)
+    return {
+      $orig: $orig,
+      m0: m0,
+    }
+  })
+  var g0 = _vm.list.length
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
+        l0: l0,
         g0: g0,
       },
     }
@@ -162,8 +171,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 35));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 var _api = __webpack_require__(/*! @/util/api.js */ 33);
 var _store = _interopRequireDefault(__webpack_require__(/*! @/store */ 30));
 //
@@ -277,33 +284,25 @@ var _store = _interopRequireDefault(__webpack_require__(/*! @/store */ 30));
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {
-      screenMode: false,
       serach_content: '',
       list: [],
-      tabList: ['所属行业', '所属区域', '组织架构'],
       topCurrent: 0,
       tabbarIndex: 0,
+      // 分类菜单item的信息
+      tabbarItemInfo: [],
+      // scrollView的top值
+      scrollViewBasicTop: 0,
+      // scrollView的高度
+      scrollViewHeight: 0,
+      // 左边scrollView的滚动高度
+      leftScrollViewTop: 0,
+      // 右边scrollView的滚动高度
+      rightScrollViewTop: 0,
+      // 当前选中的tabbar序号
+      currentTabbarIndex: 0,
       apiImgUrl: this.$store.state.imgUrl,
       industry_list: [],
       leftId: 0,
@@ -311,234 +310,75 @@ var _default = {
       HomeTitle: '',
       selectList: [],
       gid: _store.default.state.Gid,
-      top: 0,
+      top: 0
-      tabRightList: '',
-      tabRightIndex: 0,
-      tabRightInfo: {},
-      isSerach: false
     };
   },
-  mounted: function mounted() {
+  computed: {
-    // console.log(d.id);
+    tabbarItemClass: function tabbarItemClass() {
-    // if (typeof(d.id) != 'undefined') {
+      var _this = this;
-    // 	this.gid = d.id;
+      return function (index) {
-    // }
+        if (index === _this.currentTabbarIndex) {
-    this.loadTabData();
+          return 'tn-classify__tabbar__item--active tn-bg-white';
+        } else {
+          var clazz = '';
+          if (_this.currentTabbarIndex > 0 && index === _this.currentTabbarIndex - 1) {
+            clazz += ' tn-classify__tabbar__item--active--prev';
+          }
+          if (_this.currentTabbarIndex < _this.industry_list.length && index === _this.currentTabbarIndex + 1) {
+            clazz += ' tn-classify__tabbar__item--active--next';
+          }
+          return clazz;
+        }
+      };
+    }
+  },
+  onLoad: function onLoad(d) {
+    console.log(d.id);
+    if (typeof d.id != 'undefined') {
+      this.gid = d.id;
+    }
+    this.getIndustryList();
+    this.getAssociationIndex();
   },
   methods: {
-    loadTabData: function loadTabData() {
+    preventTouchMove: function preventTouchMove() {},
-      var _this = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!(_this.tabbarIndex === 0)) {
-                  _context.next = 3;
-                  break;
-                }
-                _context.next = 3;
-                return _this.getIndustryList();
-              case 3:
-                if (!(_this.tabbarIndex === 1)) {
-                  _context.next = 6;
-                  break;
-                }
-                _context.next = 6;
-                return _this.getRegionList();
-              case 6:
-                if (!(_this.tabbarIndex === 2)) {
-                  _context.next = 9;
-                  break;
-                }
-                _context.next = 9;
-                return _this.getPositionList();
-              case 9:
-                console.log(_this.tabRightInfo);
-                _this.getAddressList();
-              case 11:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }))();
-    },
-    openMode: function openMode() {
-      uni.$emit('showTab', {
-        index: false
-      });
-      this.screenMode = true;
-    },
-    delMode: function delMode() {
-      uni.$emit('showTab', {
-        index: true
-      });
-      this.screenMode = false;
-    },
     serach_do: function serach_do() {
       this.list = [];
-      this.isSerach = false;
-      this.serach_content = '';
       this.getAddressList();
     },
-    getAddressList: function getAddressList() {
+    getScroll: function getScroll(d) {
-      var _this2 = this;
+      this.top = d.scrollTop;
-      var industry_id = 0;
-      var position_id = 0;
-      var region_id = 0;
-      if (this.serach_content == '') {
-        this.isSerach = false;
-        if (this.tabbarIndex == 0) {
-          industry_id = this.tabRightInfo.id;
-        } else if (this.tabbarIndex == 1) {
-          region_id = this.tabRightInfo.id;
-        } else {
-          position_id = this.tabRightInfo.id;
-        }
-      } else {
-        this.isSerach = true;
-        industry_id = 0;
-        position_id = 0;
-        region_id = 0;
-      }
-      (0, _api.addressList)({
-        association_id: this.gid,
-        industry_id: industry_id,
-        position_id: position_id,
-        region_id: region_id,
-        nikename: this.serach_content
-      }).then(function (res) {
-        console.log(res);
-        if (res.code == 1) {
-          _this2.list = res.data.ret;
-        }
-        _this2.delMode();
-      }).catch(function (error) {
-        uni.showToast({
-          title: error,
-          icon: 'none',
-          duration: 2000
-        });
-      });
     },
-    tabbarIndexCur: function tabbarIndexCur(d) {
+    onload: function onload() {
-      this.tabRightIndex = 0;
+      this.gid = _store.default.state.Gid;
-      this.tabbarIndex = d;
-      if (d == 0) {
       this.getIndustryList();
-      }
+      this.getAssociationIndex();
-      if (d == 1) {
-        this.getRegionList();
-      }
-      if (d == 2) {
-        this.getPositionList();
-      }
-    },
-    tabRightListCur: function tabRightListCur(d) {
-      this.tabRightIndex = d;
-      this.tabRightInfo = this.tabRightList[d];
     },
     confirm: function confirm(d) {
       var info = d[0];
       this.list = [];
       this.gid = info.value;
+      this.getAssociationIndex();
       this.getIndustryList();
     },
-    getRegionList: function getRegionList() {
+    getAssociationIndex: function getAssociationIndex() {
-      var _this3 = this;
+      var _this2 = this;
-      return new Promise(function (resolve, reject) {
+      (0, _api.associationIndex)().then(function (res) {
-        (0, _api.getRegion)({
-          association_id: _this3.gid
-        }).then(function (res) {
-          if (res.code == 1) {
-            var key = res.data;
-            var transformedSelectList = key.map(function (item) {
-              return {
-                id: item.id,
-                name: item.region_name
-              };
-            });
-            transformedSelectList.unshift({
-              id: 0,
-              name: '全部'
-            });
-            _this3.tabRightList = transformedSelectList;
-          }
-          resolve(); // 当操作成功时调用resolve
-        }).catch(function (error) {
-          uni.showToast({
-            title: error,
-            icon: 'none',
-            duration: 2000
-          });
-        });
-      });
-    },
-    getPositionList: function getPositionList() {
-      var _this4 = this;
-      return new Promise(function (resolve, reject) {
-        (0, _api.getPosition)({
-          association_id: _this4.gid
-        }).then(function (res) {
-          if (res.code == 1) {
-            var key = res.data;
-            var transformedSelectList = key.map(function (item) {
-              return {
-                id: item.id,
-                name: item.position_name
-              };
-            });
-            transformedSelectList.unshift({
-              id: 0,
-              name: '全部'
-            });
-            _this4.tabRightList = transformedSelectList;
-          }
-          resolve(); // 当操作成功时调用resolve
-        }).catch(function (error) {
-          uni.showToast({
-            title: error,
-            icon: 'none',
-            duration: 2000
-          });
-        });
-      });
-    },
-    onload: function onload() {
-      //this.tabbarIndex = 0;
-      //this.gid = store.state.Gid;
-      //this.getIndustryList();
-      //this.getAddressList();
-      //this.getAssociationIndex();
-    },
-    getIndustryList: function getIndustryList() {
-      var _this5 = this;
-      return new Promise(function (resolve, reject) {
-        (0, _api.newIndustryIndex)({
-          association_id: _this5.gid
-        }).then(function (res) {
         console.log(res);
         if (res.code == 1) {
           var key = res.data;
-            key.push({
-              id: 0,
-              industry_name: '其他行业'
-            });
           var transformedSelectList = key.map(function (item) {
             return {
-                id: item.id,
+              value: item.id,
-                name: item.industry_name
+              label: item.association_name
             };
           });
-            transformedSelectList.unshift({
+          var foundNumber = transformedSelectList.find(function (element) {
-              id: 0,
+            return element.value == _this2.gid;
-              name: '全部'
           });
-            _this5.tabRightList = transformedSelectList;
+          _this2.HomeTitle = foundNumber.label;
-            _this5.tabRightInfo = transformedSelectList[0];
+          _this2.selectList = transformedSelectList;
         }
-          resolve(); // 当操作成功时调用resolve
       }).catch(function (error) {
         uni.showToast({
           title: error,
@@ -546,7 +386,93 @@ var _default = {
           duration: 2000
         });
       });
+    },
+    getIndustryList: function getIndustryList() {
+      var _this3 = this;
+      (0, _api.newIndustryIndex)({
+        association_id: this.gid
+      }).then(function (res) {
+        console.log(res);
+        if (res.code == 1) {
+          _this3.industry_list = res.data;
+          _this3.industry_list.push({
+            id: -1,
+            industry_name: '其他行业'
           });
+          _this3.industry_list.unshift({
+            id: 0,
+            industry_name: '组织架构'
+          });
+          _this3.leftId = res.data[0].id;
+          uni.showLoading({
+            title: '加载中...'
+          });
+          _this3.getAddressList();
+        }
+      }).catch(function (error) {
+        uni.showToast({
+          title: error,
+          icon: 'none',
+          duration: 2000
+        });
+      });
+    },
+    getAddressList: function getAddressList() {
+      var _this4 = this;
+      (0, _api.addressList)({
+        position_id: 0,
+        association_id: this.gid,
+        industry_id: this.leftId,
+        nikename: this.serach_content
+      }).then(function (res) {
+        console.log(res);
+        if (res.code == 1) {
+          _this4.list = res.data.ret;
+        }
+        setTimeout(function () {
+          uni.hideLoading();
+        }, 2000);
+      }).catch(function (error) {
+        uni.showToast({
+          title: error,
+          icon: 'none',
+          duration: 2000
+        });
+      });
+    },
+    clickClassifyNav: function clickClassifyNav(index) {
+      uni.showLoading({
+        title: '加载中...'
+      });
+      this.currentTabbarIndex = index;
+      this.leftId = this.industry_list[index].id;
+      this.list = [];
+      this.top = this.randomBetween();
+      this.getAddressList();
+      //this.handleLeftScrollView(index)
+      //this.switchClassifyContent();
+    },
+    randomBetween: function randomBetween() {
+      var baseRandom = Math.random() * (0.99999 - 0.00001) + 0.00001;
+      return baseRandom.toFixed(5); //
+    },
+    // 点击分类后，处理scrollView滚动到居中位置
+    handleLeftScrollView: function handleLeftScrollView(index) {
+      var tabbarItemTop = this.tabbarItemInfo[index].top - this.scrollViewBasicTop;
+      if (tabbarItemTop > this.scrollViewHeight / 2) {
+        this.leftScrollViewTop = tabbarItemTop - this.scrollViewHeight / 2 + this.tabbarItemInfo[index].height;
+      } else {
+        this.leftScrollViewTop = 0;
+      }
+    },
+    // 切换对应分类的数据
+    switchClassifyContent: function switchClassifyContent() {
+      var _this5 = this;
+      this.rightScrollViewTop = 1;
+      this.$nextTick(function () {
+        _this5.rightScrollViewTop = 0;
+      });
+      //this.classifyContent.subClassify[0].title = this.tabbar[this.currentTabbarIndex]
     },
     tn: function tn(url) {
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/pages/index/directory.json

@@ -5,6 +5,6 @@
     "tn-nav-bar": "/tuniao-ui/components/tn-nav-bar/tn-nav-bar",
     "tn-tabs": "/tuniao-ui/components/tn-tabs/tn-tabs",
     "tn-button": "/tuniao-ui/components/tn-button/tn-button",
-    "tn-popup": "/tuniao-ui/components/tn-popup/tn-popup"
+    "tn-select": "/tuniao-ui/components/tn-select/tn-select"
   }
 }

unpackage/dist/dev/mp-weixin/pages/index/directory.wxss

@@ -73,7 +73,8 @@
 .tn-classify__content__sub-classify__content__item.data-v-671ec3f2 {
   padding: 20rpx;
 }
-.actBackground.data-v-671ec3f2 {
+.my-page.data-v-671ec3f2 {
-  background: #3f8bf2;
+  height: calc(100vh - 286rpx);
+  padding-bottom: 100rpx;
 }
 

unpackage/dist/dev/mp-weixin/pages/index/event_info.js

@@ -421,6 +421,9 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/store/index.js */
 //
 //
 //
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -448,7 +451,9 @@ var _default = {
       },
       topCurrent: 0,
       id: 0,
-      info: {},
+      info: {
+        list: []
+      },
       apiImgUrl: this.$store.state.imgUrl
     };
   },

unpackage/dist/dev/mp-weixin/pages/index/home.js

@@ -453,7 +453,6 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/store/index.js */
 //
 //
 //
-//
 var _default = {
   data: function data() {
     return {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -289,6 +289,7 @@ var _default = {
     };
   },
   methods: {
+    preventTouchMove: function preventTouchMove() {},
     childEvent: function childEvent(data) {
       console.log(123);
       console.log(data);
@@ -779,7 +780,6 @@ var _index = _interopRequireDefault(__webpack_require__(/*! @/store/index.js */
 //
 //
 //
-//
 var _default = {
   data: function data() {
     return {
@@ -2107,6 +2107,8 @@ var _store = _interopRequireDefault(__webpack_require__(/*! @/store */ 30));
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -2130,7 +2132,9 @@ var _default = {
   mounted: function mounted() {
     var uid = uni.getStorageSync('uid');
     this.uid = uid;
+    if (uid) {
       this.getUserInfo();
+    }
     this.getcheckCode();
   },
   methods: {
@@ -2378,8 +2382,8 @@ try {
     tnButton: function () {
       return Promise.all(/*! import() | tuniao-ui/components/tn-button/tn-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("tuniao-ui/components/tn-button/tn-button")]).then(__webpack_require__.bind(null, /*! @/tuniao-ui/components/tn-button/tn-button.vue */ 309))
     },
-    tnPopup: function () {
+    tnSelect: function () {
-      return Promise.all(/*! import() | tuniao-ui/components/tn-popup/tn-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("tuniao-ui/components/tn-popup/tn-popup")]).then(__webpack_require__.bind(null, /*! @/tuniao-ui/components/tn-popup/tn-popup.vue */ 366))
+      return __webpack_require__.e(/*! import() | tuniao-ui/components/tn-select/tn-select */ "tuniao-ui/components/tn-select/tn-select").then(__webpack_require__.bind(null, /*! @/tuniao-ui/components/tn-select/tn-select.vue */ 317))
     },
   }
 } catch (e) {
@@ -2403,11 +2407,20 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var g0 = _vm.tabRightList.length
+  var l0 = _vm.__map(_vm.industry_list, function (item, index) {
+    var $orig = _vm.__get_orig(item)
+    var m0 = _vm.tabbarItemClass(index)
+    return {
+      $orig: $orig,
+      m0: m0,
+    }
+  })
+  var g0 = _vm.list.length
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
+        l0: l0,
         g0: g0,
       },
     }
@@ -2450,8 +2463,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 35));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 var _api = __webpack_require__(/*! @/util/api.js */ 33);
 var _store = _interopRequireDefault(__webpack_require__(/*! @/store */ 30));
 //
@@ -2565,33 +2576,25 @@ var _store = _interopRequireDefault(__webpack_require__(/*! @/store */ 30));
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {
-      screenMode: false,
       serach_content: '',
       list: [],
-      tabList: ['所属行业', '所属区域', '组织架构'],
       topCurrent: 0,
       tabbarIndex: 0,
+      // 分类菜单item的信息
+      tabbarItemInfo: [],
+      // scrollView的top值
+      scrollViewBasicTop: 0,
+      // scrollView的高度
+      scrollViewHeight: 0,
+      // 左边scrollView的滚动高度
+      leftScrollViewTop: 0,
+      // 右边scrollView的滚动高度
+      rightScrollViewTop: 0,
+      // 当前选中的tabbar序号
+      currentTabbarIndex: 0,
       apiImgUrl: this.$store.state.imgUrl,
       industry_list: [],
       leftId: 0,
@@ -2599,234 +2602,75 @@ var _default = {
       HomeTitle: '',
       selectList: [],
       gid: _store.default.state.Gid,
-      top: 0,
+      top: 0
-      tabRightList: '',
-      tabRightIndex: 0,
-      tabRightInfo: {},
-      isSerach: false
     };
   },
-  mounted: function mounted() {
+  computed: {
-    // console.log(d.id);
+    tabbarItemClass: function tabbarItemClass() {
-    // if (typeof(d.id) != 'undefined') {
+      var _this = this;
-    // 	this.gid = d.id;
+      return function (index) {
-    // }
+        if (index === _this.currentTabbarIndex) {
-    this.loadTabData();
+          return 'tn-classify__tabbar__item--active tn-bg-white';
+        } else {
+          var clazz = '';
+          if (_this.currentTabbarIndex > 0 && index === _this.currentTabbarIndex - 1) {
+            clazz += ' tn-classify__tabbar__item--active--prev';
+          }
+          if (_this.currentTabbarIndex < _this.industry_list.length && index === _this.currentTabbarIndex + 1) {
+            clazz += ' tn-classify__tabbar__item--active--next';
+          }
+          return clazz;
+        }
+      };
+    }
+  },
+  onLoad: function onLoad(d) {
+    console.log(d.id);
+    if (typeof d.id != 'undefined') {
+      this.gid = d.id;
+    }
+    this.getIndustryList();
+    this.getAssociationIndex();
   },
   methods: {
-    loadTabData: function loadTabData() {
+    preventTouchMove: function preventTouchMove() {},
-      var _this = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!(_this.tabbarIndex === 0)) {
-                  _context.next = 3;
-                  break;
-                }
-                _context.next = 3;
-                return _this.getIndustryList();
-              case 3:
-                if (!(_this.tabbarIndex === 1)) {
-                  _context.next = 6;
-                  break;
-                }
-                _context.next = 6;
-                return _this.getRegionList();
-              case 6:
-                if (!(_this.tabbarIndex === 2)) {
-                  _context.next = 9;
-                  break;
-                }
-                _context.next = 9;
-                return _this.getPositionList();
-              case 9:
-                console.log(_this.tabRightInfo);
-                _this.getAddressList();
-              case 11:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }))();
-    },
-    openMode: function openMode() {
-      uni.$emit('showTab', {
-        index: false
-      });
-      this.screenMode = true;
-    },
-    delMode: function delMode() {
-      uni.$emit('showTab', {
-        index: true
-      });
-      this.screenMode = false;
-    },
     serach_do: function serach_do() {
       this.list = [];
-      this.isSerach = false;
-      this.serach_content = '';
       this.getAddressList();
     },
-    getAddressList: function getAddressList() {
+    getScroll: function getScroll(d) {
-      var _this2 = this;
+      this.top = d.scrollTop;
-      var industry_id = 0;
-      var position_id = 0;
-      var region_id = 0;
-      if (this.serach_content == '') {
-        this.isSerach = false;
-        if (this.tabbarIndex == 0) {
-          industry_id = this.tabRightInfo.id;
-        } else if (this.tabbarIndex == 1) {
-          region_id = this.tabRightInfo.id;
-        } else {
-          position_id = this.tabRightInfo.id;
-        }
-      } else {
-        this.isSerach = true;
-        industry_id = 0;
-        position_id = 0;
-        region_id = 0;
-      }
-      (0, _api.addressList)({
-        association_id: this.gid,
-        industry_id: industry_id,
-        position_id: position_id,
-        region_id: region_id,
-        nikename: this.serach_content
-      }).then(function (res) {
-        console.log(res);
-        if (res.code == 1) {
-          _this2.list = res.data.ret;
-        }
-        _this2.delMode();
-      }).catch(function (error) {
-        uni.showToast({
-          title: error,
-          icon: 'none',
-          duration: 2000
-        });
-      });
     },
-    tabbarIndexCur: function tabbarIndexCur(d) {
+    onload: function onload() {
-      this.tabRightIndex = 0;
+      this.gid = _store.default.state.Gid;
-      this.tabbarIndex = d;
-      if (d == 0) {
       this.getIndustryList();
-      }
+      this.getAssociationIndex();
-      if (d == 1) {
-        this.getRegionList();
-      }
-      if (d == 2) {
-        this.getPositionList();
-      }
-    },
-    tabRightListCur: function tabRightListCur(d) {
-      this.tabRightIndex = d;
-      this.tabRightInfo = this.tabRightList[d];
     },
     confirm: function confirm(d) {
       var info = d[0];
       this.list = [];
       this.gid = info.value;
+      this.getAssociationIndex();
       this.getIndustryList();
     },
-    getRegionList: function getRegionList() {
+    getAssociationIndex: function getAssociationIndex() {
-      var _this3 = this;
+      var _this2 = this;
-      return new Promise(function (resolve, reject) {
+      (0, _api.associationIndex)().then(function (res) {
-        (0, _api.getRegion)({
-          association_id: _this3.gid
-        }).then(function (res) {
-          if (res.code == 1) {
-            var key = res.data;
-            var transformedSelectList = key.map(function (item) {
-              return {
-                id: item.id,
-                name: item.region_name
-              };
-            });
-            transformedSelectList.unshift({
-              id: 0,
-              name: '全部'
-            });
-            _this3.tabRightList = transformedSelectList;
-          }
-          resolve(); // 当操作成功时调用resolve
-        }).catch(function (error) {
-          uni.showToast({
-            title: error,
-            icon: 'none',
-            duration: 2000
-          });
-        });
-      });
-    },
-    getPositionList: function getPositionList() {
-      var _this4 = this;
-      return new Promise(function (resolve, reject) {
-        (0, _api.getPosition)({
-          association_id: _this4.gid
-        }).then(function (res) {
-          if (res.code == 1) {
-            var key = res.data;
-            var transformedSelectList = key.map(function (item) {
-              return {
-                id: item.id,
-                name: item.position_name
-              };
-            });
-            transformedSelectList.unshift({
-              id: 0,
-              name: '全部'
-            });
-            _this4.tabRightList = transformedSelectList;
-          }
-          resolve(); // 当操作成功时调用resolve
-        }).catch(function (error) {
-          uni.showToast({
-            title: error,
-            icon: 'none',
-            duration: 2000
-          });
-        });
-      });
-    },
-    onload: function onload() {
-      //this.tabbarIndex = 0;
-      //this.gid = store.state.Gid;
-      //this.getIndustryList();
-      //this.getAddressList();
-      //this.getAssociationIndex();
-    },
-    getIndustryList: function getIndustryList() {
-      var _this5 = this;
-      return new Promise(function (resolve, reject) {
-        (0, _api.newIndustryIndex)({
-          association_id: _this5.gid
-        }).then(function (res) {
         console.log(res);
         if (res.code == 1) {
           var key = res.data;
-            key.push({
-              id: 0,
-              industry_name: '其他行业'
-            });
           var transformedSelectList = key.map(function (item) {
             return {
-                id: item.id,
+              value: item.id,
-                name: item.industry_name
+              label: item.association_name
             };
           });
-            transformedSelectList.unshift({
+          var foundNumber = transformedSelectList.find(function (element) {
-              id: 0,
+            return element.value == _this2.gid;
-              name: '全部'
           });
-            _this5.tabRightList = transformedSelectList;
+          _this2.HomeTitle = foundNumber.label;
-            _this5.tabRightInfo = transformedSelectList[0];
+          _this2.selectList = transformedSelectList;
         }
-          resolve(); // 当操作成功时调用resolve
       }).catch(function (error) {
         uni.showToast({
           title: error,
@@ -2834,7 +2678,93 @@ var _default = {
           duration: 2000
         });
       });
+    },
+    getIndustryList: function getIndustryList() {
+      var _this3 = this;
+      (0, _api.newIndustryIndex)({
+        association_id: this.gid
+      }).then(function (res) {
+        console.log(res);
+        if (res.code == 1) {
+          _this3.industry_list = res.data;
+          _this3.industry_list.push({
+            id: -1,
+            industry_name: '其他行业'
           });
+          _this3.industry_list.unshift({
+            id: 0,
+            industry_name: '组织架构'
+          });
+          _this3.leftId = res.data[0].id;
+          uni.showLoading({
+            title: '加载中...'
+          });
+          _this3.getAddressList();
+        }
+      }).catch(function (error) {
+        uni.showToast({
+          title: error,
+          icon: 'none',
+          duration: 2000
+        });
+      });
+    },
+    getAddressList: function getAddressList() {
+      var _this4 = this;
+      (0, _api.addressList)({
+        position_id: 0,
+        association_id: this.gid,
+        industry_id: this.leftId,
+        nikename: this.serach_content
+      }).then(function (res) {
+        console.log(res);
+        if (res.code == 1) {
+          _this4.list = res.data.ret;
+        }
+        setTimeout(function () {
+          uni.hideLoading();
+        }, 2000);
+      }).catch(function (error) {
+        uni.showToast({
+          title: error,
+          icon: 'none',
+          duration: 2000
+        });
+      });
+    },
+    clickClassifyNav: function clickClassifyNav(index) {
+      uni.showLoading({
+        title: '加载中...'
+      });
+      this.currentTabbarIndex = index;
+      this.leftId = this.industry_list[index].id;
+      this.list = [];
+      this.top = this.randomBetween();
+      this.getAddressList();
+      //this.handleLeftScrollView(index)
+      //this.switchClassifyContent();
+    },
+    randomBetween: function randomBetween() {
+      var baseRandom = Math.random() * (0.99999 - 0.00001) + 0.00001;
+      return baseRandom.toFixed(5); //
+    },
+    // 点击分类后，处理scrollView滚动到居中位置
+    handleLeftScrollView: function handleLeftScrollView(index) {
+      var tabbarItemTop = this.tabbarItemInfo[index].top - this.scrollViewBasicTop;
+      if (tabbarItemTop > this.scrollViewHeight / 2) {
+        this.leftScrollViewTop = tabbarItemTop - this.scrollViewHeight / 2 + this.tabbarItemInfo[index].height;
+      } else {
+        this.leftScrollViewTop = 0;
+      }
+    },
+    // 切换对应分类的数据
+    switchClassifyContent: function switchClassifyContent() {
+      var _this5 = this;
+      this.rightScrollViewTop = 1;
+      this.$nextTick(function () {
+        _this5.rightScrollViewTop = 0;
+      });
+      //this.classifyContent.subClassify[0].title = this.tabbar[this.currentTabbarIndex]
     },
     tn: function tn(url) {
       uni.navigateTo({

unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view class="index data-v-57280228"><block wx:if="{{tabberPageLoadFlag[0]}}"><view style="{{'display:'+(currentIndex===0?'':'none')+';'}}" class="data-v-57280228"><scroll-view class="custom-tabbar-page data-v-57280228" scroll-y="{{true}}" enable-back-to-top="{{true}}" data-event-opts="{{[['scrolltolower',[['tabbarPageScrollLower',['$event']]]]]}}" bindscrolltolower="__e"><home vue-id="8dd740cc-1" data-ref="home" class="data-v-57280228 vue-ref" bind:__l="__l"></home></scroll-view></view></block><block wx:if="{{tabberPageLoadFlag[1]}}"><view style="{{'display:'+(currentIndex===1?'':'none')+';'}}" class="data-v-57280228"><scroll-view class="{{['data-v-57280228',tabShow?'custom-tabbar-page':'']}}" scroll-y="{{true}}" enable-back-to-top="{{true}}" data-event-opts="{{[['scrolltolower',[['tabbarPageScrollLower',['$event']]]]]}}" bindscrolltolower="__e"><directory vue-id="8dd740cc-2" data-ref="directory" class="data-v-57280228 vue-ref" bind:__l="__l"></directory></scroll-view></view></block><block wx:if="{{tabberPageLoadFlag[2]}}"><view style="{{'display:'+(currentIndex===2?'':'none')+';'}}" class="data-v-57280228"><scroll-view class="custom-tabbar-page data-v-57280228" scroll-y="{{true}}" enable-back-to-top="{{true}}" data-event-opts="{{[['scrolltolower',[['tabbarPageScrollLower',['$event']]]]]}}" bindscrolltolower="__e"><pizz vue-id="8dd740cc-3" data-ref="pizz" class="data-v-57280228 vue-ref" bind:__l="__l"></pizz></scroll-view></view></block><block wx:if="{{tabberPageLoadFlag[3]}}"><view style="{{'display:'+(currentIndex===3?'':'none')+';'}}" class="data-v-57280228"><scroll-view class="custom-tabbar-page data-v-57280228" scroll-y="{{true}}" enable-back-to-top="{{true}}" data-event-opts="{{[['scrolltolower',[['tabbarPageScrollLower',['$event']]]]]}}" bindscrolltolower="__e"><user vue-id="8dd740cc-4" data-ref="user" class="data-v-57280228 vue-ref" bind:__l="__l"></user></scroll-view></view></block><tn-tabbar vue-id="8dd740cc-5" show="{{tabShow}}" outHeight="{{140}}" height="{{120}}" list="{{tabbarList}}" activeColor="#3377FF" inactiveColor="#AAAAAA" activeIconColor="#3377FF" inactiveIconColor="#8A8E99" animation="{{true}}" safeAreaInsetBottom="{{true}}" value="{{currentIndex}}" data-event-opts="{{[['^change',[['switchTabbar']]],['^input',[['__set_model',['','currentIndex','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-57280228" bind:__l="__l"></tn-tabbar></view>
+<view class="index data-v-57280228"><block wx:if="{{tabberPageLoadFlag[0]}}"><view style="{{'display:'+(currentIndex===0?'':'none')+';'}}" class="data-v-57280228"><scroll-view class="custom-tabbar-page data-v-57280228" scroll-y="{{true}}" enable-back-to-top="{{true}}" data-event-opts="{{[['scrolltolower',[['tabbarPageScrollLower',['$event']]]]]}}" bindscrolltolower="__e"><home vue-id="8dd740cc-1" data-ref="home" class="data-v-57280228 vue-ref" bind:__l="__l"></home></scroll-view></view></block><block wx:if="{{tabberPageLoadFlag[1]}}"><view data-event-opts="{{[['touchmove',[['preventTouchMove',['$event']]]]]}}" style="{{'display:'+(currentIndex===1?'':'none')+';'}}" bindtouchmove="__e" class="data-v-57280228"><view class="{{['data-v-57280228',tabShow?'custom-tabbar-page':'']}}"><directory vue-id="8dd740cc-2" data-ref="directory" class="data-v-57280228 vue-ref" bind:__l="__l"></directory></view></view></block><block wx:if="{{tabberPageLoadFlag[2]}}"><view style="{{'display:'+(currentIndex===2?'':'none')+';'}}" class="data-v-57280228"><scroll-view class="custom-tabbar-page data-v-57280228" scroll-y="{{true}}" enable-back-to-top="{{true}}" data-event-opts="{{[['scrolltolower',[['tabbarPageScrollLower',['$event']]]]]}}" bindscrolltolower="__e"><pizz vue-id="8dd740cc-3" data-ref="pizz" class="data-v-57280228 vue-ref" bind:__l="__l"></pizz></scroll-view></view></block><block wx:if="{{tabberPageLoadFlag[3]}}"><view style="{{'display:'+(currentIndex===3?'':'none')+';'}}" class="data-v-57280228"><scroll-view class="custom-tabbar-page data-v-57280228" scroll-y="{{true}}" enable-back-to-top="{{true}}" data-event-opts="{{[['scrolltolower',[['tabbarPageScrollLower',['$event']]]]]}}" bindscrolltolower="__e"><user vue-id="8dd740cc-4" data-ref="user" class="data-v-57280228 vue-ref" bind:__l="__l"></user></scroll-view></view></block><tn-tabbar vue-id="8dd740cc-5" show="{{tabShow}}" outHeight="{{140}}" height="{{120}}" list="{{tabbarList}}" activeColor="#3377FF" inactiveColor="#AAAAAA" activeIconColor="#3377FF" inactiveIconColor="#8A8E99" animation="{{true}}" safeAreaInsetBottom="{{true}}" value="{{currentIndex}}" data-event-opts="{{[['^change',[['switchTabbar']]],['^input',[['__set_model',['','currentIndex','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-57280228" bind:__l="__l"></tn-tabbar></view>

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -117,8 +117,9 @@
 .tn-classify__content__sub-classify__content__item.data-v-671ec3f2 {
   padding: 20rpx;
 }
-.actBackground.data-v-671ec3f2 {
+.my-page.data-v-671ec3f2 {
-  background: #3f8bf2;
+  height: calc(100vh - 286rpx);
+  padding-bottom: 100rpx;
 }
 
 @charset "UTF-8";

unpackage/dist/dev/mp-weixin/pages/index/my_card.js

@@ -348,6 +348,7 @@ var _store = _interopRequireDefault(__webpack_require__(/*! @/store */ 30));
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {

unpackage/dist/dev/mp-weixin/pages/index/my_edit.js

@@ -613,6 +613,10 @@ var _default = {
               label: item.industry_name
             };
           });
+          transformedSelectList.push({
+            value: -1,
+            label: '其他行业'
+          });
           _this2.industry_list = transformedSelectList;
         }
       }).catch(function (error) {

unpackage/dist/dev/mp-weixin/pages/index/user.js

@@ -356,6 +356,8 @@ var _store = _interopRequireDefault(__webpack_require__(/*! @/store */ 30));
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -379,7 +381,9 @@ var _default = {
   mounted: function mounted() {
     var uid = uni.getStorageSync('uid');
     this.uid = uid;
+    if (uid) {
       this.getUserInfo();
+    }
     this.getcheckCode();
   },
   methods: {

unpackage/dist/dev/mp-weixin/project.config.json

@@ -15,7 +15,8 @@
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
-        }
+        },
+        "ignoreUploadUnusedFiles": false
     },
     "compileType": "miniprogram",
     "libVersion": "3.4.5",

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -3,6 +3,13 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "pages/index/event_info",
+                    "pathName": "pages/index/event_info",
+                    "query": "id=71",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "pages/index/my_edit",
                     "pathName": "pages/index/my_edit",

util/api.js

@@ -10,7 +10,9 @@ export const associationInfo = data => request.post('/move/association/find', da
 export const architectureList = data => request.post('/move/address/architecture', data, false);
 export const positionList = data => request.post('/position', data, false);
 export const IndustryList = data => request.post('/industry', data, false);
+
 export const loginAdd = data => request.post('/move/login/add', data, false);
+
 export const loginDo = data => request.post('/move/login/login', data, false);
 export const addressList = data => request.post('/move/address', data, false);
 export const newIndustryIndex = data => request.post('/move/industry/index', data, false);