修改方法

pages/address/address2.vue

@@ -2,7 +2,9 @@
 	<view style="position: relative;" class="view-box">
 		<view class="box">
 			<view class="box-img">
-				<image style="width: 100rpx; height: 50rpx;;" src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png' mode="aspectFill"></image>
+				<image style="width: 100rpx; height: 50rpx;;"
+					src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png'
+					mode="aspectFill"></image>
 			</view>
 			<view class="box-bg">
 				<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="rules.StuName"
@@ -15,7 +17,7 @@
 						:class="[index==i?'gender':'gender2'] ">{{item.name}}</text>
 				</view>
 			</view>
-			<view class="box-bg" @click="calendar()">
+			<view class="box-bg" @click="formType(0)">
 				<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="rules.StuBirth"
 					placeholder="公历生日" />
 				<view>
@@ -30,17 +32,17 @@
 				<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="rules.BaseCondition"
 					placeholder="就读学校" />
 				<view>
-					<u-icon @click="school()" name="arrow" color="#9F9F9F" size="20"></u-icon>
+					<u-icon @click="formType(1)" name="arrow" color="#9F9F9F" size="20"></u-icon>
 				</view>
 			</view>
-			<view class="box-bg" @click="gradess()">
+			<view class="box-bg" @click="formType(2)">
 				<input maxlength="0" readonly="readonly" class="uni-input inputM"
 					style='margin-left: 10px;margin-top: 5px;' v-model="rules.DemandPoint" placeholder="就读年级" />
 				<view>
 					<u-icon name="arrow" color="#9F9F9F" size="20"></u-icon>
 				</view>
 			</view>
-			<view class="box-bg" @click="community()">
+			<view class="box-bg" @click="formType(3)">
 				<input maxlength="0" class="uni-input inputM" readonly="readonly"
 					style='margin-left: 10px;margin-top: 5px;' v-model="rules.School_Id" placeholder="报名校区" />
 				<view>
@@ -52,22 +54,22 @@
 					v-model="rules.ConsultingResults" placeholder="如何知道进阶思维" />
 			</view>
 			<!-- 日历弹窗 -->
-			<uni-calendar v-show="show"  ref="calendar" :insert="false" @confirm="confirm" @close="close"  />
+			<uni-calendar v-show="show" ref="calendar" :insert="false" @confirm="confirm" @close="close" />
 		</view>
 		<!-- 学校弹窗 -->
 		<u-popup v-model="show2" mode="right" length="80%">
 			<view class="school-bg">
 				<text>
 					<!-- <u-icon name="arrow-left" size="20"></u-icon> -->
-					<text class="school">选择就读学校</text>
+					<text class="school">{{title}}</text>
 				</text>
 			</view>
 			<!-- <view class="search">
 				<u-search placeholder="请输入名称" v-model="keyword"></u-search>
 			</view> -->
 			<scroll-view scroll-y="true" style="height:100%;">
-				<view class="list" :class="[actuve==i?'list2':'']" v-for="(item, i) in schoollist" :key="i"
-					@click="masklist(item.Content,i)">
+				<view v-if='type==1' class="list" :class="[actuve==i?'list2':'']" v-for="(item, i) in schoollist"
+					:key="i" @click="masklist(item.Content,i)">
 					<view>
 						{{item.Content}}
 					</view>
@@ -80,7 +82,7 @@
 		<!-- 年级弹窗 -->
 		<u-popup v-model="show3" mode="bottom" length="auto">
 			<scroll-view scroll-y="true" style="height:400rpx;">
-				<view v-for="(item, i) in DemandPoint" :key="i">
+				<view v-for="(item, i) in schoollist" :key="i">
 					<view class="list" :class="[actuve3==i?'list2':'']" @click="grades(item.Content,i)">
 						<view>{{item.Content}}</view>
 						<view v-if="actuve3==i">
@@ -95,16 +97,12 @@
 		<u-popup v-model="show4" mode="right" length="80%">
 			<view class="school-bg">
 				<text>
-					<!-- <u-icon name="arrow-left" size="20"></u-icon> -->
 					<text class="school">选择校区</text>
 				</text>
 			</view>
-			<!-- <view class="search">
-				<u-search placeholder="请输入名称" v-model="keyword"></u-search>
-			</view> -->
 			<scroll-view scroll-y="true" style="height:100%;">
-				<view class="list" :class="[actuve2==i?'list2':'']" v-for="(item, i) in campus" :key="i"
-					@click="masklist2(item,i)">
+				<view class="list" :class="[actuve2==i?'list2':'']" v-for="(item, i) in schoollist" :key="i"
+					@click="campus(item,i)">
 					<view>
 						{{item.SName}}
 					</view>
@@ -127,16 +125,16 @@
 	export default {
 		data() {
 			return {
+				title: '选择就读学校',
 				u: {},
 				School_Id: '', //要传的校区id
-				schoollist: [], //学校
-				DemandPoint: [], //班级
-				campus: [], //校区
+				schoollist: [], //列表
 				Type: '',
 				communitys: false,
 				actuve: -1,
 				actuve2: -1,
 				actuve3: -1,
+				type: -1,
 				show: false, //日历
 				show2: false, //学校
 				show3: false, //年级
@@ -212,13 +210,7 @@
 				let that = this;
 				that.requestJJSWAdmin(testCmd, postMsg,
 					(res) => {
-						if (postMsg.Type == 1) {
-							that.schoollist = res.data.Data
-						} else if (postMsg.Type == 2) {
-							that.DemandPoint = res.data.Data
-						} else if (that.show4) {
-							that.campus = res.data.Data
-						}
+						that.schoollist = res.data.Data
 					}
 				);
 			},
@@ -258,51 +250,57 @@
 				this.index = i
 				this.rules.StuSex = item.id
 			},
-			calendar() {
-				this.show = true
-				this.$refs.calendar.open();
-			},
 			close() {
 				this.show = false
 				console.log('弹窗关闭');
 			},
-			// 学校
-			school() {
-				testCmd = "/api/WeChatPublic/GetStuSchoolClass";
-				postMsg = {
-					Type: 1
-				};
+			// 表单切换
+			formType(type) {
+				switch (type) {
+					case 0:
+						this.show = true
+					 this.$refs.calendar.open();
+						break;
+					case 1:
+						testCmd = "/api/WeChatPublic/GetStuSchoolClass";
+						postMsg = {
+							Type: 1
+						};
+						this.show2 = true
+						this.title = '选择就读学校'
+						break;
+					case 2:
+						testCmd = "/api/WeChatPublic/GetStuSchoolClass";
+						postMsg = {
+							Type: 2
+						};
+						this.show3 = true
+						break;
+					case 3:
+						testCmd = "/api/WeChatPublic/GetSchoolList";
+						postMsg = {
+							Group_Id: ""
+						};
+						this.show4 = true
+						break;
+					default:
+						console.log('其他')
+				}
+				this.type = type
 				this.initlist()
-				this.show2 = true
 			},
 			masklist(item, i) {
 				this.actuve = i
 				this.rules.BaseCondition = item
 				this.show2 = false
 			},
-			gradess() {
-				testCmd = "/api/WeChatPublic/GetStuSchoolClass";
-				postMsg = {
-					Type: 2
-				};
-				this.initlist()
-				this.show3 = true
-			},
 			// 年级
 			grades(item, i) {
 				this.actuve3 = i
 				this.rules.DemandPoint = item
 				this.show3 = false
 			},
-			community() {
-				testCmd = "/api/WeChatPublic/GetSchoolList";
-				postMsg = {
-					Group_Id: ""
-				};
-				this.initlist()
-				this.show4 = true
-			},
-			masklist2(item, i) {
+			campus(item, i) {
 				this.actuve2 = i
 				this.rules.School_Id = item.SName
 				this.School_Id = item.SId