央视

components/cats/style44.vue

@@ -94,10 +94,68 @@
 								</div>
 								<div class="goodprice">
 									<div class="left">
-										<!-- 新增上课日期 -->
-										<div v-if="cx.edudata.ClassTime&&u.TenantId==27" class="sell">
-											{{cx.edudata.ClassTime}}
-										</div>
+										<!-- 新增上课日期固定日期 -->
+										<view v-if="cx.edudata.ClassTimeList.length>0&&u.TenantId==27" class="sell">
+											<view v-if="!cx.show" >
+												<view style='display: flex;
+											justify-content: space-between;width: 100%;' v-if="cx.edudata.ClassTimeList[0].TypeStr=='固定日期'">
+													<view>
+														
+															{{cx.edudata.ClassTimeList[0].TypeStr}}: 
+														{{cx.edudata.ClassTimeList[0].DateList[0]}}
+														&nbsp{{cx.edudata.ClassTimeList[0].TimeStr}}
+													</view>
+													
+													<view v-if='cx.edudata.ClassTimeList.length>1'
+														@click.stop="remaining(cx)" :style="{ color: mainColor }"
+														class="remaining">点击更多
+													</view>
+												</view>
+												<!-- 非固定 -->
+												<view style='display: flex;
+											justify-content: space-between;width: 100%;' v-if="cx.edudata.ClassTimeList[0].TypeStr!='固定日期'">
+													<view>
+													{{cx.edudata.ClassTimeList[0].TypeStr}}
+														<text v-for="(itm,i3) in cx.edudata.ClassTimeList[0].DateList"
+															:key="i3">
+															{{itm}}
+															<text>&nbsp、</text>
+														</text>
+														&nbsp{{cx.edudata.ClassTimeList[0].TimeStr}}
+													</view>
+
+													<view v-if='cx.edudata.ClassTimeList.length>1'
+														@click.stop="remaining(cx)" :style="{ color: mainColor }"
+														class="remaining">点击更多
+													</view>
+												</view>
+											</view>
+											<!-- 显示全部 -->
+											<!-- <view v-else>{{cx.edudata.show}}</view> -->
+											<view v-if="cx.show"
+												:class="[cx.edudata.ClassTimeList[0].TypeStr!='固定日期'?'rema':'']">
+												<view v-for="(item,i) in cx.edudata.ClassTimeList" :key="i">
+													<text v-if="item.TypeStr=='固定日期'">
+														{{item.TypeStr}} : 
+													</text>
+													<text v-if="item.TypeStr!='固定日期'">
+														{{item.TypeStr}}  
+													</text>
+													<text v-for="(item2,i2) in item.DateList">
+														{{item2}}
+														<text v-if="i2!=item2.length-1">&nbsp、</text>
+														<text v-if="i2==item2.length-1"></text>
+														<!-- <text v-for="i2==item.DateList.length"></text> -->
+													</text>
+													<text style="margin-right: 10px;">&nbsp{{item.TimeStr}}</text>
+												</view>
+												<text @click.stop="remaining2(cx)" :style="{ color: mainColor }"
+													class="remaining">收起</text>
+											</view>
+										</view>
+										<!-- <div v-if="cx.edudata.ClassTime&&u.TenantId==27" v-for="(item,i)in 10" class="sell">
+											2013-10-12
+										</div> -->
 										<!-- 上课次数 -->
 										<div v-if="cx.edudata.ClassNum&&u.TenantId==27" class="sell">
 											{{cx.edudata.ClassNum}}次
@@ -169,6 +227,8 @@
 		props: ["d", "h"],
 		data() {
 			return {
+				ind: 1,
+				show: false,
 				Theclass: [{
 						name: '年级',
 						id: '0',
@@ -239,6 +299,18 @@
 			// this.u = uni.getStorageSync('mall_UserInfo5')
 		},
 		methods: {
+			remaining(i) {
+				this.$nextTick(function() {
+					i.show = !i.show
+					console.log('llllllllllllllllllllllllll', i.edudata)
+				})
+
+				// this.$set(i.edudata, 'age', 88)
+			},
+			remaining2(i) {
+				i.show = !i.show
+				// this.ind=i
+			},
 			// 接口
 			initlist(i) {
 				this.isover = false;
@@ -395,6 +467,9 @@
 				}
 			},
 			init() {
+				let obj = {
+					show: false
+				}
 				this.isover = false;
 				this.loading = true;
 				this.msg.StoreId = uni.getStorageSync("storeId") ? uni.getStorageSync("storeId").storeId : 0;
@@ -426,7 +501,20 @@
 									})
 								}
 							})
-							this.g = this.g.concat(res.data.pageData);
+							let list = this.g.concat(res.data.pageData);
+							// this.g.forEach(x => {
+							// 	x.edudata=Object.assign({}, x.edudata, obj)
+							// 	console.log('4444',x.edudata)
+							// })
+							let addList = function(arr) {
+								arr.forEach(item => {
+									item.show = false
+								});
+							};
+							addList(list);
+							this.g = list
+							console.log((this.g, '==='))
+
 							this.page_count = res.data.pageCount;
 							if (this.page_count == 1 || this.page_count == 0) {
 								this.isover = true;
@@ -460,6 +548,17 @@
 </script>
 
 <style>
+	.rema {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.remaining {
+		display: inline-block;
+		flex: 1;
+		text-align: right;
+	}
+
 	.classification-text {
 		font-weight: 600;
 		font-size: 28rpx;

pages/address/address2.vue

@@ -37,13 +37,13 @@
 				<input type="number" placeholder-class="placeholderClass" class="uni-input inputM"
 					v-model="rules.StuTel" placeholder="输入11位手机号" maxlength="11" />
 			</view>
-			<view class="box-bg">
+			<view class="box-bg" style="padding-right: 0rpx">
 				<view class="title">
 					就读学校
 				</view>
-				<input class="uni-input inputM" style="padding-right: 10px;" placeholder-class="placeholderClass"
+				<input class="uni-input inputM" style="padding-right: 30px;" placeholder-class="placeholderClass"
 					v-model="rules.BaseCondition" placeholder="请选择" />
-				<view @click="formType(1)">
+				<view @click="formType(1)" class="schoo-fe">
 					<u-icon name="arrow" color="#9F9F9F" size="20"></u-icon>
 				</view>
 			</view>
@@ -90,9 +90,9 @@
 			</view> -->
 			<scroll-view scroll-y="true" style="height:100%;">
 				<view v-if='type==1' class="list" :class="[actuve==i?'list2':'']" v-for="(item, i) in schoollist"
-					:key="i" @click="masklist(item.Content,i)">
+					:key="i" @click="masklist(item.ConfigName,i)">
 					<view>
-						{{item.Content}}
+						{{item.ConfigName}}
 					</view>
 					<view v-if="actuve==i">
 						<u-icon name="success" size="20"></u-icon>
@@ -289,7 +289,7 @@
 						this.$refs.calendar.open();
 						break;
 					case 1:
-						testCmd = "/api/WeChatPublic/GetStuSchoolClass";
+						testCmd = "/api/WeChatPublic/GetPublicSchool";
 						postMsg = {
 							Type: 1
 						};
@@ -338,6 +338,17 @@
 </script>
 
 <style>
+	.uni-calendar__content{
+		z-index: 1000 !important;
+	}
+	.schoo-fe{
+		width: 72rpx;
+		    /* text-align: right; */
+		    /* display: inline-block; */
+		    display: flex;
+		    /* justify-content: space-around; */
+		   /* justify-content: flex-end; */
+	}
 	.gender-name {
 		font-size: 30rpx;
 		font-family: PingFang SC;