Commit e5371bf5 authored by 黄奎's avatar 黄奎

样式修改

parent 9cf14ade
...@@ -96,16 +96,14 @@ ...@@ -96,16 +96,14 @@
<div class="left"> <div class="left">
<!-- 新增上课日期固定日期 --> <!-- 新增上课日期固定日期 -->
<view v-if="cx.edudata.ClassTimeList.length>0&&u.TenantId==27" class="sell"> <view v-if="cx.edudata.ClassTimeList.length>0&&u.TenantId==27" class="sell">
<view v-if="!cx.show" > <view v-if="!cx.show">
<view style='display: flex; <view style='display: flex;
justify-content: space-between;width: 100%;' v-if="cx.edudata.ClassTimeList[0].TypeStr=='固定日期'"> justify-content: space-between;width: 100%;' v-if="cx.edudata.ClassTimeList[0].TypeStr=='固定日期'">
<view> <view>
{{cx.edudata.ClassTimeList[0].TypeStr}}:&nbsp
{{cx.edudata.ClassTimeList[0].TypeStr}}:
{{cx.edudata.ClassTimeList[0].DateList[0]}} {{cx.edudata.ClassTimeList[0].DateList[0]}}
&nbsp{{cx.edudata.ClassTimeList[0].TimeStr}} &nbsp{{cx.edudata.ClassTimeList[0].TimeStr}}
</view> </view>
<view v-if='cx.edudata.ClassTimeList.length>1' <view v-if='cx.edudata.ClassTimeList.length>1'
@click.stop="remaining(cx)" :style="{ color: mainColor }" @click.stop="remaining(cx)" :style="{ color: mainColor }"
class="remaining">点击更多 class="remaining">点击更多
...@@ -115,11 +113,13 @@ ...@@ -115,11 +113,13 @@
<view style='display: flex; <view style='display: flex;
justify-content: space-between;width: 100%;' v-if="cx.edudata.ClassTimeList[0].TypeStr!='固定日期'"> justify-content: space-between;width: 100%;' v-if="cx.edudata.ClassTimeList[0].TypeStr!='固定日期'">
<view> <view>
{{cx.edudata.ClassTimeList[0].TypeStr}} {{cx.edudata.ClassTimeList[0].TypeStr}}
<text v-for="(itm,i3) in cx.edudata.ClassTimeList[0].DateList" <text v-for="(itm,i3) in cx.edudata.ClassTimeList[0].DateList"
:key="i3"> :key="i3">
{{itm}} {{itm}}
<text>&nbsp、</text> <text v-if="cx.edudata.ClassTimeList[0].DateList.length>1">
{{i3 === cx.edudata.ClassTimeList[0].DateList.length-1 ? ":":"、"}}</text>
<text v-else>&nbsp:</text>
</text> </text>
&nbsp{{cx.edudata.ClassTimeList[0].TimeStr}} &nbsp{{cx.edudata.ClassTimeList[0].TimeStr}}
</view> </view>
...@@ -136,16 +136,14 @@ ...@@ -136,16 +136,14 @@
:class="[cx.edudata.ClassTimeList[0].TypeStr!='固定日期'?'rema':'']"> :class="[cx.edudata.ClassTimeList[0].TypeStr!='固定日期'?'rema':'']">
<view v-for="(item,i) in cx.edudata.ClassTimeList" :key="i"> <view v-for="(item,i) in cx.edudata.ClassTimeList" :key="i">
<text v-if="item.TypeStr=='固定日期'"> <text v-if="item.TypeStr=='固定日期'">
{{item.TypeStr}} : {{item.TypeStr}} :&nbsp
</text> </text>
<text v-if="item.TypeStr!='固定日期'"> <text v-if="item.TypeStr!='固定日期'">
{{item.TypeStr}} {{item.TypeStr}}
</text> </text>
<text v-for="(item2,i2) in item.DateList"> <text v-for="(item2,i2) in item.DateList">
{{item2}} {{item2}}
<text v-if="i2!=item2.length-1">&nbsp、</text> <text>{{i2 === item.DateList.length-1 ? ":":"、"}}</text>
<text v-if="i2==item2.length-1"></text>
<!-- <text v-for="i2==item.DateList.length"></text> -->
</text> </text>
<text style="margin-right: 10px;">&nbsp{{item.TimeStr}}</text> <text style="margin-right: 10px;">&nbsp{{item.TimeStr}}</text>
</view> </view>
...@@ -153,9 +151,6 @@ ...@@ -153,9 +151,6 @@
class="remaining">收起</text> class="remaining">收起</text>
</view> </view>
</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"> <div v-if="cx.edudata.ClassNum&&u.TenantId==27" class="sell">
{{cx.edudata.ClassNum}} {{cx.edudata.ClassNum}}
...@@ -502,10 +497,6 @@ ...@@ -502,10 +497,6 @@
} }
}) })
let list = 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) { let addList = function(arr) {
arr.forEach(item => { arr.forEach(item => {
item.show = false item.show = false
...@@ -513,7 +504,7 @@ ...@@ -513,7 +504,7 @@
}; };
addList(list); addList(list);
this.g = list this.g = list
console.log((this.g, '===')) // console.log((this.g, '==='))
this.page_count = res.data.pageCount; this.page_count = res.data.pageCount;
if (this.page_count == 1 || this.page_count == 0) { if (this.page_count == 1 || this.page_count == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment