班级

components/shopping/goodsInputItem.vue

@@ -0,0 +1,247 @@
+<template>
+	<view>
+		<view v-if="detail.templateType!=null">
+			<u-line color="#D6D6DB" />
+			<view v-if="detail.templateType=='class'" style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(0)">
+				<view style="color: #666666;font-size: 24rpx;">{{gradeIndex<0?'选择班级':gradeList[gradeIndex].className}}</view>
+				<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
+			</view>
+			<view v-if="detail.templateType=='apply'"  style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(1)">
+				<view style="color: #666666;font-size: 24rpx;" >{{gradeIndex<0?'报考地区':gradeList[gradeIndex].className}}</view>
+				<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
+			</view>
+		</view>
+		
+		<u-popup v-model="show" mode="bottom"border-radius="40">
+			<view class="popup_box">
+				<view style="margin-bottom: 20rpx;">
+					<view class="line1"></view>
+					<view class="grade">选择班级</view>
+				</view>
+				<u-line color="#D6D6DB" />
+				<view>
+					<scroll-view scroll-y="true" style="height: 500rpx;">
+						<view>
+							<u-radio-group v-model="gradeValue" @change="radioGroupChange">
+								<view v-for="(item, index) in gradeList" :key="index" >
+									<view style="display: flex;align-items: center;padding: 20rpx;">
+										<view>
+											<u-radio
+												shape="circle"
+												:name="index"
+											></u-radio>
+										</view>
+										<view :class="item.checked?'white-box blue-box':'white-box'" >
+											<view>
+												<view class="blackTxt">{{item.className}}</view>
+												<view class="redTxt" v-if="item.classEndTime">有效期至：{{$method.timestampToTime(item.classEndTime)}}</view>
+												<view class="redTxt" v-if="item.classEndTime">本班还剩{{$method.GetRTime(item.classEndTime)}}天将结束学习</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</u-radio-group>
+						</view>
+					</scroll-view>
+				</view>
+				<view class="confrim-btn">
+					<view class="okBtn" @click="okPopup(0)">确定</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show1" mode="bottom"border-radius="40">
+			<view class="popup_box">
+				<view style="margin-bottom: 20rpx;">
+					<view class="line1"></view>
+					<view class="grade">选择考期/地区</view>
+				</view>
+				<u-line color="#D6D6DB" />
+				<view style="display: flex;height: 500rpx;">
+					<view style="width: 50%;">
+						<view class="topTxt">考期</view>
+						<view>
+							<picker-view  :indicator-style="indicatorStyle" :value="value" @change="bindChangeE" class="picker-view">
+								<picker-view-column>
+									<view class="picker-item" v-for="(item,index) in examine" :key="index">{{item.examineName}}</view>
+								</picker-view-column>
+							</picker-view>
+						</view>
+					</view>
+					<view style="width: 50%;">
+						<view class="topTxt">地区</view>
+						<view>
+							<picker-view  :indicator-style="indicatorStyle" :value="value" @change="bindChange" class="picker-view">
+								<picker-view-column>
+									<view class="picker-item" v-for="(item,index) in provinceList" :key="index">{{item.areaName}}</view>
+								</picker-view-column>
+								<picker-view-column>
+									<view class="picker-item" v-for="(item,index) in cityList" :key="index">{{item.areaName}}</view>
+								</picker-view-column>
+							</picker-view>
+						</view>
+					</view>
+				</view>
+				<view class="confrim-btn">
+					<view class="okBtn" @click="okPopup(1)">确定</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+export default {
+	name: 'goodsInputItem',
+	props: {
+		detail: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			gradeValue:-1,
+			gradeIndex:-1,
+			show:false,
+			show1:false,
+			indicatorStyle: `height: 50px;`,
+			gradeList:[],
+			provinceList:[],
+			cityList:[],
+			pAreaIndex:0,
+			cAreaIndex:0,
+			examine:[],
+			eAreaIndex:0,
+			applyObj:{
+				applyAreasJson:null,
+				examDateJson:null
+			}
+	
+		};
+	},
+	onLoad() {},
+	created() {
+		
+	},
+	mounted() {
+		
+	},
+	methods: {
+		openPopup(index){
+			if(index==0){
+				this.show = true
+				this.goodsGradeList()
+			}else{
+				this.show1 = true
+				this.getProvinceList()
+			}
+			
+		},
+		okPopup(index){
+			if(index==0){
+				if(!this.checkData()){
+					return
+				}
+				this.gradeIndex = this.gradeValue
+				this.show = false
+			}else{
+				let examDate = 
+				this.show1 = false
+			}
+		},
+		checkData(){
+			if(this.detail.templateType=='class'){
+				if(this.gradeValue<0){
+					uni.showModal({
+						title: "提示",
+						content: '请选择班级',
+						showCancel: false
+					})
+					return false
+				}
+			}
+			else if(this.detail.templateType=='apply'){
+				if(!this.applyObj.applyAreasJson){
+					uni.showModal({
+						title: "提示",
+						content: '请选择报考地区',
+						showCancel: false
+					})
+					return false
+				}
+				if(!this.applyObj.examDateJson){
+					uni.showModal({
+						title: "提示",
+						content: '请选择考期',
+						showCancel: false
+					})
+					return false
+				}
+			}
+			return true;
+		},
+		bindChangeE(e){
+			console.log(e.detail.value)
+		},
+		bindChange(e) {
+			const val = e.detail.value
+			if(this.pAreaIndex!=e.detail.value[0]){
+				this.pAreaIndex = e.detail.value[0]
+				this.getCityList(this.provinceList[this.pAreaIndex].areaId)
+			}
+			if(this.cAreaIndex!=e.detail.value[1]){
+				this.cAreaIndex = e.detail.value[1]
+			}
+			
+		},
+		getExamine(id) {
+			let self = this
+			this.$api.getExamine({projectId:id}).then(res => {
+				if(res.data.code==200){
+					self.examine = res.data.rows
+				}
+			});
+		},
+		getCityList(id) {
+			let self = this
+			this.$api.getCityList({parentId:id}).then(res => {
+				if(res.data.code==200){
+					self.cityList = res.data.rows
+				}
+			});
+		},
+		getProvinceList() {
+			let self = this
+			if(self.provinceList.length>0){
+				return
+			}
+			this.$api.getProvinceList().then(res => {
+				if(res.data.code==200){
+					self.provinceList = res.data.rows
+					if(self.provinceList.length>0){
+						self.getCityList(self.provinceList[0].areaId)
+					}
+					
+				}
+			});
+		},
+	},computed: { ...mapGetters([]) },
+};
+</script>
+
+<style scoped>
+	.icon_up{
+		width: 24rpx;
+		height: 24rpx;
+	}
+.title{
+	font-size: 24rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #666666;
+	white-space:nowrap;
+	overflow:hidden;
+	text-overflow:ellipsis; 
+}
+</style>

pages/shopping/shoppingCart.vue

@@ -9,6 +9,7 @@
 			<view style="padding: 30rpx;padding-bottom: 98rpx;">
 				<uni-swipe-action>
 				 <u-checkbox-group
+				 @change="checkboxGroupChange"
 				     placement="column">
 						  <view>
 				<uni-swipe-action-item :autoClose="false" @change="swipeChange($event, item)" :show="item.show" v-for="(item,index) in list" :key="index" >
@@ -37,10 +38,16 @@
 								</view>
 								
 							</view>
-							<u-line color="#D6D6DB" />
-							<view style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(index)">
-								<view style="color: #666666;font-size: 24rpx;margin-left: 60rpx;">选择班级</view>
-								<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
+							<view v-if="item.templateType!=null">
+								<u-line color="#D6D6DB" />
+								<view v-if="item.templateType=='class'" style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(0,item,index)">
+									<view style="color: #666666;font-size: 24rpx;">{{!item.gradObj.className?'选择班级':item.gradObj.className}}</view>
+									<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
+								</view>
+								<view v-if="item.templateType=='apply'"  style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(1,item,index)">
+									<view style="color: #666666;font-size: 24rpx;" >{{!item.applyAreas.areaName?'报考地区':item.examDate.examineName+'-'+item.applyAreas.areaName+'-'+item.applyAreas.cityName}}</view>
+									<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -75,83 +82,81 @@
 					</view>
 				</view>
 			</view>
