1

@@ -150,7 +150,7 @@ methods:{
 		fail: function (res) { },
 		complete: function (res) { },
 		})
-		微信程
+		
 	},
     liuyanBoxShow(){
         this.isliuyanBoxShow=true

@@ -31,7 +31,6 @@
 							<!-- <view class="title" @click="selectschool" :data-id="null">全部学校</view> -->
 							<view class="item" @click="selectschool" v-for="(item,index) in schoolList" :key="index" :data-id="item.id">{{item.name}}</view>
 						</view>
-			
 					</view>
 				</view>
 				<!-- <view class="schoolPopup" v-if="isSchoolShow">
@@ -50,14 +49,12 @@
 						 :data-id="item.id">{{item.name}}</view>
 					</view>
 				</view>
-				<view class="stylePopup" v-if="isStyleShow">
 
+				<view class="stylePopup" v-if="isStyleShow">
 					<view class="cont" style="display:flex;flex-direction: column;overflow: auto;height: 600rpx;">
-						<view class="title" @click="selectup" :data-id="null">全部</view>
+						<!-- <view class="title" @click="selectup" :data-id="null">全部</view> -->
 						<view class="item" style="width:230rpx" @click="selectup" v-for="(item,index) in upList" :key="index" :data-id="item.id">{{item.name}}</view>
 
-			
-			
 					</view>
 				</view>
 			</view>
@@ -109,7 +106,6 @@
 					<view class="teacherfootname" :class="footersel==3?'selactive':''">我的主页</view>
 				</view>
 			</view>
-			
 			<view class="collegefooter" v-if="type == 2">
 				<view class="teacherfootitem" @click="footerselChange" :data-id="2" :data-url="'/pages/schoolmate/schoolmate?type='+2">
 					<view class="teacherfootitemtop">
@@ -124,16 +120,9 @@
 					<view class="teacherfootname" :class="footersel==3?'selactive':''">我的主页</view>
 				</view>
 			</view>
-			
-				
 		</view>
-		
-	
 	</view>
 
-
-
-
 </template>
 
 <script>
@@ -180,7 +169,7 @@
 				provinceList: [],
 				cityList: [],
 				schoolList: [],
-				word:""
+				word: ""
 			}
 		},
 		methods: {
@@ -246,6 +235,7 @@
 			},
 
 			styleShow() {
+				console.log(37844374378)
 				this.isStyleShow = true
 				this.isMajorShow = false
 				this.isSchoolShow = false
@@ -253,7 +243,10 @@
 				this.active1 = false,
 					this.active2 = false
 				this.active3 = false
-				this.active4 = true
+				this.active4 = true;
+				// this.this.schoolmate.page=1;
+				// this.schoolmateList=[]
+
 			},
 
 			// 底部导航跳转
@@ -293,7 +286,7 @@
 					}
 					app.post(url, params, "get").then((res) => {
 						console.log(res)
-						this.schoolmateList =this.schoolmateList.concat(res) 
+						this.schoolmateList = this.schoolmateList.concat(res)
 					}).catch((err) => {
 						console.log(err)
 					})
@@ -318,6 +311,11 @@
 				var params = {}
 				app.post(url, params, "get").then((res) => {
 					console.log(res[0].name)
+					let obj = {
+						id: '',
+						name: '全部'
+					}
+					res.unshift(obj)
 					this.upList = res
 				}).catch((err) => {
 					console.log(err)
@@ -377,11 +375,15 @@
 					console.log(err)
 				})
 			},
-
 			//点击选中的升学方式
 			selectup(e) {
+				console.log('34783443797')
 				this.schoolmate.up_id = e.currentTarget.dataset.id
-				console.log(e.currentTarget.dataset.id)
+				this.schoolmate.university_id=''
+				this.schoolmate.graduated_id=''
+				this.schoolmate.page = 1;
+				this.word='';
+				this.schoolmateList = []
 				this.getmatelist()
 				this.isStyleShow = false
 			},
@@ -389,18 +391,25 @@
 			//点击选中的专业
 			selectgraduated(e) {
 				this.schoolmate.graduated_id = e.currentTarget.dataset.id;
-				console.log('选择的id',this.schoolmate.graduated_id)
-				this.isMajorShow = false
+				console.log('选择的id', this.schoolmate.graduated_id)
+				this.isMajorShow = false;
+				this.schoolmate.page = 1;
+				this.schoolmate.page=1,
+				this.schoolmate.university_id=''
+				this.schoolmate.up_id=''
+				this.word=''
+				this.schoolmateList = []
 				this.getmatelist()
-
-
 			},
 			//点击选中的学校
 			selectschool(e) {
-				this.schoolmate.university_id = e.currentTarget.dataset.id
-				console.log(e.currentTarget.dataset.id)
+				this.schoolmate.page = 1
+				this.schoolmate.graduated_id = ''
+				this.schoolmate.up_id = ''
+				this.word = '';
 				this.isDiquShow = false
-
+				this.schoolmate.university_id = e.currentTarget.dataset.id;
+				this.schoolmateList=[]
 				this.getmatelist()
 
 			},
@@ -415,12 +424,12 @@
 			},
 			//点击全部省
 			selectallprovince() {
-				 this.schoolmate.page=1,
-				 this.schoolmate.university_id=''
-				 this.schoolmate.graduated_id=''
-				 this.schoolmate.up_id=''
-				 this.word=''
-				
+				this.schoolmate.page = 1,
+				this.schoolmate.university_id = ''
+				this.schoolmate.graduated_id = ''
+				this.schoolmate.up_id = ''
+				this.word = ''
+				this.schoolmateList = []
 				this.getmatelist()
 				this.isDiquShow = false
 			},
@@ -437,8 +446,6 @@
 					this.schoolList = [];
 					this.getAllSchool()
 				}
-
-
 			},
 			todetile(e) {
 				if (uni.getStorageSync('token') == '') {
@@ -455,8 +462,6 @@
 				}
 
 			}
-
-
 		},
 		onLoad(options) {
 			console.log(options.type)
@@ -469,9 +474,9 @@
 			this.getAllProvince()
 
 		},
-		onShow(){
-			this.page=1;
-			this.schoolmateList=[]
+		onShow() {
+			this.page = 1;
+			this.schoolmateList = []
 			this.getmatelist()
 		}