-			
-			<u-popup v-model="show" mode="bottom"border-radius="40">
-				<view class="popup_box">
-					<view style="margin-bottom: 20rpx;">
-						<view class="line1"></view>
-						<view class="grade">选择班级</view>
-					</view>
-					<u-line color="#D6D6DB" />
-					<view>
-						<scroll-view scroll-y="true" style="height: 500rpx;">
-							<view>
-								<u-checkbox-group @change="checkboxGroupChange1">
-									<view v-for="(item, index) in list" :key="index" >
-										<view style="display: flex;align-items: center;padding: 20rpx;">
+		<u-popup v-model="show" mode="bottom"border-radius="40">
+			<view class="popup_box">
+				<view style="margin-bottom: 20rpx;">
+					<view class="line1"></view>
+					<view class="grade">选择班级</view>
+				</view>
+				<u-line color="#D6D6DB" />
+				<view>
+					<scroll-view scroll-y="true" style="height: 500rpx;">
+						<view>
+							<u-radio-group v-model="gradeValue" >
+								<view v-for="(item, index) in gradeList" :key="index" >
+									<view style="display: flex;align-items: center;padding: 20rpx;">
+										<view>
+											<u-radio
+												shape="circle"
+												:name="index"
+											></u-radio>
+										</view>
+										<view :class="item.checked?'white-box blue-box':'white-box'" >
 											<view>
-												<u-checkbox
-													shape="circle"
-													@change="checkboxChange1" 
-													v-model="item.checked" 
-													:name="item.name"
-												></u-checkbox>
-											</view>
-											<view :class="item.checked?'white-box blue-box':'white-box'" >
-												<view>
-													<view class="blackTxt">2021年第1期二级建造师继续教育选修课（市政）标题过长换行显示</view>
-													<view class="redTxt">有效期至：2021/11/30</view>
-													<view class="redTxt">本班还剩41天将结束学习</view>
-												</view>
+												<view class="blackTxt">{{item.className}}</view>
+												<view class="redTxt" v-if="item.classEndTime">有效期至：{{$method.timestampToTime(item.classEndTime)}}</view>
+												<view class="redTxt" v-if="item.classEndTime">本班还剩{{$method.GetRTime(item.classEndTime)}}天将结束学习</view>
 											</view>
 										</view>
 									</view>
-								</u-checkbox-group>
-							</view>
-						</scroll-view>
-					</view>
-					<view class="confrim-btn">
-						<view class="okBtn">确定</view>
-					</view>
-				</view>
-			</u-popup>
-			<u-popup v-model="show1" mode="bottom"border-radius="40">
-				<view class="popup_box">
-					<view style="margin-bottom: 20rpx;">
-						<view class="line1"></view>
-						<view class="grade">选择考期/地区</view>
-					</view>
-					<u-line color="#D6D6DB" />
-					<view style="display: flex;height: 500rpx;">
-						<view style="width: 50%;">
-							<view class="topTxt">考期</view>
-							<view>
-								<picker-view  :indicator-style="indicatorStyle" :value="value" @change="bindChange" class="picker-view">
-									<picker-view-column>
-										<view class="picker-item" v-for="(item,index) in list1" :key="index">{{item.label}}</view>
-									</picker-view-column>
-								</picker-view>
-							</view>
+									<u-line color="#D6D6DB" />
+								</view>
+							</u-radio-group>
 						</view>
-						<view style="width: 50%;">
-							<view class="topTxt">地区</view>
-							<view>
-								<picker-view  :indicator-style="indicatorStyle" :value="value" @change="bindChange" class="picker-view">
-									<picker-view-column>
-										<view class="picker-item" v-for="(item,index) in list2" :key="index">{{item.label}}</view>
-									</picker-view-column>
-									<picker-view-column>
-										<view class="picker-item" v-for="(item,index) in list3" :key="index">{{item.label}}</view>
-									</picker-view-column>
-								</picker-view>
-							</view>
+					</scroll-view>
+				</view>
+				<view class="confrim-btn">
+					<view class="okBtn" @click="okPopup(0)">确定</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show1" mode="bottom"border-radius="40">
+			<view class="popup_box">
+				<view style="margin-bottom: 20rpx;">
+					<view class="line1"></view>
+					<view class="grade">选择考期/地区</view>
+				</view>
+				<u-line color="#D6D6DB" />
+				<view style="display: flex;height: 500rpx;">
+					<view style="width: 50%;">
+						<view class="topTxt">考期</view>
+						<view>
+							<picker-view  :indicator-style="indicatorStyle" :value="value" @change="bindChangeE" class="picker-view">
+								<picker-view-column>
+									<view class="picker-item" v-for="(item,index) in examine" :key="index">{{item.examineName}}</view>
+								</picker-view-column>
+							</picker-view>
 						</view>
 					</view>
-					<view class="confrim-btn">
-						<view class="okBtn">确定</view>
+					<view style="width: 50%;">
+						<view class="topTxt">地区</view>
+						<view>
+							<picker-view  :indicator-style="indicatorStyle" :value="value" @change="bindChange" class="picker-view">
+								<picker-view-column>
+									<view class="picker-item" v-for="(item,index) in provinceList" :key="index">{{item.areaName}}</view>
+								</picker-view-column>
+								<picker-view-column>
+									<view class="picker-item" v-for="(item,index) in cityList" :key="index">{{item.areaName}}</view>
+								</picker-view-column>
+							</picker-view>
+						</view>
 					</view>
 				</view>
-			</u-popup>
+				<view class="confrim-btn">
+					<view class="okBtn" @click="okPopup(1)">确定</view>
+				</view>
+			</view>
+		</u-popup>
 		</view>
 		<view v-show="!isLogin">
 			<view style="display: flex;align-items:center;flex-direction: column;margin-top: 40%;font-size: 32rpx;">
@@ -163,67 +168,35 @@
 </template>
 
 <script>
+	import goodsInputItem from '@/components/shopping/goodsInputItem.vue';
 	export default {
+		components: {
+			goodsInputItem
+		},
 		data() {
 			return {
+				gradeValue:-1,
 				isLogin:false,
 				allChecked:false,
 				checkboxValue1:[],
 				list: [
-				],
-				list1:[
-						{
-							value: '1',
-							label: '2021年6月'
-						},
-						{
-							value: '2',
-							label: '2021年7月'
-						}
-					],
-					list1:[
-						{
-							value: '1',
-							label: '2021年6月'
-						},
-						{
-							value: '2',
-							label: '2021年7月'
-						},
-						{
-							value: '3',
-							label: '2021年8月'
-						},
-						{
-							value: '4',
-							label: '2021年9月'
-						}
-					],
-					list2:[
-						{
-							value: '1',
-							label: '广东'
-						},
-						{
-							value: '2',
-							label: '北京'
-						}
-					],
-					list3:[
-						{
-							value: '1',
-							label: '广州'
-						},
-						{
-							value: '2',
-							label: '深圳'
-						}
-					],
-					value1:'',
+				],	
+				value1:'',
 				show:false,
 				show1:false,
 				totalPrice:0.00,
-				isOld:false
+				isOld:false,
+				checkboxList:[],
+				gradeList:[],
+				examine:[],
+				provinceList:[],
+				cityList:[],
+				detail:{},
+				detailIndex:-1,
+				applyObj:{
+					applyAreasJson:null,
+					examDateJson:null
+				}
 			}
 		},
 		onLoad(option) {
@@ -242,6 +215,152 @@
 			
 		},
 		methods: {
+			checkAreaData(){
+				if(this.examine.length==0){
+					uni.showModal({
+						title: "提示",
+						content: '请选择考期',
+						showCancel: false
+					})
+					return false
+				}
+				if(this.provinceList.length==0){
+					uni.showModal({
+						title: "提示",
+						content: '请选择报考地区',
+						showCancel: false
+					})
+					return false
+				}
+				if(this.cityList.length==0){
+					uni.showModal({
+						title: "提示",
+						content: '请选择报考地区',
+						showCancel: false
+					})
+					return false
+				}
+				return true
+			},
+			checkData(){
+				if(this.detail.templateType=='class'){
+					if(this.gradeValue<0){
+						uni.showModal({
+							title: "提示",
+							content: '请选择班级',
+							showCancel: false
+						})
+						return false
+					}
+				}
+				else if(this.detail.templateType=='apply'){
+					if(!this.applyObj.applyAreasJson){
+						uni.showModal({
+							title: "提示",
+							content: '请选择报考地区',
+							showCancel: false
+						})
+						return false
+					}
+					if(!this.applyObj.examDateJson){
+						uni.showModal({
+							title: "提示",
+							content: '请选择考期',
+							showCancel: false
+						})
+						return false
+					}
+				}
+				return true;
+			},
+			//弹出框确定
+			okPopup(index){
+				if(index==0){
+					if(!this.checkData()){
+						return
+					}
+					this.gradeIndex = this.gradeValue
+					this.show = false
+				}else{
+					if(!this.checkAreaData()){
+						return
+					}
+					this.examDate = this.examine[this.examIndex]
+					let pData = this.provinceList[this.pAreaIndex]
+					let cData = this.cityList[this.cAreaIndex]
+					this.applyAreas = {areaName:pData.areaName,areaId:pData.areaId,cityId:cData.areaId,cityName:cData.areaName}
+					this.applyObj.applyAreasJson = JSON.stringify(this.applyAreas)
+					this.applyObj.examDateJson = JSON.stringify(this.examDate)
+					this.show1 = false
+				}
+			},
+			getExamine(id) {
+				let self = this
+				this.$api.getExamine({projectId:id}).then(res => {
+					if(res.data.code==200){
+						self.examine = res.data.rows
+					}
+				});
+			},
+			getCityList(id) {
+				let self = this
+				this.$api.getCityList({parentId:id}).then(res => {
+					if(res.data.code==200){
+						self.cityList = res.data.rows
+					}
+				});
+			},
+			getProvinceList() {
+				let self = this
+				if(self.provinceList.length>0){
+					return
+				}
+				this.$api.getProvinceList().then(res => {
+					if(res.data.code==200){
+						self.provinceList = res.data.rows
+						if(self.provinceList.length>0){
+							self.getCityList(self.provinceList[0].areaId)
+						}
+						
+					}
+				});
+			},
+			goodsGradeList(goodsId) {
+				let self = this
+				this.$api.goodsGradeList({goodsId:goodsId}).then(res => {
+					if(res.data.code==200){
+						self.gradeList = res.data.rows
+						if(self.gradeList.length==0){
+							let item = {
+								className:'系统分班',
+								gradeId:0
+							}
+							self.gradeList.push(item)
+						}
+					}
+				});
+			},
+			openPopup(index,item,itemIndex){
+				this.detail = item
+				this.detailIndex = itemIndex
+				if(index==0){
+					this.gradeValue = -1
+					this.show = true
+					this.goodsGradeList(item.goodsId)
+				}else{
+					this.applyObj={
+						applyAreasJson:null,
+						examDateJson:null
+					}
+					this.show1 = true
+					this.getProvinceList()
+					self.getExamine(item.projectId)
+				}
+				
+			},
+			checkboxGroupChange(e){
+				this.checkboxList = e
+			},
 			countPrice(list){
 				
 			},
@@ -256,6 +375,7 @@
 				let self = this
 				this.allChecked = false
 				this.totalPrice = 0.00
+				this.checkboxList =[]
 				this.$api.cartList().then(res => {
 					if(res.data.code==200){
 						for (let i = 0; i < res.data.rows.length; i++) {
@@ -267,6 +387,9 @@
 								item.disabled = false
 							}
 							item.show = false
+							item.gradObj = {} //存储班级
+							item.applyAreas = {} 
+							item.examDate = {} 
 						}
 						self.list = res.data.rows
 					}
@@ -284,6 +407,8 @@
 				item.show = e;
 			},
 			goBuy(){
+				console.log(this.checkboxList,66)
+				return
 				this.$navTo.togo('/pages2/order/confirm_pay');
 			},
 			checkboxChange(n) {
@@ -294,24 +419,19 @@
 					this.totalPrice -= this.list[n.name].standPrice
 				}
 			},
-			openPopup(index){
-				if(index==0){
-					this.show = true
-				}else{
-					this.show1 = true
-				}
-				
-			},
 			checkboxAllChange(n){
 				this.totalPrice = 0.00
+				this.checkboxList = []
 				if(n.value){
 					for(let i =0;i<this.list.length;i++){
 						this.list[i].checked = true
 						this.totalPrice += this.list[i].standPrice
+						this.checkboxList.push(i)
 					}
 				}else{
 					for(let i =0;i<this.list.length;i++){
 						this.list[i].checked = false
+						
 					}
 				}
 			}
@@ -371,7 +491,6 @@
 	}
 	.white-box{
 		width: 646rpx;
-		height: 220rpx;
 		border-radius: 24rpx;
 		align-items: center;
 		display: flex;

pages2/components/shopping/goodsItem.vue

@@ -1,87 +0,0 @@
-<template>
-	<view style="margin: 20rpx 0;">
-		<view class="title" @click="openChapter(menuItem)">
-		<image src="/static/icon/up1.png" class="icon_up" v-if="down"></image>
-		<image src="/static/icon/down1.png" class="icon_up" v-if="!down"></image>
-		<text style="margin-left: 30rpx;">{{menuItem.name}}</text>
-		</view>
-		<view v-if="!down">
-			<view v-for="(itemM,indexM) in list" >
-				<courseSection  :menuItem="itemM"></courseSection>
-				<u-line v-if="indexM<list.length-1"></u-line>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import courseSection from '@/pages2/components/course/courseSection.vue';
-export default {
-	name: 'courseChapter',
-	props: {
-		menuItem: {
-			type: Object,
-			default: {}
-		}
-	},
-	components: {
-		courseSection
-	},
-	data() {
-		return {
-			down:true,
-			list:[]
-	
-		};
-	},
-	onLoad() {},
-	created() {
-		
-	},
-	mounted() {
-		
-	},
-	methods: {
-		openChapter(item){
-			this.down = !this.down
-			if(!this.down&&this.list.length==0){
-				this.getSectionList(item.id)
-			}
-		},
-		getSectionList(chapterId) {
-			let self = this
-			this.$api.sectionList({chapterId:chapterId}).then(res => {
-				if(res.data.code==200){
-					for(let i=0;i<res.data.data.length;i++){
-						let item = res.data.data[i]
-						item.id = item.sectionId
-						//判断是否试听
-						item.tryListen = false
-						if(self.goodsAuditionConfigIdList.indexOf(item.id)!==-1){
-							item.tryListen = true
-						}	
-					}
-					self.list = res.data.data
-				}
-			});
-		},
-	},computed: { ...mapGetters(['goodsAuditionConfigIdList']) },
-};
-</script>
-
-<style scoped>
-	.icon_up{
-		width: 24rpx;
-		height: 24rpx;
-	}
-.title{
-	font-size: 24rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #666666;
-	white-space:nowrap;
-	overflow:hidden;
-	text-overflow:ellipsis; 
-}
-</style>

pages2/order/confirm_list.vue

@@ -21,7 +21,7 @@
 							<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 						</view>
 						<view v-if="detail.templateType=='apply'"  style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(1)">
-							<view style="color: #666666;font-size: 24rpx;" >{{gradeIndex<0?'报考地区':gradeList[gradeIndex].className}}</view>
+							<view style="color: #666666;font-size: 24rpx;" >{{!applyAreas.areaName?'报考地区':examDate.examineName+'-'+applyAreas.areaName+'-'+applyAreas.cityName}}</view>
 							<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 						</view>
 					</view>
@@ -136,7 +136,9 @@ export default {
 			pAreaIndex:0,
 			cAreaIndex:0,
 			examine:[],
-			eAreaIndex:0,
+			examIndex:0,
+			applyAreas:{},
+			examDate:{},
 			applyObj:{
 				applyAreasJson:null,
 				examDateJson:null
@@ -186,6 +188,7 @@ export default {
 				}
 			});
 		},
+		//弹出框确定
 		okPopup(index){
 			if(index==0){
 				if(!this.checkData()){
@@ -194,10 +197,45 @@ export default {
 				this.gradeIndex = this.gradeValue
 				this.show = false
 			}else{
-				let examDate = 
+				if(!this.checkAreaData()){
+					return
+				}
+				this.examDate = this.examine[this.examIndex]
+				let pData = this.provinceList[this.pAreaIndex]
+				let cData = this.cityList[this.cAreaIndex]
+				this.applyAreas = {areaName:pData.areaName,areaId:pData.areaId,cityId:cData.areaId,cityName:cData.areaName}
+				this.applyObj.applyAreasJson = JSON.stringify(this.applyAreas)
+				this.applyObj.examDateJson = JSON.stringify(this.examDate)
 				this.show1 = false
 			}
 		},
+		checkAreaData(){
+			if(this.examine.length==0){
+				uni.showModal({
+					title: "提示",
+					content: '请选择考期',
+					showCancel: false
+				})
+				return false
+			}
+			if(this.provinceList.length==0){
+				uni.showModal({
+					title: "提示",
+					content: '请选择报考地区',
+					showCancel: false
+				})
+				return false
+			}
+			if(this.cityList.length==0){
+				uni.showModal({
+					title: "提示",
+					content: '请选择报考地区',
+					showCancel: false
+				})
+				return false
+			}
+			return true
+		},
 		checkData(){
 			if(this.detail.templateType=='class'){
 				if(this.gradeValue<0){
@@ -264,6 +302,7 @@ export default {
 		},
 		bindChangeE(e){
 			console.log(e.detail.value)
+			this.examIndex = e.detail.value[0]
 		},
 		bindChange(e) {
 			const val = e.detail.value
@@ -276,19 +315,6 @@ export default {
 			}
 			
 		},
-		checkboxChange(e) {
-			//console.log(e);
-		},
-		// 选中任一checkbox时，由checkbox-group触发
-		checkboxGroupChange(e) {
-			// console.log(e);
-		},
-		// 全选
-		checkedAll() {
-			this.list.map(val => {
-				val.checked = true;
-			})
-		},
 		openPopup(index){
 			if(index==0){
 				this.show = true
@@ -344,7 +370,6 @@ export default {
 	}
 	.white-box{
 		width: 646rpx;
-		height: 220rpx;
 		border-radius: 24rpx;
 		align-items: center;
 		display: flex;