Merge branch 'master' of http://122.114.59.91:8099/xh/zzxyt-uniapp
正在显示
32 个修改的文件
包含
646 行增加
和
799 行删除
| @@ -310,7 +310,8 @@ | @@ -310,7 +310,8 @@ | ||
| 310 | "path": "stu_selection/stu_selection", | 310 | "path": "stu_selection/stu_selection", |
| 311 | "style": { | 311 | "style": { |
| 312 | "navigationBarTitleText": "听课教室选座", | 312 | "navigationBarTitleText": "听课教室选座", |
| 313 | - "enablePullDownRefresh": false | 313 | + "enablePullDownRefresh": false, |
| 314 | + "navigationStyle": "custom" | ||
| 314 | } | 315 | } |
| 315 | 316 | ||
| 316 | }, { | 317 | }, { |
| @@ -590,7 +591,8 @@ | @@ -590,7 +591,8 @@ | ||
| 590 | "path": "oneMyCredit/oneMyCredit", | 591 | "path": "oneMyCredit/oneMyCredit", |
| 591 | "style": { | 592 | "style": { |
| 592 | "navigationBarTitleText": "我的学分", | 593 | "navigationBarTitleText": "我的学分", |
| 593 | - "enablePullDownRefresh": false | 594 | + "enablePullDownRefresh": false, |
| 595 | + "navigationStyle": "custom" | ||
| 594 | } | 596 | } |
| 595 | 597 | ||
| 596 | }, { | 598 | }, { |
| 1 | <template> | 1 | <template> |
| 2 | <view class="study"> | 2 | <view class="study"> |
| 3 | <!-- 学习 --> | 3 | <!-- 学习 --> |
| 4 | - <view class="header-wrap"> | ||
| 5 | - <view class="nav-all-wrap no-margin area flex"> | 4 | + <view class="nav-all-wrap area flex no-margin"> |
| 6 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/twoMailbox/twoMailbox`)"> | 5 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/twoMailbox/twoMailbox`)"> |
| 7 | <view class="nav-img-wrap flex"> | 6 | <view class="nav-img-wrap flex"> |
| 8 | - <image class="nav-img" src="/static/images/xzxx.png" mode="aspectFit"></image> | 7 | + <image class="nav-img" src="/static/imagesV2/study/xzxx.png" mode="aspectFit"></image> |
| 9 | </view> | 8 | </view> |
| 10 | <view class="nav-text"> | 9 | <view class="nav-text"> |
| 11 | 校长信箱 | 10 | 校长信箱 |
| @@ -13,7 +12,7 @@ | @@ -13,7 +12,7 @@ | ||
| 13 | </view> | 12 | </view> |
| 14 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/twoCurriculum/twoCurriculum`)"> | 13 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/twoCurriculum/twoCurriculum`)"> |
| 15 | <view class="nav-img-wrap flex"> | 14 | <view class="nav-img-wrap flex"> |
| 16 | - <image class="nav-img" src="/static/images/kcb.png" mode="aspectFit" /> | 15 | + <image class="nav-img" src="/static/imagesV2/study/kcb.png" mode="aspectFit" /> |
| 17 | </view> | 16 | </view> |
| 18 | <view class="nav-text"> | 17 | <view class="nav-text"> |
| 19 | 课程表 | 18 | 课程表 |
| @@ -23,7 +22,7 @@ | @@ -23,7 +22,7 @@ | ||
| 23 | <view class="nav-all-wrap area flex"> | 22 | <view class="nav-all-wrap area flex"> |
| 24 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/twoRule/twoRule`)"> | 23 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/twoRule/twoRule`)"> |
| 25 | <view class="nav-img-wrap flex"> | 24 | <view class="nav-img-wrap flex"> |
| 26 | - <image class="nav-img" src="/static/images/xjxg.png" mode="aspectFit"></image> | 25 | + <image class="nav-img" src="/static/imagesV2/study/xjxg.png" mode="aspectFit"></image> |
| 27 | </view> | 26 | </view> |
| 28 | <view class="nav-text"> | 27 | <view class="nav-text"> |
| 29 | 校纪校规 | 28 | 校纪校规 |
| @@ -31,18 +30,18 @@ | @@ -31,18 +30,18 @@ | ||
| 31 | </view> | 30 | </view> |
| 32 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/twoClassRules/twoClassRules`)"> | 31 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/twoClassRules/twoClassRules`)"> |
| 33 | <view class="nav-img-wrap flex"> | 32 | <view class="nav-img-wrap flex"> |
| 34 | - <image class="nav-img" src="/static/images/bjbg.png" mode="aspectFit" /> | 33 | + <image class="nav-img" src="/static/imagesV2/study/bjbg.png" mode="aspectFit" /> |
| 35 | </view> | 34 | </view> |
| 36 | <view class="nav-text"> | 35 | <view class="nav-text"> |
| 37 | 班级班规 | 36 | 班级班规 |
| 38 | </view> | 37 | </view> |
| 39 | </view> | 38 | </view> |
| 40 | </view> | 39 | </view> |
| 41 | - </view> | 40 | + |
| 42 | <view class="nav-all-wrap area flex"> | 41 | <view class="nav-all-wrap area flex"> |
| 43 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/oneMyCredit/oneMyCredit`)"> | 42 | <view class="nav-wrap flex" @tap="$sjuNav.navigateTo(`/pagesB/oneMyCredit/oneMyCredit`)"> |
| 44 | <view class="nav-img-wrap flex"> | 43 | <view class="nav-img-wrap flex"> |
| 45 | - <image class="nav-img" src="/static/images/xfqk.png" mode="aspectFit"></image> | 44 | + <image class="nav-img" src="/static/imagesV2/study/xfqk.png" mode="aspectFit"></image> |
| 46 | </view> | 45 | </view> |
| 47 | <view class="nav-text"> | 46 | <view class="nav-text"> |
| 48 | 学分情况 | 47 | 学分情况 |
| @@ -52,15 +51,16 @@ | @@ -52,15 +51,16 @@ | ||
| 52 | <view class="nav-wrap flex" @tap="getxzdata" data-url="/pagesStu/stu_selection/stu_selection"> | 51 | <view class="nav-wrap flex" @tap="getxzdata" data-url="/pagesStu/stu_selection/stu_selection"> |
| 53 | 52 | ||
| 54 | <view class="nav-img-wrap flex"> | 53 | <view class="nav-img-wrap flex"> |
| 55 | - <image class="nav-img" src="/static/images/tkjsxz.png" mode="aspectFit" /> | 54 | + <image class="nav-img" src="/static/imagesV2/study/tkjsxz.png" mode="aspectFit" /> |
| 56 | </view> | 55 | </view> |
| 57 | <view> | 56 | <view> |
| 58 | <view class="nav-text"> | 57 | <view class="nav-text"> |
| 59 | 听课教室选座 | 58 | 听课教室选座 |
| 60 | </view> | 59 | </view> |
| 61 | <view class="seat-sele"> | 60 | <view class="seat-sele"> |
| 62 | - 选座中 | 61 | + <image src="/static/imagesV2/study/xuanzuo.png" mode="aspectFit" /> |
| 63 | </view> | 62 | </view> |
| 63 | + | ||
| 64 | </view> | 64 | </view> |
| 65 | </view> | 65 | </view> |
| 66 | <!-- <view class="nav-wrap flex" @tap="$service.jump" data-url="/pagesStu/stu_myseat/stu_myseat"> | 66 | <!-- <view class="nav-wrap flex" @tap="$service.jump" data-url="/pagesStu/stu_myseat/stu_myseat"> |
| @@ -78,35 +78,33 @@ | @@ -78,35 +78,33 @@ | ||
| 78 | </view> --> | 78 | </view> --> |
| 79 | </view> | 79 | </view> |
| 80 | 80 | ||
| 81 | - <view class="entrance-wrap area"> | ||
| 82 | - <image src="/static/images/rxdj.png" mode="aspectFit"></image> | ||
| 83 | - <view class="check-in flex"> | ||
| 84 | - <view class="check-in-left"> | ||
| 85 | - <view class=""> | 81 | + <view class="entrance-container area" > |
| 82 | + <view class="entrance-wrap" @tap="$service.jump" data-url="/pagesStu/stu_register/stu_register"> | ||
| 83 | + <image class="entrance-wrap-bg" src="/static/imagesV2/study/rxdj.png" mode="aspectFit"></image> | ||
| 84 | + <view class="check-in"> | ||
| 85 | + <view class="check-in-title"> | ||
| 86 | 入学登记 | 86 | 入学登记 |
| 87 | </view> | 87 | </view> |
| 88 | - <view class="check-in-quick"> | 88 | + <view class="check-in-msg"> |
| 89 | 赶快去登记信息吧! | 89 | 赶快去登记信息吧! |
| 90 | </view> | 90 | </view> |
| 91 | + <view class="check-in-go"> | ||
| 92 | + <image src="/static/imagesV2/study/rxdj-go.png" mode="aspectFit"></image> | ||
| 91 | </view> | 93 | </view> |
| 92 | - <view class="check-in-btn" @tap="$service.jump" data-url="/pagesStu/stu_register/stu_register"> | ||
| 93 | - 去登记 | ||
| 94 | </view> | 94 | </view> |
| 95 | </view> | 95 | </view> |
| 96 | - </view> | ||
| 97 | - <view class="entrance-wrap area"> | ||
| 98 | - <image src="/static/images/xuexicepingbj.png" mode="aspectFit"></image> | ||
| 99 | - <view class="check-in flex"> | ||
| 100 | - <view class="check-in-left"> | ||
| 101 | - <view class=""> | 96 | + <view class="entrance-wrap" @click="toEvaluating"> |
| 97 | + <image class="entrance-wrap-bg" src="/static/imagesV2/study/xuexicepingbj.png" mode="aspectFit"></image> | ||
| 98 | + <view class="check-in"> | ||
| 99 | + <view class="check-in-title"> | ||
| 102 | 入学评测 | 100 | 入学评测 |
| 103 | </view> | 101 | </view> |
| 104 | - <view class="check-in-quick"> | 102 | + <view class="check-in-msg"> |
| 105 | 赶快去登记信息吧! | 103 | 赶快去登记信息吧! |
| 106 | </view> | 104 | </view> |
| 105 | + <view class="check-in-go"> | ||
| 106 | + <image src="/static/imagesV2/study/xuexicepingbj-go.png" mode="aspectFit"></image> | ||
| 107 | </view> | 107 | </view> |
| 108 | - <view class="check-in-btn check-in-btn2" @click="toEvaluating"> | ||
| 109 | - 去查看 | ||
| 110 | </view> | 108 | </view> |
| 111 | </view> | 109 | </view> |
| 112 | </view> | 110 | </view> |
| @@ -202,7 +200,11 @@ | @@ -202,7 +200,11 @@ | ||
| 202 | .no-margin { | 200 | .no-margin { |
| 203 | margin-top: 0 !important; | 201 | margin-top: 0 !important; |
| 204 | } | 202 | } |
| 205 | - | 203 | + .study { |
| 204 | + min-height: 100vh; | ||
| 205 | + background-color: #fff; | ||
| 206 | + padding-top: 28rpx; | ||
| 207 | + } | ||
| 206 | .nav-all-wrap { | 208 | .nav-all-wrap { |
| 207 | justify-content: space-between; | 209 | justify-content: space-between; |
| 208 | align-items: center; | 210 | align-items: center; |
| @@ -210,8 +212,9 @@ | @@ -210,8 +212,9 @@ | ||
| 210 | 212 | ||
| 211 | .nav-wrap { | 213 | .nav-wrap { |
| 212 | width: 334rpx; | 214 | width: 334rpx; |
| 213 | - height: 132rpx; | ||
| 214 | - background: #FFFFFF; | 215 | + height: 150rpx; |
| 216 | + position: relative; | ||
| 217 | + background: #F7F7F7; | ||
| 215 | border-radius: 20rpx; | 218 | border-radius: 20rpx; |
| 216 | font-size: 30rpx; | 219 | font-size: 30rpx; |
| 217 | font-family: PingFang SC; | 220 | font-family: PingFang SC; |
| @@ -240,23 +243,25 @@ | @@ -240,23 +243,25 @@ | ||
| 240 | } | 243 | } |
| 241 | 244 | ||
| 242 | .seat-sele { | 245 | .seat-sele { |
| 243 | - height: 26rpx; | ||
| 244 | - line-height: 26rpx; | ||
| 245 | - font-size: 26rpx; | ||
| 246 | - font-family: PingFang SC; | ||
| 247 | - font-weight: 400; | ||
| 248 | - color: #ADADAD; | ||
| 249 | - margin-top: 6rpx; | 246 | + position: absolute; |
| 247 | + top: 0; | ||
| 248 | + right: 0; | ||
| 249 | + width: 100rpx; | ||
| 250 | + height: 40rpx; | ||
| 250 | } | 251 | } |
| 251 | } | 252 | } |
| 252 | - | 253 | + .entrance-container { |
| 254 | + display: flex; | ||
| 255 | + justify-content: space-between; | ||
| 256 | + align-items: center; | ||
| 257 | + } | ||
| 253 | .entrance-wrap { | 258 | .entrance-wrap { |
| 254 | - height: 253rpx; | ||
| 255 | - border-radius: 20rpx; | 259 | + width: 334rpx; |
| 260 | + height: 250rpx; | ||
| 256 | margin-top: 28rpx; | 261 | margin-top: 28rpx; |
| 257 | position: relative; | 262 | position: relative; |
| 258 | 263 | ||
| 259 | - image { | 264 | + .entrance-wrap-bg { |
| 260 | width: 100%; | 265 | width: 100%; |
| 261 | height: 100%; | 266 | height: 100%; |
| 262 | position: absolute; | 267 | position: absolute; |
| @@ -268,44 +273,31 @@ | @@ -268,44 +273,31 @@ | ||
| 268 | .check-in { | 273 | .check-in { |
| 269 | width: 100%; | 274 | width: 100%; |
| 270 | height: 100%; | 275 | height: 100%; |
| 271 | - // justify-content: space-around; | ||
| 272 | - align-items: center; | ||
| 273 | position: absolute; | 276 | position: absolute; |
| 274 | top: 0; | 277 | top: 0; |
| 275 | left: 0; | 278 | left: 0; |
| 276 | z-index: 2; | 279 | z-index: 2; |
| 280 | + padding: 30rpx; | ||
| 281 | + box-sizing: border-box; | ||
| 277 | 282 | ||
| 278 | - .check-in-left { | 283 | + .check-in-title { |
| 279 | font-size: 36rpx; | 284 | font-size: 36rpx; |
| 280 | font-family: PingFang SC; | 285 | font-family: PingFang SC; |
| 281 | font-weight: 500; | 286 | font-weight: 500; |
| 282 | color: #FFFFFF; | 287 | color: #FFFFFF; |
| 283 | - margin: -46rpx 60rpx 0 80rpx; | ||
| 284 | - | ||
| 285 | - .check-in-quick { | ||
| 286 | - font-size: 28rpx; | ||
| 287 | - font-family: PingFang SC; | ||
| 288 | - font-weight: 400; | ||
| 289 | - color: #FFFFFF; | ||
| 290 | } | 288 | } |
| 291 | - } | ||
| 292 | - | ||
| 293 | - .check-in-btn { | ||
| 294 | - width: 260rpx; | ||
| 295 | - height: 80rpx; | ||
| 296 | - line-height: 80rpx; | ||
| 297 | - text-align: center; | ||
| 298 | - background: #FFFFFF; | ||
| 299 | - opacity: 0.9; | ||
| 300 | - border-radius: 40rpx; | ||
| 301 | - font-size: 30rpx; | 289 | + .check-in-msg { |
| 290 | + font-size: 24rpx; | ||
| 302 | font-family: PingFang SC; | 291 | font-family: PingFang SC; |
| 303 | font-weight: 500; | 292 | font-weight: 500; |
| 304 | - color: #2D81FF; | ||
| 305 | - margin-top: -46rpx; | 293 | + color: #FFFFFF; |
| 294 | + margin-top: 20rpx; | ||
| 306 | } | 295 | } |
| 307 | - .check-in-btn2{ | ||
| 308 | - color: #fea13a; | 296 | + |
| 297 | + .check-in-go { | ||
| 298 | + width: 78rpx; | ||
| 299 | + height: 40rpx; | ||
| 300 | + margin-top: 20rpx; | ||
| 309 | } | 301 | } |
| 310 | } | 302 | } |
| 311 | } | 303 | } |
| 1 | <template> | 1 | <template> |
| 2 | <view class="oneMyCredit"> | 2 | <view class="oneMyCredit"> |
| 3 | - <view class="header-all"> | ||
| 4 | - <view class="header-img-wrap"> | ||
| 5 | - <image class="header-img" src="/static/images/tbbj.png" mode="aspectFill"></image> | 3 | + <CustomReturn title="我的学分" color="#fff" :bgColor="bgColor"/> |
| 4 | + <view class="bg-img"> | ||
| 5 | + <image src="/static/imagesV2/study/xuefen-bg.png" mode="aspectFill"></image> | ||
| 6 | </view> | 6 | </view> |
| 7 | - <view class="header-fen flex"> | ||
| 8 | - {{all_num}}<text>分</text> | 7 | + <PaddingTopB> |
| 8 | + | ||
| 9 | + <view class="main"> | ||
| 10 | + <view class="credit-wrap"> | ||
| 11 | + <view class="credit-label"> | ||
| 12 | + 我的学分(分) | ||
| 13 | + </view> | ||
| 14 | + <view class="credit-content"> | ||
| 15 | + {{all_num}} | ||
| 9 | </view> | 16 | </view> |
| 10 | </view> | 17 | </view> |
| 18 | + <view class="my-credit-main"> | ||
| 11 | <view class="statement_text"> | 19 | <view class="statement_text"> |
| 20 | + <text> | ||
| 12 | 注:低于80分将被无条件退学处理 | 21 | 注:低于80分将被无条件退学处理 |
| 22 | + </text> | ||
| 13 | </view> | 23 | </view> |
| 14 | - <view class="learn-credit-wrap area" v-for="(item,index) in datas" :key="index"> | ||
| 15 | - <view class="learn-credit-item flex"> | 24 | + |
| 25 | + <view class="learn-credit-wrap" > | ||
| 26 | + <view class="learn-credit-item flex" v-for="(item,index) in datas" :key="index"> | ||
| 16 | <view class="learn-credit-left"> | 27 | <view class="learn-credit-left"> |
| 17 | <view class="learn-credit-tit"> | 28 | <view class="learn-credit-tit"> |
| 18 | {{item.title}} | 29 | {{item.title}} |
| @@ -28,6 +39,14 @@ | @@ -28,6 +39,14 @@ | ||
| 28 | </view> | 39 | </view> |
| 29 | 40 | ||
| 30 | 41 | ||
| 42 | + | ||
| 43 | + | ||
| 44 | + </view> | ||
| 45 | + | ||
| 46 | + </view> | ||
| 47 | + | ||
| 48 | + </PaddingTopB> | ||
| 49 | + | ||
| 31 | </view> | 50 | </view> |
| 32 | </template> | 51 | </template> |
| 33 | 52 | ||
| @@ -37,13 +56,19 @@ | @@ -37,13 +56,19 @@ | ||
| 37 | mapState, | 56 | mapState, |
| 38 | mapMutations | 57 | mapMutations |
| 39 | } from 'vuex' | 58 | } from 'vuex' |
| 59 | + import CustomReturn from "@/components/CustomReturn/index.vue" | ||
| 60 | + import PaddingTopB from "@/components/PaddingTopB/index.vue" | ||
| 40 | var that | 61 | var that |
| 41 | export default { | 62 | export default { |
| 63 | + components: { | ||
| 64 | + CustomReturn, | ||
| 65 | + PaddingTopB | ||
| 66 | + }, | ||
| 42 | data() { | 67 | data() { |
| 43 | return { | 68 | return { |
| 44 | all_num: "0", //分数 | 69 | all_num: "0", //分数 |
| 45 | - datas: [] | ||
| 46 | - | 70 | + datas: [], |
| 71 | + bgColor: 'none' | ||
| 47 | } | 72 | } |
| 48 | }, | 73 | }, |
| 49 | onLoad(e) { | 74 | onLoad(e) { |
| @@ -59,6 +84,13 @@ | @@ -59,6 +84,13 @@ | ||
| 59 | onReachBottom() { | 84 | onReachBottom() { |
| 60 | that.getdata() | 85 | that.getdata() |
| 61 | }, | 86 | }, |
| 87 | + onPageScroll(e) { | ||
| 88 | + if(e.scrollTop > 0 ) { | ||
| 89 | + this.bgColor = '#3384fc' | ||
| 90 | + }else { | ||
| 91 | + this.bgColor = 'none' | ||
| 92 | + } | ||
| 93 | + }, | ||
| 62 | methods: { | 94 | methods: { |
| 63 | onRetry(){ | 95 | onRetry(){ |
| 64 | that.page=1 | 96 | that.page=1 |
| @@ -134,102 +166,97 @@ | @@ -134,102 +166,97 @@ | ||
| 134 | <style lang="scss" scoped> | 166 | <style lang="scss" scoped> |
| 135 | .oneMyCredit { | 167 | .oneMyCredit { |
| 136 | position: relative; | 168 | position: relative; |
| 137 | - } | ||
| 138 | 169 | ||
| 139 | - .header-all { | ||
| 140 | - width: 100%; | ||
| 141 | - height: 220rpx; | ||
| 142 | - position: relative; | ||
| 143 | - | ||
| 144 | - .header-img-wrap { | ||
| 145 | - width: 100%; | ||
| 146 | - height: 100%; | 170 | + } |
| 171 | + .bg-img { | ||
| 172 | + height: 504rpx; | ||
| 147 | position: absolute; | 173 | position: absolute; |
| 148 | - top: 0; | ||
| 149 | - left: 0; | ||
| 150 | - | ||
| 151 | - .header-img { | ||
| 152 | width: 100%; | 174 | width: 100%; |
| 153 | - height: 100%; | ||
| 154 | - } | ||
| 155 | } | 175 | } |
| 156 | - | ||
| 157 | - .header-fen { | 176 | + .main { |
| 158 | width: 100%; | 177 | width: 100%; |
| 159 | - font-size: 72rpx; | ||
| 160 | - font-family: Arial; | ||
| 161 | - font-weight: bold; | ||
| 162 | - color: #FFFFFF; | ||
| 163 | - justify-content: center; | ||
| 164 | - align-items: center; | ||
| 165 | - margin-top: 24rpx; | ||
| 166 | - position: absolute; | ||
| 167 | - top: 0; | ||
| 168 | - left: 0; | ||
| 169 | 178 | ||
| 170 | - text { | ||
| 171 | - font-size: 32rpx; | ||
| 172 | - font-family: Arial; | 179 | + } |
| 180 | + .credit-wrap { | ||
| 181 | + padding: 70rpx 0 0 25rpx; | ||
| 182 | + | ||
| 183 | + .credit-label{ | ||
| 184 | + font-size: 30rpx; | ||
| 185 | + font-family: PingFang SC; | ||
| 173 | font-weight: 500; | 186 | font-weight: 500; |
| 174 | color: #FFFFFF; | 187 | color: #FFFFFF; |
| 175 | } | 188 | } |
| 189 | + .credit-content { | ||
| 190 | + font-size: 60rpx; | ||
| 191 | + font-family: PingFang SC; | ||
| 192 | + font-weight: bold; | ||
| 193 | + color: #FFFFFF; | ||
| 194 | + margin-top: 10rpx; | ||
| 195 | + } | ||
| 176 | } | 196 | } |
| 197 | + | ||
| 198 | + .my-credit-main { | ||
| 199 | + margin: 20rpx; | ||
| 177 | } | 200 | } |
| 178 | 201 | ||
| 179 | .learn-credit-wrap { | 202 | .learn-credit-wrap { |
| 180 | - height: auto; | ||
| 181 | - border-radius: 10rpx; | 203 | + padding: 0 20rpx; |
| 182 | background-color: #fff; | 204 | background-color: #fff; |
| 183 | - | 205 | + border-radius: 0 0 20rpx; |
| 184 | .learn-credit-item { | 206 | .learn-credit-item { |
| 185 | - height: 144rpx; | ||
| 186 | - padding: 0 30rpx; | ||
| 187 | justify-content: space-between; | 207 | justify-content: space-between; |
| 188 | align-items: center; | 208 | align-items: center; |
| 189 | - border-bottom: 1px solid #EEEEEE; | ||
| 190 | - | 209 | + border-bottom: 1px solid #F3F3F7; |
| 210 | + padding: 30rpx; | ||
| 191 | .learn-credit-left { | 211 | .learn-credit-left { |
| 192 | .learn-credit-tit { | 212 | .learn-credit-tit { |
| 193 | - height: 32rpx; | ||
| 194 | - line-height: 32rpx; | ||
| 195 | - font-size: 32rpx; | 213 | + font-size: 30rpx; |
| 196 | font-family: PingFang SC; | 214 | font-family: PingFang SC; |
| 197 | font-weight: 500; | 215 | font-weight: 500; |
| 198 | - color: #545D71; | ||
| 199 | - margin-bottom: 28rpx; | 216 | + color: #323232; |
| 217 | + margin-bottom: 30rpx; | ||
| 200 | } | 218 | } |
| 201 | 219 | ||
| 202 | .learn-credit-day { | 220 | .learn-credit-day { |
| 203 | - height: 26rpx; | ||
| 204 | - line-height: 26rpx; | ||
| 205 | - font-size: 28rpx; | 221 | + font-size: 24rpx; |
| 206 | font-family: PingFang SC; | 222 | font-family: PingFang SC; |
| 207 | font-weight: 400; | 223 | font-weight: 400; |
| 208 | - color: #A9B1C0; | 224 | + color: #979797; |
| 209 | } | 225 | } |
| 210 | } | 226 | } |
| 211 | 227 | ||
| 212 | .learn-credit-num { | 228 | .learn-credit-num { |
| 213 | - font-size: 32rpx; | 229 | + font-size: 30rpx; |
| 214 | font-family: PingFang SC; | 230 | font-family: PingFang SC; |
| 215 | font-weight: 500; | 231 | font-weight: 500; |
| 216 | - color: #FF9000; | ||
| 217 | - } | 232 | + color: #FC5101; |
| 218 | } | 233 | } |
| 219 | } | 234 | } |
| 220 | - | ||
| 221 | - .learn-credit-wrap:last-child { | ||
| 222 | - .learn-credit-item{ | 235 | + .learn-credit-item:last-child{ |
| 223 | border-bottom: none; | 236 | border-bottom: none; |
| 224 | } | 237 | } |
| 225 | } | 238 | } |
| 239 | + | ||
| 226 | .statement_text{ | 240 | .statement_text{ |
| 227 | - width: 100%; | ||
| 228 | - height: 60rpx; | ||
| 229 | - padding-left: 30rpx; | ||
| 230 | - font-size: 28rpx; | 241 | + font-size: 26rpx; |
| 231 | font-family: PingFang SC; | 242 | font-family: PingFang SC; |
| 232 | - font-weight: 400; | ||
| 233 | - color: #929399; | 243 | + font-weight: 500; |
| 244 | + color: #646464; | ||
| 245 | + padding: 40rpx 20rpx 20rpx; | ||
| 246 | + text-align: center; | ||
| 247 | + background-color: #fff; | ||
| 248 | + border-radius: 20rpx 20rpx 0 0; | ||
| 249 | + text { | ||
| 250 | + position: relative; | ||
| 251 | + &:before { | ||
| 252 | + content: ''; | ||
| 253 | + position: absolute; | ||
| 254 | + bottom: 0; | ||
| 255 | + width: 100%; | ||
| 256 | + height: 12rpx; | ||
| 257 | + background-color: rgba(252, 81, 1, 0.1); | ||
| 258 | + } | ||
| 259 | + } | ||
| 260 | + | ||
| 234 | } | 261 | } |
| 235 | </style> | 262 | </style> |
| 1 | <template> | 1 | <template> |
| 2 | <view class="twoClassRules"> | 2 | <view class="twoClassRules"> |
| 3 | <!-- 班级班规 --> | 3 | <!-- 班级班规 --> |
| 4 | - <view class="tel_index_bg"></view> | 4 | + <!-- <view class="tel_index_bg"></view> --> |
| 5 | 5 | ||
| 6 | <view class="vio_list"> | 6 | <view class="vio_list"> |
| 7 | <view class="text-content" v-html="textAll"></view> | 7 | <view class="text-content" v-html="textAll"></view> |
| 8 | </view> | 8 | </view> |
| 9 | 9 | ||
| 10 | - <view v-if="!is_seleShow" class="btom_agree_all flex" @tap="agreeClick"> | 10 | + <view class="operate-wrap" v-if="!is_seleShow"> |
| 11 | + <view class="btom_agree_all flex" @tap="agreeClick"> | ||
| 11 | <view class="sele_yes"> | 12 | <view class="sele_yes"> |
| 12 | <view class="sele_yes_img" v-show="seleShow"></view> | 13 | <view class="sele_yes_img" v-show="seleShow"></view> |
| 13 | </view> | 14 | </view> |
| 14 | 我已详细阅读,并同意和服从管理 | 15 | 我已详细阅读,并同意和服从管理 |
| 15 | </view> | 16 | </view> |
| 16 | - <view v-if="!is_seleShow" class="agree_btn" @tap="agreeTap"> | 17 | + <view class="agree_btn" @tap="agreeTap"> |
| 17 | 同意 | 18 | 同意 |
| 18 | </view> | 19 | </view> |
| 20 | + </view> | ||
| 19 | 21 | ||
| 20 | </view> | 22 | </view> |
| 21 | </template> | 23 | </template> |
| @@ -117,6 +119,7 @@ | @@ -117,6 +119,7 @@ | ||
| 117 | <style lang="scss" scoped> | 119 | <style lang="scss" scoped> |
| 118 | .twoRule { | 120 | .twoRule { |
| 119 | position: relative; | 121 | position: relative; |
| 122 | + padding-bottom: 40rpx; | ||
| 120 | } | 123 | } |
| 121 | 124 | ||
| 122 | .tel_index_bg { | 125 | .tel_index_bg { |
| @@ -131,6 +134,7 @@ | @@ -131,6 +134,7 @@ | ||
| 131 | .vio_list { | 134 | .vio_list { |
| 132 | width: 100%; | 135 | width: 100%; |
| 133 | padding: 30rpx 30rpx 0 30rpx; | 136 | padding: 30rpx 30rpx 0 30rpx; |
| 137 | + border-radius: 20rpx; | ||
| 134 | position: relative; | 138 | position: relative; |
| 135 | z-index: 2; | 139 | z-index: 2; |
| 136 | .text-content { | 140 | .text-content { |
| @@ -144,48 +148,52 @@ | @@ -144,48 +148,52 @@ | ||
| 144 | min-height: 300rpx; | 148 | min-height: 300rpx; |
| 145 | } | 149 | } |
| 146 | } | 150 | } |
| 147 | - .btom_agree_all { | 151 | + .operate-wrap { |
| 148 | width: 100%; | 152 | width: 100%; |
| 149 | - height: 90rpx; | ||
| 150 | - line-height: 90rpx; | ||
| 151 | - justify-content: flex-start; | ||
| 152 | - align-items: center; | ||
| 153 | padding: 0 30rpx; | 153 | padding: 0 30rpx; |
| 154 | - // font-size: 24rpx; | ||
| 155 | - // color: #929399; | ||
| 156 | - font-size: 34rpx; | ||
| 157 | - color: #2D81FF; | 154 | + margin-top: 50rpx; |
| 158 | } | 155 | } |
| 159 | - | 156 | + .btom_agree_all { |
| 157 | + width: 100%; | ||
| 158 | + font-size: 24rpx; | ||
| 159 | + font-family: PingFang SC; | ||
| 160 | + font-weight: 500; | ||
| 161 | + color: #646464; | ||
| 162 | + display: flex; | ||
| 163 | + align-items: center; | ||
| 164 | + justify-content: center; | ||
| 165 | + margin-bottom: 20rpx; | ||
| 160 | .sele_yes { | 166 | .sele_yes { |
| 161 | width: 28rpx; | 167 | width: 28rpx; |
| 162 | height: 28rpx; | 168 | height: 28rpx; |
| 163 | - border: 1px solid #2D81FF; | 169 | + border: 2px solid #A3C8FF; |
| 164 | border-radius: 50%; | 170 | border-radius: 50%; |
| 165 | margin-right: 10rpx; | 171 | margin-right: 10rpx; |
| 166 | position: relative; | 172 | position: relative; |
| 167 | margin-right: 14rpx; | 173 | margin-right: 14rpx; |
| 168 | 174 | ||
| 169 | .sele_yes_img { | 175 | .sele_yes_img { |
| 170 | - width: 18rpx; | ||
| 171 | - height: 18rpx; | ||
| 172 | - background-color: #2D81FF; | 176 | + width: 28rpx; |
| 177 | + height: 28rpx; | ||
| 178 | + border: 2px solid #A3C8FF; | ||
| 173 | border-radius: 50%; | 179 | border-radius: 50%; |
| 180 | + background-color: #2D81FF; | ||
| 174 | position: absolute; | 181 | position: absolute; |
| 175 | top: 50%; | 182 | top: 50%; |
| 176 | left: 50%; | 183 | left: 50%; |
| 177 | transform: translate(-50%, -50%); | 184 | transform: translate(-50%, -50%); |
| 178 | } | 185 | } |
| 179 | } | 186 | } |
| 187 | + } | ||
| 188 | + | ||
| 189 | + | ||
| 180 | .agree_btn{ | 190 | .agree_btn{ |
| 181 | - width: 576rpx; | 191 | + width: 100%; |
| 182 | height: 90rpx; | 192 | height: 90rpx; |
| 183 | line-height: 90rpx; | 193 | line-height: 90rpx; |
| 184 | background: #2D81FF; | 194 | background: #2D81FF; |
| 185 | - box-shadow: 5rpx 9rpx 30rpx 0rpx rgba(45, 129, 255, 0.2); | ||
| 186 | border-radius: 45rpx; | 195 | border-radius: 45rpx; |
| 187 | - margin: 0 auto 30rpx auto; | ||
| 188 | - font-size: 32rpx; | 196 | + font-size: 34rpx; |
| 189 | font-family: PingFang SC; | 197 | font-family: PingFang SC; |
| 190 | font-weight: 400; | 198 | font-weight: 400; |
| 191 | color: #FFFFFF; | 199 | color: #FFFFFF; |
| 1 | <template> | 1 | <template> |
| 2 | <view class="twoCurriculum"> | 2 | <view class="twoCurriculum"> |
| 3 | <!-- 课程表 --> | 3 | <!-- 课程表 --> |
| 4 | - <view class="header-wrap"> | ||
| 5 | - <view class="tabs-wrap area flex"> | ||
| 6 | - <view :class="current==index?'tabs-active':''" v-for="(item,index) in tabs" :key="index" | 4 | + <view class="tabs-wrap flex"> |
| 5 | + <view class="tabs-item" :class="current==index?'tabs-active':''" v-for="(item,index) in tabs" :key="index" | ||
| 7 | @tap="tabsClick(item,index)"> | 6 | @tap="tabsClick(item,index)"> |
| 8 | {{item.title}} | 7 | {{item.title}} |
| 9 | </view> | 8 | </view> |
| 10 | </view> | 9 | </view> |
| 11 | - </view> | ||
| 12 | 10 | ||
| 13 | <view class="wrap area flex"> | 11 | <view class="wrap area flex"> |
| 14 | <view class="civil_tabs flex" v-if="tabs[current].list&&tabs[current].list.length>0"> | 12 | <view class="civil_tabs flex" v-if="tabs[current].list&&tabs[current].list.length>0"> |
| 15 | - <view :class="current2==index?'civil_tabs_active':'civil_tabs_item'" | 13 | + <view class="civil_tabs_item" :class="current2==index?'civil_tabs_active':''" |
| 16 | v-for="(item,index) in tabs[current].list" :key="index" @tap="civilTabsClick(item,index,'current2')"> | 14 | v-for="(item,index) in tabs[current].list" :key="index" @tap="civilTabsClick(item,index,'current2')"> |
| 17 | {{item.title}} | 15 | {{item.title}} |
| 18 | </view> | 16 | </view> |
| @@ -29,7 +27,8 @@ | @@ -29,7 +27,8 @@ | ||
| 29 | </swiper> | 27 | </swiper> |
| 30 | 28 | ||
| 31 | <view class="btn-wrap" > | 29 | <view class="btn-wrap" > |
| 32 | - <!-- 点击查看大图 -->左右滑动查看 | 30 | + <!-- 点击查看大图 --> |
| 31 | + 左右滑动查看 | ||
| 33 | </view> | 32 | </view> |
| 34 | </view> | 33 | </view> |
| 35 | </view> | 34 | </view> |
| @@ -181,36 +180,42 @@ | @@ -181,36 +180,42 @@ | ||
| 181 | } | 180 | } |
| 182 | 181 | ||
| 183 | .tabs-wrap { | 182 | .tabs-wrap { |
| 184 | - height: 76rpx; | 183 | + height: 88rpx; |
| 185 | justify-content: space-around; | 184 | justify-content: space-around; |
| 186 | align-items: center; | 185 | align-items: center; |
| 187 | - font-size: 32rpx; | 186 | + font-size: 28rpx; |
| 188 | font-family: PingFang SC; | 187 | font-family: PingFang SC; |
| 189 | font-weight: 500; | 188 | font-weight: 500; |
| 190 | - color: rgba(255, 255, 255, 0.7); | ||
| 191 | - | 189 | + color: #323232; |
| 190 | + background-color: #fff; | ||
| 191 | + border-top:1rpx solid #f3f4f6; | ||
| 192 | + .tabs-item { | ||
| 193 | + height: 100%; | ||
| 194 | + display: flex; | ||
| 195 | + align-items: center; | ||
| 196 | + } | ||
| 192 | .tabs-active { | 197 | .tabs-active { |
| 193 | - color: #FFFFFF; | 198 | + color: #2D81FF; |
| 194 | position: relative; | 199 | position: relative; |
| 195 | } | 200 | } |
| 196 | 201 | ||
| 197 | .tabs-active::after { | 202 | .tabs-active::after { |
| 198 | content: ''; | 203 | content: ''; |
| 199 | - width: 38rpx; | ||
| 200 | - height: 6rpx; | ||
| 201 | - background: #FFFFFF; | ||
| 202 | - border-radius: 4rpx; | ||
| 203 | position: absolute; | 204 | position: absolute; |
| 204 | - bottom: -18rpx; | ||
| 205 | left: 50%; | 205 | left: 50%; |
| 206 | + bottom: 0rpx; | ||
| 206 | transform: translate(-50%, 0); | 207 | transform: translate(-50%, 0); |
| 208 | + background-image: url(@/static/imagesV2/icon23.png); | ||
| 209 | + background-size: 100% 100%; | ||
| 210 | + height: 24rpx; | ||
| 211 | + width: 24rpx; | ||
| 207 | } | 212 | } |
| 208 | } | 213 | } |
| 209 | 214 | ||
| 210 | .wrap { | 215 | .wrap { |
| 211 | min-height: 1152rpx; | 216 | min-height: 1152rpx; |
| 212 | background: #FFFFFF; | 217 | background: #FFFFFF; |
| 213 | - border-radius: 10rpx; | 218 | + border-radius: 20rpx; |
| 214 | padding-bottom: 20rpx; | 219 | padding-bottom: 20rpx; |
| 215 | position: absolute; | 220 | position: absolute; |
| 216 | top: 120rpx; | 221 | top: 120rpx; |
| @@ -247,33 +252,35 @@ | @@ -247,33 +252,35 @@ | ||
| 247 | 252 | ||
| 248 | .civil_tabs { | 253 | .civil_tabs { |
| 249 | width: 100%; | 254 | width: 100%; |
| 250 | - height: 100rpx; | ||
| 251 | - font-size: 32rpx; | ||
| 252 | - color: #999999; | ||
| 253 | - border-radius: 10rpx; | ||
| 254 | - background-image: linear-gradient(#D1EDFF 0%, #fff 100%); | ||
| 255 | justify-content: space-around; | 255 | justify-content: space-around; |
| 256 | align-items: center; | 256 | align-items: center; |
| 257 | - | ||
| 258 | - .civil_tabs_item {} | 257 | + padding: 30rpx 0; |
| 258 | + .civil_tabs_item { | ||
| 259 | + font-size: 26rpx; | ||
| 260 | + font-family: PingFang SC; | ||
| 261 | + font-weight: 500; | ||
| 262 | + color: #646464; | ||
| 263 | + padding: 20rpx 60rpx; | ||
| 264 | + } | ||
| 259 | 265 | ||
| 260 | .civil_tabs_active { | 266 | .civil_tabs_active { |
| 261 | - color: #0097FF; | ||
| 262 | - opacity: 0.9; | 267 | + color: #2D81FF; |
| 263 | position: relative; | 268 | position: relative; |
| 269 | + background: rgba(45, 129, 255, 0.1); | ||
| 270 | + border-radius: 32px; | ||
| 264 | } | 271 | } |
| 265 | 272 | ||
| 266 | - .civil_tabs_active::after { | ||
| 267 | - content: ''; | ||
| 268 | - width: 50rpx; | ||
| 269 | - height: 8rpx; | ||
| 270 | - background-color: #0F9CFF; | ||
| 271 | - opacity: 0.9; | ||
| 272 | - border-radius: 6rpx; | ||
| 273 | - position: absolute; | ||
| 274 | - bottom: -18rpx; | ||
| 275 | - left: 50%; | ||
| 276 | - transform: translate(-50%, 0); | ||
| 277 | - } | 273 | + // .civil_tabs_active::after { |
| 274 | + // content: ''; | ||
| 275 | + // width: 50rpx; | ||
| 276 | + // height: 8rpx; | ||
| 277 | + // background-color: #0F9CFF; | ||
| 278 | + // opacity: 0.9; | ||
| 279 | + // border-radius: 6rpx; | ||
| 280 | + // position: absolute; | ||
| 281 | + // bottom: -18rpx; | ||
| 282 | + // left: 50%; | ||
| 283 | + // transform: translate(-50%, 0); | ||
| 284 | + // } | ||
| 278 | } | 285 | } |
| 279 | </style> | 286 | </style> |
| 1 | <template> | 1 | <template> |
| 2 | <view class="twoMailbox"> | 2 | <view class="twoMailbox"> |
| 3 | <!-- 校长信箱 --> | 3 | <!-- 校长信箱 --> |
| 4 | - <view class="header-wrap"> | ||
| 5 | - <view class="tabs-wrap area flex"> | ||
| 6 | - <view :class="current==index?'tabs-active':''" v-for="(item,index) in tabs" :key="index" | 4 | + <view class="tabs-wrap flex"> |
| 5 | + <view class="tabs-item" :class="current==index?'tabs-active':''" v-for="(item,index) in tabs" :key="index" | ||
| 7 | @tap="tabsClick(item,index)"> | 6 | @tap="tabsClick(item,index)"> |
| 8 | {{item}} | 7 | {{item}} |
| 9 | </view> | 8 | </view> |
| 10 | </view> | 9 | </view> |
| 11 | - </view> | ||
| 12 | 10 | ||
| 13 | <!-- 校长私信 --> | 11 | <!-- 校长私信 --> |
| 14 | <template v-if="current==0"> | 12 | <template v-if="current==0"> |
| 15 | <view class="wrap area"> | 13 | <view class="wrap area"> |
| 16 | <view class="textarea-wrap area"> | 14 | <view class="textarea-wrap area"> |
| 15 | + <view class="icon"> | ||
| 16 | + <image src="/static/imagesV2/study/icon-edit.png"></image> | ||
| 17 | + </view> | ||
| 17 | <textarea | 18 | <textarea |
| 18 | placeholder-style="font-size: 30rpx;font-family: PingFang SC;font-weight: 400;color: #B2B5BB;" | 19 | placeholder-style="font-size: 30rpx;font-family: PingFang SC;font-weight: 400;color: #B2B5BB;" |
| 19 | placeholder="请输入你要发送的内容" v-model="message" maxlength="-1" /> | 20 | placeholder="请输入你要发送的内容" v-model="message" maxlength="-1" /> |
| @@ -169,29 +170,35 @@ | @@ -169,29 +170,35 @@ | ||
| 169 | } | 170 | } |
| 170 | 171 | ||
| 171 | .tabs-wrap { | 172 | .tabs-wrap { |
| 172 | - height: 76rpx; | 173 | + height: 88rpx; |
| 173 | justify-content: space-around; | 174 | justify-content: space-around; |
| 174 | align-items: center; | 175 | align-items: center; |
| 175 | - font-size: 32rpx; | 176 | + font-size: 28rpx; |
| 176 | font-family: PingFang SC; | 177 | font-family: PingFang SC; |
| 177 | font-weight: 500; | 178 | font-weight: 500; |
| 178 | - color: rgba(255, 255, 255, 0.7); | ||
| 179 | - | 179 | + color: #323232; |
| 180 | + background-color: #fff; | ||
| 181 | + border-top:1rpx solid #f3f4f6; | ||
| 182 | + .tabs-item { | ||
| 183 | + height: 100%; | ||
| 184 | + display: flex; | ||
| 185 | + align-items: center; | ||
| 186 | + } | ||
| 180 | .tabs-active { | 187 | .tabs-active { |
| 181 | - color: #FFFFFF; | 188 | + color: #2D81FF; |
| 182 | position: relative; | 189 | position: relative; |
| 183 | } | 190 | } |
| 184 | 191 | ||
| 185 | .tabs-active::after { | 192 | .tabs-active::after { |
| 186 | content: ''; | 193 | content: ''; |
| 187 | - width: 38rpx; | ||
| 188 | - height: 6rpx; | ||
| 189 | - background: #FFFFFF; | ||
| 190 | - border-radius: 4rpx; | ||
| 191 | position: absolute; | 194 | position: absolute; |
| 192 | - bottom: -18rpx; | ||
| 193 | left: 50%; | 195 | left: 50%; |
| 196 | + bottom: 0rpx; | ||
| 194 | transform: translate(-50%, 0); | 197 | transform: translate(-50%, 0); |
| 198 | + background-image: url(@/static/imagesV2/icon23.png); | ||
| 199 | + background-size: 100% 100%; | ||
| 200 | + height: 24rpx; | ||
| 201 | + width: 24rpx; | ||
| 195 | } | 202 | } |
| 196 | } | 203 | } |
| 197 | 204 | ||
| @@ -207,7 +214,13 @@ | @@ -207,7 +214,13 @@ | ||
| 207 | background: #FFFFFF; | 214 | background: #FFFFFF; |
| 208 | border-radius: 10rpx; | 215 | border-radius: 10rpx; |
| 209 | padding: 16rpx 20rpx; | 216 | padding: 16rpx 20rpx; |
| 210 | - | 217 | + display: flex; |
| 218 | + .icon { | ||
| 219 | + width: 30rpx; | ||
| 220 | + height: 30rpx; | ||
| 221 | + margin-right: 10rpx; | ||
| 222 | + margin-top: 5rpx; | ||
| 223 | + } | ||
| 211 | textarea { | 224 | textarea { |
| 212 | width: 100%; | 225 | width: 100%; |
| 213 | height: 100%; | 226 | height: 100%; |
| @@ -221,7 +234,7 @@ | @@ -221,7 +234,7 @@ | ||
| 221 | line-height: 90rpx; | 234 | line-height: 90rpx; |
| 222 | text-align: center; | 235 | text-align: center; |
| 223 | background: #2D81FF; | 236 | background: #2D81FF; |
| 224 | - border-radius: 10rpx; | 237 | + border-radius: 44rpx; |
| 225 | font-size: 32rpx; | 238 | font-size: 32rpx; |
| 226 | font-family: PingFang SC; | 239 | font-family: PingFang SC; |
| 227 | font-weight: 500; | 240 | font-weight: 500; |
| @@ -233,7 +246,6 @@ | @@ -233,7 +246,6 @@ | ||
| 233 | // 微信添加 | 246 | // 微信添加 |
| 234 | .wx-wrap { | 247 | .wx-wrap { |
| 235 | height: 392rpx; | 248 | height: 392rpx; |
| 236 | - background: #FFFFFF; | ||
| 237 | border-radius: 10rpx; | 249 | border-radius: 10rpx; |
| 238 | flex-direction: column; | 250 | flex-direction: column; |
| 239 | justify-content: center; | 251 | justify-content: center; |
| @@ -246,15 +258,21 @@ | @@ -246,15 +258,21 @@ | ||
| 246 | .code-img{ | 258 | .code-img{ |
| 247 | width: 240rpx; | 259 | width: 240rpx; |
| 248 | height: 240rpx; | 260 | height: 240rpx; |
| 261 | + border: 4rpx solid #A3C8FF; | ||
| 262 | + border-radius: 10rpx; | ||
| 249 | } | 263 | } |
| 250 | .wx-text{ | 264 | .wx-text{ |
| 251 | - height: 28rpx; | ||
| 252 | - line-height: 28rpx; | ||
| 253 | - font-size: 30rpx; | 265 | + width: 310rpx; |
| 266 | + height: 64rpx; | ||
| 267 | + background: #2D81FF; | ||
| 268 | + border-radius: 32px; | ||
| 269 | + text-align: center; | ||
| 270 | + font-size: 26rpx; | ||
| 271 | + line-height: 64rpx; | ||
| 254 | font-family: PingFang SC; | 272 | font-family: PingFang SC; |
| 255 | font-weight: 400; | 273 | font-weight: 400; |
| 256 | - color: #B2B5BB; | ||
| 257 | - margin-top: 20rpx; | 274 | + color: #FEFEFE; |
| 275 | + margin-top: 50rpx; | ||
| 258 | } | 276 | } |
| 259 | 277 | ||
| 260 | } | 278 | } |
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <view class="twoRule"> | 2 | <view class="twoRule"> |
| 3 | <!-- 校纪校规 --> | 3 | <!-- 校纪校规 --> |
| 4 | 4 | ||
| 5 | - <view class="tel_index_bg"></view> | 5 | + <!-- <view class="tel_index_bg"></view> --> |
| 6 | 6 | ||
| 7 | <view class="vio_list"> | 7 | <view class="vio_list"> |
| 8 | <!-- <scroll-view scroll-y="true" class="main_box"> --> | 8 | <!-- <scroll-view scroll-y="true" class="main_box"> --> |
| @@ -10,16 +10,18 @@ | @@ -10,16 +10,18 @@ | ||
| 10 | <!-- </scroll-view> --> | 10 | <!-- </scroll-view> --> |
| 11 | </view> | 11 | </view> |
| 12 | 12 | ||
| 13 | - <view v-if="!is_seleShow" class="btom_agree_all flex" @tap="agreeClick"> | 13 | + <view class="operate-wrap" v-if="!is_seleShow"> |
| 14 | + <view class="btom_agree_all flex" @tap="agreeClick"> | ||
| 14 | <view class="sele_yes"> | 15 | <view class="sele_yes"> |
| 15 | <view class="sele_yes_img" v-show="seleShow"></view> | 16 | <view class="sele_yes_img" v-show="seleShow"></view> |
| 16 | </view> | 17 | </view> |
| 17 | 我已详细阅读,并同意和服从管理 | 18 | 我已详细阅读,并同意和服从管理 |
| 18 | </view> | 19 | </view> |
| 19 | - <view v-if="!is_seleShow" class="agree_btn" @tap="agreeTap"> | 20 | + <view class="agree_btn" @tap="agreeTap"> |
| 20 | 同意 | 21 | 同意 |
| 21 | </view> | 22 | </view> |
| 22 | </view> | 23 | </view> |
| 24 | + </view> | ||
| 23 | </template> | 25 | </template> |
| 24 | 26 | ||
| 25 | <script> | 27 | <script> |
| @@ -119,6 +121,7 @@ | @@ -119,6 +121,7 @@ | ||
| 119 | <style lang="scss" scoped> | 121 | <style lang="scss" scoped> |
| 120 | .twoRule { | 122 | .twoRule { |
| 121 | position: relative; | 123 | position: relative; |
| 124 | + padding-bottom: 40rpx; | ||
| 122 | } | 125 | } |
| 123 | 126 | ||
| 124 | .tel_index_bg { | 127 | .tel_index_bg { |
| @@ -133,6 +136,7 @@ | @@ -133,6 +136,7 @@ | ||
| 133 | .vio_list { | 136 | .vio_list { |
| 134 | width: 100%; | 137 | width: 100%; |
| 135 | padding: 30rpx 30rpx 0 30rpx; | 138 | padding: 30rpx 30rpx 0 30rpx; |
| 139 | + border-radius: 20rpx; | ||
| 136 | position: relative; | 140 | position: relative; |
| 137 | z-index: 2; | 141 | z-index: 2; |
| 138 | 142 | ||
| @@ -148,49 +152,52 @@ | @@ -148,49 +152,52 @@ | ||
| 148 | } | 152 | } |
| 149 | } | 153 | } |
| 150 | 154 | ||
| 151 | - .btom_agree_all { | 155 | + .operate-wrap { |
| 152 | width: 100%; | 156 | width: 100%; |
| 153 | - height: 90rpx; | ||
| 154 | - line-height: 90rpx; | ||
| 155 | - justify-content: flex-start; | ||
| 156 | - align-items: center; | ||
| 157 | padding: 0 30rpx; | 157 | padding: 0 30rpx; |
| 158 | - // font-size: 24rpx; | ||
| 159 | - // color: #929399; | ||
| 160 | - font-size: 34rpx; | ||
| 161 | - color: #2D81FF; | 158 | + margin-top: 50rpx; |
| 162 | } | 159 | } |
| 163 | - | 160 | + .btom_agree_all { |
| 161 | + width: 100%; | ||
| 162 | + font-size: 24rpx; | ||
| 163 | + font-family: PingFang SC; | ||
| 164 | + font-weight: 500; | ||
| 165 | + color: #646464; | ||
| 166 | + display: flex; | ||
| 167 | + align-items: center; | ||
| 168 | + justify-content: center; | ||
| 169 | + margin-bottom: 20rpx; | ||
| 164 | .sele_yes { | 170 | .sele_yes { |
| 165 | width: 28rpx; | 171 | width: 28rpx; |
| 166 | height: 28rpx; | 172 | height: 28rpx; |
| 167 | - border: 1px solid #2D81FF; | 173 | + border: 2px solid #A3C8FF; |
| 168 | border-radius: 50%; | 174 | border-radius: 50%; |
| 169 | margin-right: 10rpx; | 175 | margin-right: 10rpx; |
| 170 | position: relative; | 176 | position: relative; |
| 171 | margin-right: 14rpx; | 177 | margin-right: 14rpx; |
| 172 | 178 | ||
| 173 | .sele_yes_img { | 179 | .sele_yes_img { |
| 174 | - width: 18rpx; | ||
| 175 | - height: 18rpx; | ||
| 176 | - background-color: #2D81FF; | 180 | + width: 28rpx; |
| 181 | + height: 28rpx; | ||
| 182 | + border: 2px solid #A3C8FF; | ||
| 177 | border-radius: 50%; | 183 | border-radius: 50%; |
| 184 | + background-color: #2D81FF; | ||
| 178 | position: absolute; | 185 | position: absolute; |
| 179 | top: 50%; | 186 | top: 50%; |
| 180 | left: 50%; | 187 | left: 50%; |
| 181 | transform: translate(-50%, -50%); | 188 | transform: translate(-50%, -50%); |
| 182 | } | 189 | } |
| 183 | } | 190 | } |
| 191 | + } | ||
| 192 | + | ||
| 184 | 193 | ||
| 185 | - .agree_btn { | ||
| 186 | - width: 576rpx; | 194 | + .agree_btn{ |
| 195 | + width: 100%; | ||
| 187 | height: 90rpx; | 196 | height: 90rpx; |
| 188 | line-height: 90rpx; | 197 | line-height: 90rpx; |
| 189 | background: #2D81FF; | 198 | background: #2D81FF; |
| 190 | - box-shadow: 5rpx 9rpx 30rpx 0rpx rgba(45, 129, 255, 0.2); | ||
| 191 | border-radius: 45rpx; | 199 | border-radius: 45rpx; |
| 192 | - margin: 0 auto 30rpx auto; | ||
| 193 | - font-size: 32rpx; | 200 | + font-size: 34rpx; |
| 194 | font-family: PingFang SC; | 201 | font-family: PingFang SC; |
| 195 | font-weight: 400; | 202 | font-weight: 400; |
| 196 | color: #FFFFFF; | 203 | color: #FFFFFF; |
| @@ -34,6 +34,7 @@ | @@ -34,6 +34,7 @@ | ||
| 34 | var jkurl = '/study/ruxue_baogao' | 34 | var jkurl = '/study/ruxue_baogao' |
| 35 | this.$service.P_post(jkurl, datas).then(res => { | 35 | this.$service.P_post(jkurl, datas).then(res => { |
| 36 | this.info = res.data | 36 | this.info = res.data |
| 37 | + this.info.comment = 2122; | ||
| 37 | }) | 38 | }) |
| 38 | } | 39 | } |
| 39 | } | 40 | } |
| @@ -46,21 +47,32 @@ | @@ -46,21 +47,32 @@ | ||
| 46 | .evaluating-c{ | 47 | .evaluating-c{ |
| 47 | background-color: #fff; | 48 | background-color: #fff; |
| 48 | border-radius: 20rpx; | 49 | border-radius: 20rpx; |
| 49 | - padding: 0 24rpx; | 50 | + padding: 0 30rpx; |
| 50 | .evaluating-c-i{ | 51 | .evaluating-c-i{ |
| 51 | - height: 80rpx; | ||
| 52 | display: flex; | 52 | display: flex; |
| 53 | align-items: center; | 53 | align-items: center; |
| 54 | justify-content: space-between; | 54 | justify-content: space-between; |
| 55 | + padding: 30rpx 0; | ||
| 56 | + border-bottom: 1rpx solid #F3F3F7; | ||
| 57 | + &-l { | ||
| 58 | + font-size: 30rpx; | ||
| 59 | + font-family: PingFang SC; | ||
| 60 | + font-weight: 500; | ||
| 61 | + color: #000000; | ||
| 62 | + } | ||
| 63 | + &-r { | ||
| 55 | font-size: 28rpx; | 64 | font-size: 28rpx; |
| 56 | - border-bottom: 1rpx solid #f8f8f8; | 65 | + font-family: PingFang SC; |
| 66 | + font-weight: 400; | ||
| 67 | + color: #646464; | ||
| 68 | + } | ||
| 57 | &:last-child{ | 69 | &:last-child{ |
| 58 | border-bottom: none; | 70 | border-bottom: none; |
| 59 | } | 71 | } |
| 60 | } | 72 | } |
| 61 | } | 73 | } |
| 62 | .evaluating-b{ | 74 | .evaluating-b{ |
| 63 | - padding: 24rpx; | 75 | + padding: 30rpx; |
| 64 | background-color: #fff; | 76 | background-color: #fff; |
| 65 | border-radius: 20rpx; | 77 | border-radius: 20rpx; |
| 66 | margin-top: 30rpx; | 78 | margin-top: 30rpx; |
| @@ -71,10 +83,18 @@ | @@ -71,10 +83,18 @@ | ||
| 71 | background-color: #f8f8f8; | 83 | background-color: #f8f8f8; |
| 72 | min-height: 200rpx; | 84 | min-height: 200rpx; |
| 73 | font-size: 28rpx; | 85 | font-size: 28rpx; |
| 86 | + font-family: PingFang SC; | ||
| 87 | + font-weight: 400; | ||
| 88 | + color: #646464; | ||
| 74 | } | 89 | } |
| 75 | .evaluating-b-t{ | 90 | .evaluating-b-t{ |
| 76 | - font-size: 28rpx; | ||
| 77 | - margin-bottom: 15rpx; | 91 | + |
| 92 | + margin-bottom: 20rpx; | ||
| 93 | + | ||
| 94 | + font-size: 30rpx; | ||
| 95 | + font-family: PingFang SC; | ||
| 96 | + font-weight: 500; | ||
| 97 | + color: #000000; | ||
| 78 | } | 98 | } |
| 79 | } | 99 | } |
| 80 | } | 100 | } |
| 1 | <template> | 1 | <template> |
| 2 | <view class="wrap_box"> | 2 | <view class="wrap_box"> |
| 3 | - <!-- <uParse v-if="datas" :content="datas"></uParse> --> | ||
| 4 | - <view class="tel_index_bg"></view> | ||
| 5 | 3 | ||
| 6 | - | ||
| 7 | - <view v-if="datas.info" class="vio_list"> | ||
| 8 | - <view class="main_list"> | ||
| 9 | - <view class="main_top"> | ||
| 10 | - <view class="main_tit"> | ||
| 11 | - {{datas.info.title}} <text>{{datas.info.pid}}</text> | 4 | + <view v-if="datas.info"> |
| 5 | + <view class="course-info" > | ||
| 6 | + <view class="course-info-title"> | ||
| 7 | + <text class="classroom">{{datas.info.pid}}</text> | ||
| 8 | + <view class="tit"> | ||
| 9 | + {{datas.info.title}} | ||
| 10 | + </view> | ||
| 12 | </view> | 11 | </view> |
| 13 | - <view class=""> | 12 | + <view class="course-info-content"> |
| 14 | 课程详情:{{datas.info.content}} | 13 | 课程详情:{{datas.info.content}} |
| 15 | </view> | 14 | </view> |
| 16 | </view> | 15 | </view> |
| 16 | + | ||
| 17 | <view class="my_seat"> | 17 | <view class="my_seat"> |
| 18 | - <image class="my_seat_bg" src="/static/images/seat_bg.png" mode="aspectFill"></image> | ||
| 19 | - <view class="my_seat_num"> | ||
| 20 | - 你选的座位:{{datas.seat_title}} | 18 | + <view class="my_seat_bg"> |
| 19 | + <image src="/static/imagesV2/stu_myseat/bg.png" mode="aspectFill"></image> | ||
| 21 | </view> | 20 | </view> |
| 21 | + <view class="my_seat_info"> | ||
| 22 | + <view class="value"> | ||
| 23 | + {{datas.seat_title}} | ||
| 24 | + </view> | ||
| 25 | + <view class="label"> | ||
| 26 | + 你选的座位 | ||
| 22 | </view> | 27 | </view> |
| 23 | </view> | 28 | </view> |
| 24 | - <!-- <view class="bz_add" > | ||
| 25 | - <view @click="save_fuc" data-url="/pagesA/stu_bz_edit/stu_bz_edit"> | ||
| 26 | - 确认选座 | ||
| 27 | </view> | 29 | </view> |
| 28 | - </view> --> | ||
| 29 | </view> | 30 | </view> |
| 30 | - | ||
| 31 | - <!-- 阻止滑动 --> | ||
| 32 | - <!-- <view @touchmove.stop.prevent='test'></view> --> | ||
| 33 | </view> | 31 | </view> |
| 34 | </template> | 32 | </template> |
| 35 | 33 | ||
| @@ -161,178 +159,69 @@ | @@ -161,178 +159,69 @@ | ||
| 161 | // #ifdef H5 | 159 | // #ifdef H5 |
| 162 | min-height: calc(100vh - 44px); | 160 | min-height: calc(100vh - 44px); |
| 163 | // #endif | 161 | // #endif |
| 164 | - background: #F8F8F8; | 162 | + background: #fff; |
| 165 | position: relative; | 163 | position: relative; |
| 166 | } | 164 | } |
| 167 | 165 | ||
| 168 | -.tel_index_bg { | ||
| 169 | - position: absolute; | ||
| 170 | - top: 0; | ||
| 171 | - z-index: 1; | ||
| 172 | - width: 100%; | ||
| 173 | - min-height: 220rpx; | ||
| 174 | - background: linear-gradient(0deg, #f8f8f8 0%, #5D9DFD 60%, #428EFE 70%, #2D81FF 100%); | ||
| 175 | -} | ||
| 176 | -.top_tabs{ | ||
| 177 | - width: 100%; | ||
| 178 | -} | ||
| 179 | -.vip_tab_list{ | ||
| 180 | - // padding: 0 30rpx; | ||
| 181 | -} | ||
| 182 | -.vip_tab_li{ | ||
| 183 | - height: 90rpx; | ||
| 184 | - display: inline-flex; | 166 | +.course-info { |
| 167 | + padding: 20rpx; | ||
| 168 | + &-title { | ||
| 169 | + display: flex; | ||
| 185 | align-items: center; | 170 | align-items: center; |
| 186 | font-size: 30rpx; | 171 | font-size: 30rpx; |
| 187 | - color: #FFFFFF; | ||
| 188 | - opacity: 0.6; | ||
| 189 | - | ||
| 190 | - position: relative; | ||
| 191 | - &+.vip_tab_li{ | ||
| 192 | - margin-left: 50rpx; | ||
| 193 | - } | ||
| 194 | - &.active{ | ||
| 195 | - opacity: 1; | ||
| 196 | - | ||
| 197 | - &:after{ | ||
| 198 | - content: ''; | ||
| 199 | - position: absolute; | ||
| 200 | - bottom: 0; | ||
| 201 | - left: 50%; | ||
| 202 | - margin-left: -18rpx; | ||
| 203 | - width: 36rpx; | ||
| 204 | - height: 6rpx; | ||
| 205 | - background: #FFFFFF; | ||
| 206 | - border-radius: 3rpx; | 172 | + font-family: PingFang SC; |
| 173 | + font-weight: bold; | ||
| 174 | + color: #323232; | ||
| 175 | + .classroom { | ||
| 176 | + background: #FE7631; | ||
| 177 | + border-radius: 5rpx; | ||
| 178 | + padding: 7rpx 20rpx; | ||
| 179 | + font-size: 26rpx; | ||
| 180 | + font-family: PingFang SC; | ||
| 181 | + font-weight: 500; | ||
| 182 | + color: #FAFBFA; | ||
| 183 | + margin-right: 20rpx; | ||
| 207 | } | 184 | } |
| 185 | + .tit { | ||
| 186 | + flex: 1; | ||
| 208 | } | 187 | } |
| 209 | -} | ||
| 210 | -.vio_sx{ | ||
| 211 | - height: 100rpx; | ||
| 212 | - justify-content: space-between; | ||
| 213 | - border-bottom: 1px solid #eee; | ||
| 214 | -} | ||
| 215 | -.vio_time{ | ||
| 216 | - | ||
| 217 | - // padding: 0 24rpx; | ||
| 218 | - font-size: 30rpx; | ||
| 219 | - color: #7D8087; | ||
| 220 | - letter-spacing: 0; | ||
| 221 | - display: flex; | ||
| 222 | - align-items: center; | ||
| 223 | - .icon{ | ||
| 224 | - font-size: 20rpx; | ||
| 225 | - margin-left: 5rpx; | ||
| 226 | - color: #999999; | ||
| 227 | - opacity: .5; | ||
| 228 | } | 188 | } |
| 229 | - input{ | ||
| 230 | - font-size: 30rpx; | ||
| 231 | - color: #7D8087; | ||
| 232 | - text-align: right; | ||
| 233 | - padding: 0 10rpx; | 189 | + &-content { |
| 190 | + font-size: 26rpx; | ||
| 191 | + font-family: PingFang SC; | ||
| 192 | + font-weight: 500; | ||
| 193 | + color: #646464; | ||
| 194 | + margin-top: 20rpx; | ||
| 234 | } | 195 | } |
| 235 | } | 196 | } |
| 236 | -.vio_int{ | ||
| 237 | - font-size: 30rpx; | ||
| 238 | - color: #7D8087; | ||
| 239 | - text-align: right; | ||
| 240 | - padding: 0 10rpx; | ||
| 241 | -} | ||
| 242 | -/deep/ .vip_intpl{ | ||
| 243 | - color: #D5D7DA; | ||
| 244 | -} | ||
| 245 | -.vio_list{ | ||
| 246 | - width: 100%; | ||
| 247 | - // padding: 0 30rpx 30rpx; | ||
| 248 | - padding:20rpx 30rpx 30rpx; | ||
| 249 | - position: relative; | ||
| 250 | - z-index: 2; | ||
| 251 | - .main_list{ | ||
| 252 | - background: #FFFFFF; | ||
| 253 | - border-radius: 10rpx; | ||
| 254 | - padding-bottom: 30rpx; | ||
| 255 | - // padding:0 30rpx; | ||
| 256 | - } | ||
| 257 | 197 | ||
| 258 | -} | ||
| 259 | 198 | ||
| 260 | -.bz_add{ | ||
| 261 | - width: 100%; | ||
| 262 | - // position: fixed; | ||
| 263 | - // bottom: 0; | ||
| 264 | - background: #f8f8f8; | ||
| 265 | - z-index: 800; | ||
| 266 | - // left: 0; | ||
| 267 | - padding:30rpx 0; | ||
| 268 | - view{ | ||
| 269 | - font-size: 32rpx; | ||
| 270 | - color: #FFFFFF; | ||
| 271 | - width: 100%; | ||
| 272 | - height: 90rpx; | ||
| 273 | - background: #2D81FF; | ||
| 274 | - border-radius: 10rpx; | ||
| 275 | - display: flex; | ||
| 276 | - align-items: center; | ||
| 277 | - justify-content: center; | ||
| 278 | - } | ||
| 279 | -} | ||
| 280 | -.main_top{ | ||
| 281 | - width: 100%; | ||
| 282 | - padding: 30rpx; | ||
| 283 | - font-size: 28rpx; | ||
| 284 | - color: #929399; | ||
| 285 | - border-bottom: 1px solid #eee; | ||
| 286 | - line-height: 45rpx; | ||
| 287 | - .main_tit{ | ||
| 288 | - font-size: 32rpx; | ||
| 289 | - color: #545D71; | ||
| 290 | - margin-bottom: 20rpx; | 199 | +.my_seat{ |
| 200 | + margin: 20rpx; | ||
| 201 | + background: #FAFAFA; | ||
| 202 | + border-radius: 20px; | ||
| 203 | + padding: 65rpx 0 40rpx; | ||
| 204 | + &_bg{ | ||
| 205 | + width: 280rpx; | ||
| 206 | + height: 280rpx; | ||
| 207 | + margin: 0 auto; | ||
| 208 | + } | ||
| 209 | + &_info{ | ||
| 210 | + margin-top: -30rpx; | ||
| 211 | + text-align: center; | ||
| 212 | + .value { | ||
| 213 | + font-size: 30rpx; | ||
| 214 | + font-family: PingFang SC; | ||
| 291 | font-weight: bold; | 215 | font-weight: bold; |
| 292 | - line-height: 55rpx; | ||
| 293 | - // display: flex; | ||
| 294 | - // align-items: center; | ||
| 295 | - // flex-wrap: wrap; | ||
| 296 | - text{ | ||
| 297 | - height: 48rpx; | ||
| 298 | - line-height: 48rpx; | ||
| 299 | - display: inline-flex; | ||
| 300 | - align-items: center; | ||
| 301 | - padding: 0 12rpx; | ||
| 302 | - background: rgba(45, 129, 255, .1); | ||
| 303 | - border-radius: 10rpx; | ||
| 304 | - font-size: 26rpx; | ||
| 305 | color: #2D81FF; | 216 | color: #2D81FF; |
| 306 | - font-weight: normal; | ||
| 307 | - margin-left: 20rpx; | ||
| 308 | - } | ||
| 309 | } | 217 | } |
| 310 | -} | ||
| 311 | - | ||
| 312 | -.my_seat{ | ||
| 313 | - width: 593rpx; | ||
| 314 | - height: 140rpx; | ||
| 315 | - margin: 30rpx auto; | ||
| 316 | - position: relative; | ||
| 317 | - padding-top: 24rpx; | ||
| 318 | - .my_seat_bg{ | ||
| 319 | - width: 593rpx; | ||
| 320 | - height: 140rpx; | ||
| 321 | - position: absolute; | ||
| 322 | - z-index: 3; | ||
| 323 | - top: 0; | ||
| 324 | - left: 0; | 218 | + .label { |
| 219 | + font-size: 26rpx; | ||
| 220 | + font-family: PingFang SC; | ||
| 221 | + font-weight: 500; | ||
| 222 | + color: #646464; | ||
| 223 | + margin-top: 20rpx; | ||
| 325 | } | 224 | } |
| 326 | - .my_seat_num{ | ||
| 327 | - position: relative; | ||
| 328 | - z-index: 10; | ||
| 329 | - width: 100%; | ||
| 330 | - height: 78rpx; | ||
| 331 | - display: flex; | ||
| 332 | - align-items: center; | ||
| 333 | - padding-left: 80rpx; | ||
| 334 | - font-size: 32rpx; | ||
| 335 | - color: #FFFFFF; | ||
| 336 | } | 225 | } |
| 337 | } | 226 | } |
| 338 | </style> | 227 | </style> |
| 1 | <template> | 1 | <template> |
| 2 | <view class="wrap_box"> | 2 | <view class="wrap_box"> |
| 3 | - <!-- <uParse v-if="datas" :content="datas"></uParse> --> | ||
| 4 | - <view class="tel_index_bg"></view> | ||
| 5 | - | ||
| 6 | 3 | ||
| 7 | <view class="vio_list"> | 4 | <view class="vio_list"> |
| 8 | 5 | ||
| 9 | - <view class=" dis_flex reg_tip"> | 6 | + <view class="reg_tip"> |
| 7 | + <view v-if="datas.is_register!=1" class="reg_tip_cell edit"> | ||
| 10 | <text class="icon icon-icon-tianxiegenjin"></text> | 8 | <text class="icon icon-icon-tianxiegenjin"></text> |
| 11 | - <view v-if="datas.is_register!=1" class=""> | ||
| 12 | 以下每一项都为必填项,请如实填写信息! 如有疑问请咨询接待老师 | 9 | 以下每一项都为必填项,请如实填写信息! 如有疑问请咨询接待老师 |
| 13 | </view> | 10 | </view> |
| 14 | - <view v-else class=""> | 11 | + <view v-else class="reg_tip_cell"> |
| 12 | + <view class="icon"> | ||
| 13 | + <image src="/static/imagesV2/stu_register/icon1.png"></image> | ||
| 14 | + </view> | ||
| 15 | 你已填写,如有疑问请咨询接待老师 | 15 | 你已填写,如有疑问请咨询接待老师 |
| 16 | </view> | 16 | </view> |
| 17 | </view> | 17 | </view> |
| 18 | <view class="main_list"> | 18 | <view class="main_list"> |
| 19 | <view class="vio_sx dis_flex aic ju_b"> | 19 | <view class="vio_sx dis_flex aic ju_b"> |
| 20 | - <view class="flex_1 vio_time"> | 20 | + <view class="flex_1 vio_time label"> |
| 21 | 姓名: | 21 | 姓名: |
| 22 | </view> | 22 | </view> |
| 23 | <view v-if="datas.is_register==1" class="vio_time" > | 23 | <view v-if="datas.is_register==1" class="vio_time" > |
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" maxlength="10" placeholder="请填写姓名" v-model="stu_name"> | 26 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" maxlength="10" placeholder="请填写姓名" v-model="stu_name"> |
| 27 | </view> | 27 | </view> |
| 28 | <view v-if="datas.is_register==1" class="vio_sx dis_flex aic ju_b"> | 28 | <view v-if="datas.is_register==1" class="vio_sx dis_flex aic ju_b"> |
| 29 | - <view class=" vio_time"> | 29 | + <view class=" vio_time label"> |
| 30 | 性别: | 30 | 性别: |
| 31 | </view> | 31 | </view> |
| 32 | <view class="vio_time"> | 32 | <view class="vio_time"> |
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | </view> | 36 | </view> |
| 37 | <picker v-else mode="selector" @change="sexChange" :range="sexList"> | 37 | <picker v-else mode="selector" @change="sexChange" :range="sexList"> |
| 38 | <view class="vio_sx dis_flex aic ju_b"> | 38 | <view class="vio_sx dis_flex aic ju_b"> |
| 39 | - <view class=" vio_time"> | 39 | + <view class=" vio_time label"> |
| 40 | 性别: | 40 | 性别: |
| 41 | </view> | 41 | </view> |
| 42 | 42 | ||
| @@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
| 47 | </view> | 47 | </view> |
| 48 | </picker> | 48 | </picker> |
| 49 | <view v-if="datas.is_register==1" class="vio_sx dis_flex aic ju_b"> | 49 | <view v-if="datas.is_register==1" class="vio_sx dis_flex aic ju_b"> |
| 50 | - <view class="flex_1 vio_time"> | 50 | + <view class="flex_1 vio_time label"> |
| 51 | 出生年月: | 51 | 出生年月: |
| 52 | </view> | 52 | </view> |
| 53 | <view class="vio_time"> | 53 | <view class="vio_time"> |
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | </view> | 56 | </view> |
| 57 | <picker v-else mode="date" :value="birth" @change="birthChange"> | 57 | <picker v-else mode="date" :value="birth" @change="birthChange"> |
| 58 | <view class="vio_sx dis_flex aic ju_b"> | 58 | <view class="vio_sx dis_flex aic ju_b"> |
| 59 | - <view class="flex_1 vio_time"> | 59 | + <view class="flex_1 vio_time label"> |
| 60 | 出生年月: | 60 | 出生年月: |
| 61 | </view> | 61 | </view> |
| 62 | <view class="vio_time"> | 62 | <view class="vio_time"> |
| @@ -66,7 +66,7 @@ | @@ -66,7 +66,7 @@ | ||
| 66 | </picker> | 66 | </picker> |
| 67 | 67 | ||
| 68 | <view class="vio_sx dis_flex aic ju_b"> | 68 | <view class="vio_sx dis_flex aic ju_b"> |
| 69 | - <view class="flex_1 vio_time"> | 69 | + <view class="flex_1 vio_time label"> |
| 70 | 学历: | 70 | 学历: |
| 71 | </view> | 71 | </view> |
| 72 | <view v-if="datas.is_register==1" class="vio_time"> | 72 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -76,7 +76,7 @@ | @@ -76,7 +76,7 @@ | ||
| 76 | </view> | 76 | </view> |
| 77 | 77 | ||
| 78 | <view class="vio_sx dis_flex aic ju_b"> | 78 | <view class="vio_sx dis_flex aic ju_b"> |
| 79 | - <view class="flex_1 vio_time"> | 79 | + <view class="flex_1 vio_time label"> |
| 80 | 学位: | 80 | 学位: |
| 81 | </view> | 81 | </view> |
| 82 | <view v-if="datas.is_register==1" class="vio_time"> | 82 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -85,7 +85,7 @@ | @@ -85,7 +85,7 @@ | ||
| 85 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写学位" v-model="xuewei"> | 85 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写学位" v-model="xuewei"> |
| 86 | </view> | 86 | </view> |
| 87 | <view class="vio_sx dis_flex aic ju_b"> | 87 | <view class="vio_sx dis_flex aic ju_b"> |
| 88 | - <view class="flex_1 vio_time"> | 88 | + <view class="flex_1 vio_time label"> |
| 89 | 籍贯: | 89 | 籍贯: |
| 90 | </view> | 90 | </view> |
| 91 | <view class="vio_time" v-if="datas.is_register==1"> | 91 | <view class="vio_time" v-if="datas.is_register==1"> |
| @@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
| 94 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写籍贯" v-model="native"> | 94 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写籍贯" v-model="native"> |
| 95 | </view> | 95 | </view> |
| 96 | <view class="vio_sx dis_flex aic ju_b"> | 96 | <view class="vio_sx dis_flex aic ju_b"> |
| 97 | - <view class="flex_1 vio_time"> | 97 | + <view class="flex_1 vio_time label"> |
| 98 | 身份证号: | 98 | 身份证号: |
| 99 | </view> | 99 | </view> |
| 100 | <view class="vio_time" v-if="datas.is_register==1"> | 100 | <view class="vio_time" v-if="datas.is_register==1"> |
| @@ -103,7 +103,7 @@ | @@ -103,7 +103,7 @@ | ||
| 103 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写身份证号" v-model="id_card"> | 103 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写身份证号" v-model="id_card"> |
| 104 | </view> | 104 | </view> |
| 105 | <view class="vio_sx dis_flex aic ju_b"> | 105 | <view class="vio_sx dis_flex aic ju_b"> |
| 106 | - <view class="flex_1 vio_time"> | 106 | + <view class="flex_1 vio_time label"> |
| 107 | 家庭住址: | 107 | 家庭住址: |
| 108 | </view> | 108 | </view> |
| 109 | <view v-if="datas.is_register==1" class="vio_time"> | 109 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -112,7 +112,7 @@ | @@ -112,7 +112,7 @@ | ||
| 112 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写家庭住址" v-model="jtzz"> | 112 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写家庭住址" v-model="jtzz"> |
| 113 | </view> | 113 | </view> |
| 114 | <view class="vio_sx dis_flex aic ju_b"> | 114 | <view class="vio_sx dis_flex aic ju_b"> |
| 115 | - <view class="flex_1 vio_time"> | 115 | + <view class="flex_1 vio_time label"> |
| 116 | 招生联系人: | 116 | 招生联系人: |
| 117 | </view> | 117 | </view> |
| 118 | <view v-if="datas.is_register==1" class="vio_time"> | 118 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -121,7 +121,7 @@ | @@ -121,7 +121,7 @@ | ||
| 121 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写招生联系人" v-model="zslxr"> | 121 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写招生联系人" v-model="zslxr"> |
| 122 | </view> | 122 | </view> |
| 123 | <view class="vio_sx dis_flex aic ju_b"> | 123 | <view class="vio_sx dis_flex aic ju_b"> |
| 124 | - <view class="flex_1 vio_time"> | 124 | + <view class="flex_1 vio_time label"> |
| 125 | 是否脱产备考: | 125 | 是否脱产备考: |
| 126 | </view> | 126 | </view> |
| 127 | <!-- <view v-if="datas.is_register==1" class="vio_time"> | 127 | <!-- <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -145,7 +145,7 @@ | @@ -145,7 +145,7 @@ | ||
| 145 | </view> | 145 | </view> |
| 146 | </view> | 146 | </view> |
| 147 | <view class="vio_sx dis_flex aic ju_b"> | 147 | <view class="vio_sx dis_flex aic ju_b"> |
| 148 | - <view class="flex_1 vio_time"> | 148 | + <view class="flex_1 vio_time label"> |
| 149 | 毕业/在读学校: | 149 | 毕业/在读学校: |
| 150 | </view> | 150 | </view> |
| 151 | <view v-if="datas.is_register==1" class="vio_time"> | 151 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -154,7 +154,7 @@ | @@ -154,7 +154,7 @@ | ||
| 154 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写毕业/在读学校" v-model="byxx"> | 154 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写毕业/在读学校" v-model="byxx"> |
| 155 | </view> | 155 | </view> |
| 156 | <view v-if="datas.is_register==1" class="vio_sx dis_flex aic ju_b"> | 156 | <view v-if="datas.is_register==1" class="vio_sx dis_flex aic ju_b"> |
| 157 | - <view class="flex_1 vio_time"> | 157 | + <view class="flex_1 vio_time label"> |
| 158 | 毕业时间: | 158 | 毕业时间: |
| 159 | </view> | 159 | </view> |
| 160 | <view class="vio_time"> | 160 | <view class="vio_time"> |
| @@ -163,7 +163,7 @@ | @@ -163,7 +163,7 @@ | ||
| 163 | </view> | 163 | </view> |
| 164 | <picker v-else mode="date" :value="by_time" @change="byChange"> | 164 | <picker v-else mode="date" :value="by_time" @change="byChange"> |
| 165 | <view class="vio_sx dis_flex aic ju_b"> | 165 | <view class="vio_sx dis_flex aic ju_b"> |
| 166 | - <view class="flex_1 vio_time"> | 166 | + <view class="flex_1 vio_time label"> |
| 167 | 毕业时间: | 167 | 毕业时间: |
| 168 | </view> | 168 | </view> |
| 169 | <view class="vio_time"> | 169 | <view class="vio_time"> |
| @@ -172,7 +172,7 @@ | @@ -172,7 +172,7 @@ | ||
| 172 | </view> | 172 | </view> |
| 173 | </picker> | 173 | </picker> |
| 174 | <view class="vio_sx dis_flex aic ju_b"> | 174 | <view class="vio_sx dis_flex aic ju_b"> |
| 175 | - <view class="flex_1 vio_time"> | 175 | + <view class="flex_1 vio_time label"> |
| 176 | 所学专业: | 176 | 所学专业: |
| 177 | </view> | 177 | </view> |
| 178 | <view v-if="datas.is_register==1" class="vio_time"> | 178 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -181,7 +181,7 @@ | @@ -181,7 +181,7 @@ | ||
| 181 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写所学专业" v-model="sxzy"> | 181 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写所学专业" v-model="sxzy"> |
| 182 | </view> | 182 | </view> |
| 183 | <view class="vio_sx dis_flex aic ju_b"> | 183 | <view class="vio_sx dis_flex aic ju_b"> |
| 184 | - <view class="flex_1 vio_time"> | 184 | + <view class="flex_1 vio_time label"> |
| 185 | 民族: | 185 | 民族: |
| 186 | </view> | 186 | </view> |
| 187 | <view class="vio_time" v-if="datas.is_register==1"> | 187 | <view class="vio_time" v-if="datas.is_register==1"> |
| @@ -190,7 +190,7 @@ | @@ -190,7 +190,7 @@ | ||
| 190 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写民族" v-model="nation"> | 190 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写民族" v-model="nation"> |
| 191 | </view> | 191 | </view> |
| 192 | <view class="vio_sx dis_flex aic ju_b"> | 192 | <view class="vio_sx dis_flex aic ju_b"> |
| 193 | - <view class="flex_1 vio_time"> | 193 | + <view class="flex_1 vio_time label"> |
| 194 | 联系方式: | 194 | 联系方式: |
| 195 | </view> | 195 | </view> |
| 196 | <view v-if="datas.is_register==1" class="vio_time"> | 196 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -199,7 +199,7 @@ | @@ -199,7 +199,7 @@ | ||
| 199 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="number" placeholder="请填写联系方式" v-model="lxfs"> | 199 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="number" placeholder="请填写联系方式" v-model="lxfs"> |
| 200 | </view> | 200 | </view> |
| 201 | <view class="vio_sx dis_flex aic ju_b"> | 201 | <view class="vio_sx dis_flex aic ju_b"> |
| 202 | - <view class="flex_1 vio_time"> | 202 | + <view class="flex_1 vio_time label"> |
| 203 | 家长姓名: | 203 | 家长姓名: |
| 204 | </view> | 204 | </view> |
| 205 | <view v-if="datas.is_register==1" class="vio_time"> | 205 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -208,7 +208,7 @@ | @@ -208,7 +208,7 @@ | ||
| 208 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写家长姓名" v-model="parent_name"> | 208 | <input v-else class="vio_int" placeholder-class="vip_intpl" type="text" placeholder="请填写家长姓名" v-model="parent_name"> |
| 209 | </view> | 209 | </view> |
| 210 | <view class="vio_sx dis_flex aic ju_b"> | 210 | <view class="vio_sx dis_flex aic ju_b"> |
| 211 | - <view class="flex_1 vio_time"> | 211 | + <view class="flex_1 vio_time label"> |
| 212 | 家长手机号: | 212 | 家长手机号: |
| 213 | </view> | 213 | </view> |
| 214 | <view v-if="datas.is_register==1" class="vio_time"> | 214 | <view v-if="datas.is_register==1" class="vio_time"> |
| @@ -219,7 +219,7 @@ | @@ -219,7 +219,7 @@ | ||
| 219 | 219 | ||
| 220 | 220 | ||
| 221 | <view v-if="datas.is_register==1" class="vio_sx dis_flex aic ju_b" style="border-bottom: 0;"> | 221 | <view v-if="datas.is_register==1" class="vio_sx dis_flex aic ju_b" style="border-bottom: 0;"> |
| 222 | - <view class=" vio_time"> | 222 | + <view class=" vio_time label"> |
| 223 | 学历性质: | 223 | 学历性质: |
| 224 | </view> | 224 | </view> |
| 225 | <view class="vio_time"> | 225 | <view class="vio_time"> |
| @@ -229,7 +229,7 @@ | @@ -229,7 +229,7 @@ | ||
| 229 | </view> | 229 | </view> |
| 230 | <picker v-else mode="selector" @change="xzChange" :range="xzList" range-key="title"> | 230 | <picker v-else mode="selector" @change="xzChange" :range="xzList" range-key="title"> |
| 231 | <view class="vio_sx dis_flex aic ju_b" style="border-bottom: 0;"> | 231 | <view class="vio_sx dis_flex aic ju_b" style="border-bottom: 0;"> |
| 232 | - <view class=" vio_time"> | 232 | + <view class=" vio_time label"> |
| 233 | 学历性质: | 233 | 学历性质: |
| 234 | </view> | 234 | </view> |
| 235 | 235 | ||
| @@ -433,7 +433,6 @@ | @@ -433,7 +433,6 @@ | ||
| 433 | } | 433 | } |
| 434 | } | 434 | } |
| 435 | } | 435 | } |
| 436 | - | ||
| 437 | } else { | 436 | } else { |
| 438 | 437 | ||
| 439 | if (res.msg) { | 438 | if (res.msg) { |
| @@ -782,22 +781,6 @@ | @@ -782,22 +781,6 @@ | ||
| 782 | position: relative; | 781 | position: relative; |
| 783 | } | 782 | } |
| 784 | 783 | ||
| 785 | - .tel_index_bg { | ||
| 786 | - position: absolute; | ||
| 787 | - top: 0; | ||
| 788 | - z-index: 1; | ||
| 789 | - width: 100%; | ||
| 790 | - min-height: 220rpx; | ||
| 791 | - background: linear-gradient(0deg, #f8f8f8 0%, #5D9DFD 60%, #428EFE 70%, #2D81FF 100%); | ||
| 792 | - } | ||
| 793 | - | ||
| 794 | - .top_tabs { | ||
| 795 | - width: 100%; | ||
| 796 | - } | ||
| 797 | - | ||
| 798 | - .vip_tab_list { | ||
| 799 | - // padding: 0 30rpx; | ||
| 800 | - } | ||
| 801 | 784 | ||
| 802 | .vip_tab_li { | 785 | .vip_tab_li { |
| 803 | height: 90rpx; | 786 | height: 90rpx; |
| @@ -831,20 +814,24 @@ | @@ -831,20 +814,24 @@ | ||
| 831 | } | 814 | } |
| 832 | 815 | ||
| 833 | .vio_sx { | 816 | .vio_sx { |
| 834 | - height: 100rpx; | 817 | + padding: 30rpx 0; |
| 835 | justify-content: space-between; | 818 | justify-content: space-between; |
| 836 | - border-bottom: 1px solid #eee; | 819 | + border-bottom: 1px solid #F3F3F7; |
| 820 | + align-items: baseline; | ||
| 837 | } | 821 | } |
| 838 | 822 | ||
| 839 | .vio_time { | 823 | .vio_time { |
| 840 | 824 | ||
| 841 | - // padding: 0 24rpx; | ||
| 842 | - font-size: 30rpx; | ||
| 843 | - color: #7D8087; | 825 | + flex: 1; |
| 826 | + font-size: 28rpx; | ||
| 827 | + font-family: PingFang SC; | ||
| 828 | + font-weight: 400; | ||
| 829 | + color: #646464; | ||
| 844 | letter-spacing: 0; | 830 | letter-spacing: 0; |
| 845 | display: flex; | 831 | display: flex; |
| 846 | align-items: center; | 832 | align-items: center; |
| 847 | - | 833 | + text-align: right; |
| 834 | + justify-content: flex-end; | ||
| 848 | .icon { | 835 | .icon { |
| 849 | font-size: 20rpx; | 836 | font-size: 20rpx; |
| 850 | margin-left: 5rpx; | 837 | margin-left: 5rpx; |
| @@ -883,6 +870,16 @@ | @@ -883,6 +870,16 @@ | ||
| 883 | background: #FFFFFF; | 870 | background: #FFFFFF; |
| 884 | border-radius: 10rpx; | 871 | border-radius: 10rpx; |
| 885 | padding: 0 30rpx; | 872 | padding: 0 30rpx; |
| 873 | + .label { | ||
| 874 | + font-size: 30rpx; | ||
| 875 | + font-family: PingFang SC; | ||
| 876 | + font-weight: 500; | ||
| 877 | + color: #000000; | ||
| 878 | + width: 240rpx; | ||
| 879 | + flex: none; | ||
| 880 | + text-align: left; | ||
| 881 | + justify-content: unset; | ||
| 882 | + } | ||
| 886 | } | 883 | } |
| 887 | 884 | ||
| 888 | } | 885 | } |
| @@ -897,12 +894,14 @@ | @@ -897,12 +894,14 @@ | ||
| 897 | padding: 50rpx 0; | 894 | padding: 50rpx 0; |
| 898 | 895 | ||
| 899 | view { | 896 | view { |
| 900 | - font-size: 32rpx; | ||
| 901 | - color: #FFFFFF; | ||
| 902 | width: 100%; | 897 | width: 100%; |
| 903 | height: 90rpx; | 898 | height: 90rpx; |
| 904 | background: #2D81FF; | 899 | background: #2D81FF; |
| 905 | - border-radius: 10rpx; | 900 | + border-radius: 44rpx; |
| 901 | + font-size: 34rpx; | ||
| 902 | + font-family: PingFang SC; | ||
| 903 | + font-weight: 500; | ||
| 904 | + color: #FFFFFF; | ||
| 906 | display: flex; | 905 | display: flex; |
| 907 | align-items: center; | 906 | align-items: center; |
| 908 | justify-content: center; | 907 | justify-content: center; |
| @@ -937,15 +936,21 @@ | @@ -937,15 +936,21 @@ | ||
| 937 | } | 936 | } |
| 938 | 937 | ||
| 939 | .reg_tip { | 938 | .reg_tip { |
| 940 | - font-size: 30rpx; | ||
| 941 | - font-weight: 500; | ||
| 942 | - color: #fff; | ||
| 943 | - | ||
| 944 | - text { | ||
| 945 | - font-size: 30rpx; | 939 | + .reg_tip_cell { |
| 940 | + font-size: 26rpx; | ||
| 941 | + font-family: PingFang SC; | ||
| 942 | + font-weight: 400; | ||
| 943 | + color: #EF5D22; | ||
| 944 | + background: #F2E9E6; | ||
| 945 | + border-radius: 20rpx; | ||
| 946 | + display: flex; | ||
| 947 | + align-items: center; | ||
| 948 | + padding: 15rpx 30rpx; | ||
| 949 | + .icon { | ||
| 950 | + width: 34rpx; | ||
| 951 | + height: 34rpx; | ||
| 946 | margin-right: 20rpx; | 952 | margin-right: 20rpx; |
| 947 | - position: relative; | ||
| 948 | - top: 8rpx; | 953 | + } |
| 949 | } | 954 | } |
| 950 | } | 955 | } |
| 951 | 956 |
| 1 | <template> | 1 | <template> |
| 2 | <view class="wrap_box"> | 2 | <view class="wrap_box"> |
| 3 | - <!-- <uParse v-if="datas" :content="datas"></uParse> --> | ||
| 4 | - <view class="tel_index_bg"></view> | ||
| 5 | - | ||
| 6 | - | ||
| 7 | - <view class="vio_list"> | ||
| 8 | - <view class="main_list"> | ||
| 9 | - <view v-if="datas.info" class="main_top"> | ||
| 10 | - <view class="main_tit"> | ||
| 11 | - {{datas.info.title}} <text>{{datas.info.pid}}</text> | 3 | + <view class="course-info" v-if="datas.info"> |
| 4 | + <view class="course-info-title"> | ||
| 5 | + <text class="classroom">{{datas.info.pid}}</text> | ||
| 6 | + <view class="tit"> | ||
| 7 | + {{datas.info.title}} | ||
| 8 | + </view> | ||
| 12 | </view> | 9 | </view> |
| 13 | - <view class=""> | 10 | + <view class="course-info-content"> |
| 14 | 课程详情:{{datas.info.content}} | 11 | 课程详情:{{datas.info.content}} |
| 15 | </view> | 12 | </view> |
| 16 | </view> | 13 | </view> |
| 14 | + | ||
| 17 | <movable-area class="main_center"> | 15 | <movable-area class="main_center"> |
| 18 | - <!-- <movable-view class="seat_list" :scale="true" :x="x" :y="y" direction="all" @change="onChange"> | ||
| 19 | - <view class="seat_d1 dis_flex aic ju_c"> | ||
| 20 | - <image src="/static/images/seat_dais.png" mode="aspectFill"></image> | ||
| 21 | - </view> | ||
| 22 | - <view class="zw_list"> | ||
| 23 | - <text class="icon icon-zuowei zw_li" v-for="(item,index) in 10"></text> | ||
| 24 | - </view> | ||
| 25 | - </movable-view> --> | ||
| 26 | <movable-view class="movable-view" :style="{width:datas.width*40+'rpx'}" :out-of-bounds="true" :scale="true" :x="x+'rpx'" :y="y" direction="all" @change="onChange"> | 16 | <movable-view class="movable-view" :style="{width:datas.width*40+'rpx'}" :out-of-bounds="true" :scale="true" :x="x+'rpx'" :y="y" direction="all" @change="onChange"> |
| 27 | <view v-if="datas.list" class="seat_list_box"> | 17 | <view v-if="datas.list" class="seat_list_box"> |
| 28 | <view v-if="datas.info.pid=='1号教室'" class="seat_d1 seat_d2 dis_flex aic ju_c" > | 18 | <view v-if="datas.info.pid=='1号教室'" class="seat_d1 seat_d2 dis_flex aic ju_c" > |
| @@ -49,20 +39,18 @@ | @@ -49,20 +39,18 @@ | ||
| 49 | </view> | 39 | </view> |
| 50 | </movable-view> | 40 | </movable-view> |
| 51 | </movable-area> | 41 | </movable-area> |
| 42 | + | ||
| 52 | <view class="my_seat"> | 43 | <view class="my_seat"> |
| 53 | <view class="">你选的座位</view> | 44 | <view class="">你选的座位</view> |
| 54 | - <text class="">{{my_seat_index==-1?'':datas.list[my_seat_index].title}}</text> | ||
| 55 | - </view> | 45 | + <text v-show="my_seat_index != -1">{{datas.list[my_seat_index].title}}</text> |
| 56 | </view> | 46 | </view> |
| 47 | + | ||
| 57 | <view class="bz_add" > | 48 | <view class="bz_add" > |
| 58 | <view @click="save_fuc" data-url="/pagesA/stu_bz_edit/stu_bz_edit"> | 49 | <view @click="save_fuc" data-url="/pagesA/stu_bz_edit/stu_bz_edit"> |
| 59 | 确认选座 | 50 | 确认选座 |
| 60 | </view> | 51 | </view> |
| 61 | </view> | 52 | </view> |
| 62 | - </view> | ||
| 63 | 53 | ||
| 64 | - <!-- 阻止滑动 --> | ||
| 65 | - <!-- <view @touchmove.stop.prevent='test'></view> --> | ||
| 66 | </view> | 54 | </view> |
| 67 | </template> | 55 | </template> |
| 68 | 56 | ||
| @@ -1222,175 +1210,55 @@ | @@ -1222,175 +1210,55 @@ | ||
| 1222 | // #ifdef H5 | 1210 | // #ifdef H5 |
| 1223 | min-height: calc(100vh - 44px); | 1211 | min-height: calc(100vh - 44px); |
| 1224 | // #endif | 1212 | // #endif |
| 1225 | - background: #F8F8F8; | ||
| 1226 | - position: relative; | ||
| 1227 | -} | ||
| 1228 | - | ||
| 1229 | -.tel_index_bg { | ||
| 1230 | - position: absolute; | ||
| 1231 | - top: 0; | ||
| 1232 | - z-index: 1; | ||
| 1233 | - width: 100%; | ||
| 1234 | - min-height: 220rpx; | ||
| 1235 | - background: linear-gradient(0deg, #f8f8f8 0%, #5D9DFD 60%, #428EFE 70%, #2D81FF 100%); | ||
| 1236 | -} | ||
| 1237 | -.top_tabs{ | ||
| 1238 | - width: 100%; | ||
| 1239 | -} | ||
| 1240 | -.vip_tab_list{ | ||
| 1241 | - // padding: 0 30rpx; | ||
| 1242 | -} | ||
| 1243 | -.vip_tab_li{ | ||
| 1244 | - height: 90rpx; | ||
| 1245 | - display: inline-flex; | ||
| 1246 | - align-items: center; | ||
| 1247 | - font-size: 30rpx; | ||
| 1248 | - color: #FFFFFF; | ||
| 1249 | - opacity: 0.6; | ||
| 1250 | - | 1213 | + background: #fff; |
| 1251 | position: relative; | 1214 | position: relative; |
| 1252 | - &+.vip_tab_li{ | ||
| 1253 | - margin-left: 50rpx; | ||
| 1254 | - } | ||
| 1255 | - &.active{ | ||
| 1256 | - opacity: 1; | ||
| 1257 | - | ||
| 1258 | - &:after{ | ||
| 1259 | - content: ''; | ||
| 1260 | - position: absolute; | ||
| 1261 | - bottom: 0; | ||
| 1262 | - left: 50%; | ||
| 1263 | - margin-left: -18rpx; | ||
| 1264 | - width: 36rpx; | ||
| 1265 | - height: 6rpx; | ||
| 1266 | - background: #FFFFFF; | ||
| 1267 | - border-radius: 3rpx; | ||
| 1268 | - } | ||
| 1269 | - } | ||
| 1270 | } | 1215 | } |
| 1271 | -.vio_sx{ | ||
| 1272 | - height: 100rpx; | ||
| 1273 | - justify-content: space-between; | ||
| 1274 | - border-bottom: 1px solid #eee; | ||
| 1275 | -} | ||
| 1276 | -.vio_time{ | ||
| 1277 | - | ||
| 1278 | - // padding: 0 24rpx; | ||
| 1279 | - font-size: 30rpx; | ||
| 1280 | - color: #7D8087; | ||
| 1281 | - letter-spacing: 0; | 1216 | +.course-info { |
| 1217 | + padding: 20rpx; | ||
| 1218 | + &-title { | ||
| 1282 | display: flex; | 1219 | display: flex; |
| 1283 | align-items: center; | 1220 | align-items: center; |
| 1284 | - .icon{ | ||
| 1285 | - font-size: 20rpx; | ||
| 1286 | - margin-left: 5rpx; | ||
| 1287 | - color: #999999; | ||
| 1288 | - opacity: .5; | ||
| 1289 | - } | ||
| 1290 | - input{ | ||
| 1291 | font-size: 30rpx; | 1221 | font-size: 30rpx; |
| 1292 | - color: #7D8087; | ||
| 1293 | - text-align: right; | ||
| 1294 | - padding: 0 10rpx; | 1222 | + font-family: PingFang SC; |
| 1223 | + font-weight: bold; | ||
| 1224 | + color: #323232; | ||
| 1225 | + .classroom { | ||
| 1226 | + background: #FE7631; | ||
| 1227 | + border-radius: 5rpx; | ||
| 1228 | + padding: 7rpx 20rpx; | ||
| 1229 | + font-size: 26rpx; | ||
| 1230 | + font-family: PingFang SC; | ||
| 1231 | + font-weight: 500; | ||
| 1232 | + color: #FAFBFA; | ||
| 1233 | + margin-right: 20rpx; | ||
| 1295 | } | 1234 | } |
| 1296 | -} | ||
| 1297 | -.vio_int{ | ||
| 1298 | - font-size: 30rpx; | ||
| 1299 | - color: #7D8087; | ||
| 1300 | - text-align: right; | ||
| 1301 | - padding: 0 10rpx; | ||
| 1302 | -} | ||
| 1303 | -/deep/ .vip_intpl{ | ||
| 1304 | - color: #D5D7DA; | ||
| 1305 | -} | ||
| 1306 | -.vio_list{ | ||
| 1307 | - width: 100%; | ||
| 1308 | - // padding: 0 30rpx 30rpx; | ||
| 1309 | - padding:20rpx 30rpx 30rpx; | ||
| 1310 | - position: relative; | ||
| 1311 | - z-index: 2; | ||
| 1312 | - .main_list{ | ||
| 1313 | - background: #FFFFFF; | ||
| 1314 | - border-radius: 10rpx; | ||
| 1315 | - // padding:0 30rpx; | 1235 | + .tit { |
| 1236 | + flex: 1; | ||
| 1316 | } | 1237 | } |
| 1317 | - | ||
| 1318 | -} | ||
| 1319 | - | ||
| 1320 | -.bz_add{ | ||
| 1321 | - width: 100%; | ||
| 1322 | - // position: fixed; | ||
| 1323 | - // bottom: 0; | ||
| 1324 | - background: #f8f8f8; | ||
| 1325 | - z-index: 800; | ||
| 1326 | - // left: 0; | ||
| 1327 | - padding:30rpx 0; | ||
| 1328 | - view{ | ||
| 1329 | - font-size: 32rpx; | ||
| 1330 | - color: #FFFFFF; | ||
| 1331 | - width: 100%; | ||
| 1332 | - height: 90rpx; | ||
| 1333 | - background: #2D81FF; | ||
| 1334 | - border-radius: 10rpx; | ||
| 1335 | - display: flex; | ||
| 1336 | - align-items: center; | ||
| 1337 | - justify-content: center; | ||
| 1338 | } | 1238 | } |
| 1339 | -} | ||
| 1340 | -.main_top{ | ||
| 1341 | - width: 100%; | ||
| 1342 | - padding: 30rpx; | ||
| 1343 | - font-size: 28rpx; | ||
| 1344 | - color: #929399; | ||
| 1345 | - border-bottom: 1px solid #eee; | ||
| 1346 | - line-height: 45rpx; | ||
| 1347 | - .main_tit{ | ||
| 1348 | - font-size: 32rpx; | ||
| 1349 | - color: #545D71; | ||
| 1350 | - margin-bottom: 20rpx; | ||
| 1351 | - font-weight: bold; | ||
| 1352 | - line-height: 55rpx; | ||
| 1353 | - // display: flex; | ||
| 1354 | - // align-items: center; | ||
| 1355 | - // flex-wrap: wrap; | ||
| 1356 | - text{ | ||
| 1357 | - height: 48rpx; | ||
| 1358 | - line-height: 48rpx; | ||
| 1359 | - display: inline-flex; | ||
| 1360 | - align-items: center; | ||
| 1361 | - padding: 0 12rpx; | ||
| 1362 | - background: rgba(45, 129, 255, .1); | ||
| 1363 | - border-radius: 10rpx; | 1239 | + &-content { |
| 1364 | font-size: 26rpx; | 1240 | font-size: 26rpx; |
| 1365 | - color: #2D81FF; | ||
| 1366 | - font-weight: normal; | ||
| 1367 | - margin-left: 20rpx; | ||
| 1368 | - } | 1241 | + font-family: PingFang SC; |
| 1242 | + font-weight: 500; | ||
| 1243 | + color: #646464; | ||
| 1244 | + margin-top: 20rpx; | ||
| 1369 | } | 1245 | } |
| 1370 | } | 1246 | } |
| 1247 | + | ||
| 1371 | .main_center{ | 1248 | .main_center{ |
| 1372 | width: 100%; | 1249 | width: 100%; |
| 1373 | height: 737rpx; | 1250 | height: 737rpx; |
| 1374 | border-bottom: 1px solid #eee; | 1251 | border-bottom: 1px solid #eee; |
| 1375 | overflow: hidden; | 1252 | overflow: hidden; |
| 1253 | + margin-top: 30rpx; | ||
| 1376 | } | 1254 | } |
| 1255 | + | ||
| 1377 | .seat_list{ | 1256 | .seat_list{ |
| 1378 | - // width: 180rpx; | ||
| 1379 | - // height: 180rpx; | ||
| 1380 | min-width: 690rpx; | 1257 | min-width: 690rpx; |
| 1381 | - | ||
| 1382 | min-height: 737rpx; | 1258 | min-height: 737rpx; |
| 1383 | background: #fff; | 1259 | background: #fff; |
| 1384 | padding: 22rpx; | 1260 | padding: 22rpx; |
| 1385 | - // display: flex; | ||
| 1386 | - // align-items: center; | ||
| 1387 | - // justify-content: center; | ||
| 1388 | - | ||
| 1389 | -} | ||
| 1390 | 1261 | ||
| 1391 | -.seat_list1{ | ||
| 1392 | - // width: 1899rpx; | ||
| 1393 | - // height: 1448rpx; | ||
| 1394 | } | 1262 | } |
| 1395 | .my_seat{ | 1263 | .my_seat{ |
| 1396 | width: 100%; | 1264 | width: 100%; |
| @@ -1400,22 +1268,20 @@ | @@ -1400,22 +1268,20 @@ | ||
| 1400 | color: #5B6476; | 1268 | color: #5B6476; |
| 1401 | display: flex; | 1269 | display: flex; |
| 1402 | align-items: center; | 1270 | align-items: center; |
| 1403 | - justify-content: space-between; | ||
| 1404 | text{ | 1271 | text{ |
| 1405 | - font-size: 28rpx; | ||
| 1406 | - color: #5B6476; | ||
| 1407 | - min-width: 118rpx; | ||
| 1408 | - height: 55rpx; | ||
| 1409 | - padding: 0 15rpx; | ||
| 1410 | - background: rgba(169, 177, 192, .1); | 1272 | + background: #FAFAFA; |
| 1273 | + border: 1px solid #CACACA; | ||
| 1411 | border-radius: 10rpx; | 1274 | border-radius: 10rpx; |
| 1412 | - display: flex; | ||
| 1413 | - align-items: center; | ||
| 1414 | - justify-content: center; | 1275 | + font-size: 26rpx; |
| 1276 | + font-family: PingFang SC; | ||
| 1277 | + font-weight: 500; | ||
| 1278 | + color: #40C8A9; | ||
| 1279 | + padding: 20rpx 52rpx; | ||
| 1280 | + margin-left: 30rpx; | ||
| 1415 | } | 1281 | } |
| 1416 | } | 1282 | } |
| 1283 | + | ||
| 1417 | .zw_list{ | 1284 | .zw_list{ |
| 1418 | - // min-width: 600rpx; | ||
| 1419 | padding-top: 20rpx; | 1285 | padding-top: 20rpx; |
| 1420 | display: flex; | 1286 | display: flex; |
| 1421 | flex-wrap: wrap; | 1287 | flex-wrap: wrap; |
| @@ -1423,9 +1289,7 @@ | @@ -1423,9 +1289,7 @@ | ||
| 1423 | width: 40rpx; | 1289 | width: 40rpx; |
| 1424 | height: 40rpx; | 1290 | height: 40rpx; |
| 1425 | .zw_li{ | 1291 | .zw_li{ |
| 1426 | - // margin: 10rpx; | ||
| 1427 | color: #F2F2F2; | 1292 | color: #F2F2F2; |
| 1428 | - // font-size: 60rpx; | ||
| 1429 | font-size: 30rpx; | 1293 | font-size: 30rpx; |
| 1430 | } | 1294 | } |
| 1431 | } | 1295 | } |
| @@ -1436,7 +1300,6 @@ | @@ -1436,7 +1300,6 @@ | ||
| 1436 | height: 900rpx; | 1300 | height: 900rpx; |
| 1437 | } | 1301 | } |
| 1438 | .seat_list_box{ | 1302 | .seat_list_box{ |
| 1439 | - // padding: 0 30rpx; | ||
| 1440 | min-width: 690rpx; | 1303 | min-width: 690rpx; |
| 1441 | display: flex; | 1304 | display: flex; |
| 1442 | flex-direction: column; | 1305 | flex-direction: column; |
| @@ -1459,4 +1322,19 @@ | @@ -1459,4 +1322,19 @@ | ||
| 1459 | height: auto; | 1322 | height: auto; |
| 1460 | } | 1323 | } |
| 1461 | } | 1324 | } |
| 1325 | + | ||
| 1326 | +.bz_add{ | ||
| 1327 | + background: #f8f8f8; | ||
| 1328 | + padding: 30rpx; | ||
| 1329 | + view{ | ||
| 1330 | + background: #2D81FF; | ||
| 1331 | + border-radius: 44rpx; | ||
| 1332 | + font-size: 34rpx; | ||
| 1333 | + font-family: PingFang SC; | ||
| 1334 | + font-weight: 500; | ||
| 1335 | + color: #FFFFFF; | ||
| 1336 | + line-height: 88rpx; | ||
| 1337 | + text-align: center; | ||
| 1338 | + } | ||
| 1339 | +} | ||
| 1462 | </style> | 1340 | </style> |
| 1 | <template> | 1 | <template> |
| 2 | <view class="wrap_box"> | 2 | <view class="wrap_box"> |
| 3 | - <!-- <uParse v-if="datas" :content="datas"></uParse> --> | ||
| 4 | - <!-- <view class="tel_index_bg"></view> --> | ||
| 5 | - <image class="tel_index_bg" src="/static/images/selectseat_bg.png" mode="aspectFill"></image> | 3 | + <CustomReturn title="听课教室选座" color="#fff" :bgColor="bgColor"/> |
| 4 | + <view class="bg-img"> | ||
| 5 | + <image src="/static/imagesV2/stu_selection/selectseat_bg.png" mode="aspectFill"></image> | ||
| 6 | + </view> | ||
| 6 | 7 | ||
| 8 | + <PaddingTopB> | ||
| 7 | <view v-if="datas.info" class="vio_list"> | 9 | <view v-if="datas.info" class="vio_list"> |
| 8 | - <scroll-view scroll-x class="stime_list scroll_x" v-if="datas.type==2"> | 10 | + <scroll-view scroll-x class="stime_list scroll_x" v-if="datas.type ==2"> |
| 9 | <view class="stime_li" :class="{active:index==0}" v-for="(item,index) in datas.timeArr"> | 11 | <view class="stime_li" :class="{active:index==0}" v-for="(item,index) in datas.timeArr"> |
| 10 | <view class="li_tit"> | 12 | <view class="li_tit"> |
| 11 | {{item.title}} | 13 | {{item.title}} |
| @@ -19,6 +21,10 @@ | @@ -19,6 +21,10 @@ | ||
| 19 | </view> | 21 | </view> |
| 20 | </scroll-view> | 22 | </scroll-view> |
| 21 | <view v-else class="xzdata_null"> | 23 | <view v-else class="xzdata_null"> |
| 24 | + <view class="icon"> | ||
| 25 | + <image src="/static/imagesV2/stu_selection/icon-success.png" mode=""></image> | ||
| 26 | + </view> | ||
| 27 | + <view> | ||
| 22 | <view class="d1"> | 28 | <view class="d1"> |
| 23 | 选座已结束 | 29 | 选座已结束 |
| 24 | </view> | 30 | </view> |
| @@ -26,10 +32,11 @@ | @@ -26,10 +32,11 @@ | ||
| 26 | 没有选座的同学赶紧选座吧! | 32 | 没有选座的同学赶紧选座吧! |
| 27 | </view> | 33 | </view> |
| 28 | </view> | 34 | </view> |
| 35 | + </view> | ||
| 36 | + | ||
| 29 | <view class="xz_rule"> | 37 | <view class="xz_rule"> |
| 30 | - <image class="xz_rule_top" src="/static/images/selectseat_rules.png" mode="aspectFill"></image> | ||
| 31 | - <view class="xz_rule_tit"> | ||
| 32 | - 选座规则 | 38 | + <view class="tit-icon"> |
| 39 | + <image src="/static/imagesV2/stu_selection/xuanzuoguize.png" mode="aspectFill"></image> | ||
| 33 | </view> | 40 | </view> |
| 34 | <view class="rule_msg"> | 41 | <view class="rule_msg"> |
| 35 | <view class="xz_room"> | 42 | <view class="xz_room"> |
| @@ -40,26 +47,28 @@ | @@ -40,26 +47,28 @@ | ||
| 40 | </view> | 47 | </view> |
| 41 | </view> | 48 | </view> |
| 42 | </view> | 49 | </view> |
| 50 | + | ||
| 43 | <view class="stu_tit"> | 51 | <view class="stu_tit"> |
| 44 | - <text></text> | ||
| 45 | <view class="">以下学员可以选座</view> | 52 | <view class="">以下学员可以选座</view> |
| 46 | </view> | 53 | </view> |
| 54 | + | ||
| 47 | <view class="stu_list"> | 55 | <view class="stu_list"> |
| 48 | <view class="stu_li" v-for="(item,index) in datas.user"> | 56 | <view class="stu_li" v-for="(item,index) in datas.user"> |
| 49 | - <view class="stu_name"> | ||
| 50 | - <view class="oh1">{{item.name}}</view> | ||
| 51 | - <image v-if="item.sex==2" src="/static/images/tch/icon_female.png" mode="aspectFit"></image> | ||
| 52 | - <image v-else src="/static/images/tch/icon_male.png" mode="aspectFit"></image> | ||
| 53 | - </view> | ||
| 54 | - <view class="stu_time"> | ||
| 55 | - {{item.add_time}} 入学 | ||
| 56 | - </view> | ||
| 57 | <view v-if="item.seat_type==1" class="stu_status"> | 57 | <view v-if="item.seat_type==1" class="stu_status"> |
| 58 | 已选 | 58 | 已选 |
| 59 | </view> | 59 | </view> |
| 60 | <view v-else class="stu_status stu_status1"> | 60 | <view v-else class="stu_status stu_status1"> |
| 61 | 未选 | 61 | 未选 |
| 62 | </view> | 62 | </view> |
| 63 | + <view class="stu_name"> | ||
| 64 | + <view class="oh1">{{item.name}}</view> | ||
| 65 | + <image v-if="item.sex==2" src="/static/imagesV2/stu_selection/icon_female.png" mode="aspectFit"></image> | ||
| 66 | + <image v-else src="/static/imagesV2/stu_selection/icon_male.png" mode="aspectFit"></image> | ||
| 67 | + </view> | ||
| 68 | + <view class="stu_time"> | ||
| 69 | + {{item.add_time}} 入学 | ||
| 70 | + </view> | ||
| 71 | + | ||
| 63 | </view> | 72 | </view> |
| 64 | <u-empty v-if="datas.user&&datas.user.length==0" | 73 | <u-empty v-if="datas.user&&datas.user.length==0" |
| 65 | mode="data" | 74 | mode="data" |
| @@ -68,15 +77,17 @@ | @@ -68,15 +77,17 @@ | ||
| 68 | > | 77 | > |
| 69 | </u-empty> | 78 | </u-empty> |
| 70 | </view> | 79 | </view> |
| 71 | - </view> | ||
| 72 | 80 | ||
| 73 | <view v-if="datas.user&&datas.user.length>0" class="bz_add" > | 81 | <view v-if="datas.user&&datas.user.length>0" class="bz_add" > |
| 74 | <view class="" @click="$service.jump" :data-url="'/pagesStu/stu_seat_list/stu_seat_list?id='+datas.info.id"> | 82 | <view class="" @click="$service.jump" :data-url="'/pagesStu/stu_seat_list/stu_seat_list?id='+datas.info.id"> |
| 75 | 去选座 | 83 | 去选座 |
| 76 | </view> | 84 | </view> |
| 77 | </view> | 85 | </view> |
| 78 | - <!-- 阻止滑动 --> | ||
| 79 | - <!-- <view @touchmove.stop.prevent='test'></view> --> | 86 | + |
| 87 | + </view> | ||
| 88 | + | ||
| 89 | + </PaddingTopB> | ||
| 90 | + | ||
| 80 | </view> | 91 | </view> |
| 81 | </template> | 92 | </template> |
| 82 | 93 | ||
| @@ -86,11 +97,18 @@ | @@ -86,11 +97,18 @@ | ||
| 86 | mapState, | 97 | mapState, |
| 87 | mapMutations | 98 | mapMutations |
| 88 | } from 'vuex' | 99 | } from 'vuex' |
| 100 | + import CustomReturn from "@/components/CustomReturn/index.vue" | ||
| 101 | + import PaddingTopB from "@/components/PaddingTopB/index.vue" | ||
| 89 | var that | 102 | var that |
| 90 | var djs_name | 103 | var djs_name |
| 91 | export default { | 104 | export default { |
| 105 | + components: { | ||
| 106 | + CustomReturn, | ||
| 107 | + PaddingTopB | ||
| 108 | + }, | ||
| 92 | data() { | 109 | data() { |
| 93 | return { | 110 | return { |
| 111 | + bgColor: 'none', | ||
| 94 | options:'', | 112 | options:'', |
| 95 | time_list:[ | 113 | time_list:[ |
| 96 | { | 114 | { |
| @@ -131,6 +149,13 @@ | @@ -131,6 +149,13 @@ | ||
| 131 | return this.getDate('end'); | 149 | return this.getDate('end'); |
| 132 | } | 150 | } |
| 133 | }, | 151 | }, |
| 152 | + onPageScroll(e) { | ||
| 153 | + if(e.scrollTop > 0 ) { | ||
| 154 | + this.bgColor = '#3384fc' | ||
| 155 | + }else { | ||
| 156 | + this.bgColor = 'none' | ||
| 157 | + } | ||
| 158 | + }, | ||
| 134 | onLoad(e) { | 159 | onLoad(e) { |
| 135 | that=this | 160 | that=this |
| 136 | that.options=e||{} | 161 | that.options=e||{} |
| @@ -308,24 +333,12 @@ | @@ -308,24 +333,12 @@ | ||
| 308 | 333 | ||
| 309 | <style lang="scss" scoped> | 334 | <style lang="scss" scoped> |
| 310 | .wrap_box{ | 335 | .wrap_box{ |
| 311 | - width: 100%; | ||
| 312 | - // padding: 30rpx; | ||
| 313 | - min-height: 100vh; | ||
| 314 | - // #ifdef H5 | ||
| 315 | - min-height: calc(100vh - 44px); | ||
| 316 | - // #endif | ||
| 317 | - background: #F8F8F8; | ||
| 318 | - position: relative; | ||
| 319 | padding-bottom: 120rpx; | 336 | padding-bottom: 120rpx; |
| 320 | } | 337 | } |
| 321 | - | ||
| 322 | -.tel_index_bg { | 338 | +.bg-img { |
| 339 | + height: 504rpx; | ||
| 323 | position: absolute; | 340 | position: absolute; |
| 324 | - top: 0; | ||
| 325 | - z-index: 1; | ||
| 326 | width: 100%; | 341 | width: 100%; |
| 327 | - height: 250rpx; | ||
| 328 | - background: url('/static/images/selectseat_bg.png') repeat fixed center; | ||
| 329 | } | 342 | } |
| 330 | 343 | ||
| 331 | .vio_list{ | 344 | .vio_list{ |
| @@ -344,7 +357,7 @@ | @@ -344,7 +357,7 @@ | ||
| 344 | } | 357 | } |
| 345 | .stime_list{ | 358 | .stime_list{ |
| 346 | width: 100%; | 359 | width: 100%; |
| 347 | - // padding: 0 30rpx; | 360 | + margin: 20rpx 0 60rpx 0; |
| 348 | .stime_li{ | 361 | .stime_li{ |
| 349 | width: 144rpx; | 362 | width: 144rpx; |
| 350 | height: 102rpx; | 363 | height: 102rpx; |
| @@ -389,122 +402,100 @@ | @@ -389,122 +402,100 @@ | ||
| 389 | } | 402 | } |
| 390 | .xz_rule{ | 403 | .xz_rule{ |
| 391 | width: 100%; | 404 | width: 100%; |
| 392 | - height: 306rpx; | ||
| 393 | background: #FFFFFF; | 405 | background: #FFFFFF; |
| 394 | - border-radius: 32rpx; | ||
| 395 | - margin-top: 80rpx; | ||
| 396 | - position: relative; | ||
| 397 | - .xz_rule_top{ | ||
| 398 | - width: 100%; | ||
| 399 | - height: 154rpx; | ||
| 400 | - margin-top: -40rpx; | 406 | + border-radius: 20rpx; |
| 401 | position: relative; | 407 | position: relative; |
| 402 | - z-index: 2; | ||
| 403 | - } | ||
| 404 | - .xz_rule_tit{ | ||
| 405 | - width: 100%; | ||
| 406 | - height: 74rpx; | ||
| 407 | - display: flex; | ||
| 408 | - align-items: center; | ||
| 409 | - padding: 0 40rpx; | 408 | + padding: 60rpx 30rpx 30rpx; |
| 409 | + .tit-icon { | ||
| 410 | position: absolute; | 410 | position: absolute; |
| 411 | - top: 0; | ||
| 412 | left: 0; | 411 | left: 0; |
| 413 | - z-index: 10; | ||
| 414 | - font-size: 30rpx; | ||
| 415 | - color: #FFFFFF; | 412 | + top: 0; |
| 413 | + width: 130rpx; | ||
| 414 | + height: 40rpx; | ||
| 416 | } | 415 | } |
| 417 | .rule_msg{ | 416 | .rule_msg{ |
| 418 | - width: 100%; | ||
| 419 | - padding: 0 30rpx; | ||
| 420 | .xz_room{ | 417 | .xz_room{ |
| 421 | - font-size: 30rpx; | ||
| 422 | - color: #545D71; | ||
| 423 | - position: relative; | ||
| 424 | - padding-left: 21rpx; | ||
| 425 | - &:before{ | ||
| 426 | - content:''; | ||
| 427 | - position: absolute; | ||
| 428 | - left: 0; | ||
| 429 | - top: 50%; | ||
| 430 | - margin-top: -13rpx; | ||
| 431 | - width: 6rpx; | ||
| 432 | - height: 26rpx; | ||
| 433 | - background: #2D81FF; | ||
| 434 | - border-radius: 3rpx; | ||
| 435 | - } | ||
| 436 | - | 418 | + font-size: 28rpx; |
| 419 | + font-family: PingFang SC; | ||
| 420 | + font-weight: 500; | ||
| 421 | + color: #323232; | ||
| 437 | } | 422 | } |
| 438 | .rule_tip{ | 423 | .rule_tip{ |
| 439 | - padding-top: 30rpx; | ||
| 440 | - font-size: 28rpx; | ||
| 441 | - color: #A9B1C0; | 424 | + font-size: 22rpx; |
| 425 | + font-family: PingFang SC; | ||
| 426 | + font-weight: 400; | ||
| 427 | + color: #979797; | ||
| 428 | + margin-top: 20rpx; | ||
| 442 | } | 429 | } |
| 443 | } | 430 | } |
| 444 | } | 431 | } |
| 445 | .stu_tit{ | 432 | .stu_tit{ |
| 446 | - width: 100%; | ||
| 447 | - height: 94rpx; | ||
| 448 | font-size: 28rpx; | 433 | font-size: 28rpx; |
| 449 | - color: #545D71; | ||
| 450 | - display: flex; | ||
| 451 | - align-items: center; | ||
| 452 | - text{ | ||
| 453 | - width: 16rpx; | ||
| 454 | - height: 16rpx; | ||
| 455 | - background: #FFAC0D; | ||
| 456 | - border-radius: 50%; | ||
| 457 | - margin-right: 8rpx; | 434 | + font-family: PingFang SC; |
| 435 | + font-weight: 500; | ||
| 436 | + color: #323232; | ||
| 437 | + margin: 30rpx 0; | ||
| 438 | + padding-left: 20rpx; | ||
| 439 | + position: relative; | ||
| 440 | + &:before{ | ||
| 441 | + content:''; | ||
| 442 | + position: absolute; | ||
| 443 | + left: 0; | ||
| 444 | + top: 0; | ||
| 445 | + bottom: 0; | ||
| 446 | + width: 10rpx; | ||
| 447 | + background: #2D81FF; | ||
| 448 | + border-radius: 6rpx; | ||
| 458 | } | 449 | } |
| 459 | } | 450 | } |
| 460 | .stu_list{ | 451 | .stu_list{ |
| 461 | width: 100%; | 452 | width: 100%; |
| 462 | - // height: 740px; | ||
| 463 | background: #FFFFFF; | 453 | background: #FFFFFF; |
| 464 | - border-radius: 10rpx; | ||
| 465 | - padding: 15rpx 0; | 454 | + border-radius: 20rpx; |
| 466 | .stu_li{ | 455 | .stu_li{ |
| 467 | width: 100%; | 456 | width: 100%; |
| 468 | - padding: 0 30rpx; | ||
| 469 | - height: 80rpx; | 457 | + padding: 30rpx; |
| 470 | display: flex; | 458 | display: flex; |
| 471 | align-items: center; | 459 | align-items: center; |
| 472 | .stu_name{ | 460 | .stu_name{ |
| 473 | - font-size: 30rpx; | ||
| 474 | - color: #545D71; | 461 | + font-size: 28rpx; |
| 462 | + font-family: PingFang SC; | ||
| 463 | + font-weight: 400; | ||
| 464 | + color: #323232; | ||
| 475 | display: flex; | 465 | display: flex; |
| 476 | align-items: center; | 466 | align-items: center; |
| 477 | - view{ | ||
| 478 | - line-height: 32rpx; | ||
| 479 | - height: 32rpx; | ||
| 480 | - max-width: 250rpx; | ||
| 481 | - } | 467 | + |
| 482 | image { | 468 | image { |
| 483 | - width: 28rpx; | ||
| 484 | - height: 28rpx; | ||
| 485 | - margin-left: 12rpx; | 469 | + width: 30rpx; |
| 470 | + height: 26rpx; | ||
| 471 | + margin-left: 20rpx; | ||
| 486 | } | 472 | } |
| 487 | } | 473 | } |
| 488 | .stu_time{ | 474 | .stu_time{ |
| 489 | flex: 1; | 475 | flex: 1; |
| 490 | - font-size: 28rpx; | ||
| 491 | - font-family: Arial; | ||
| 492 | - color: #A9B1C0; | ||
| 493 | - padding-left: 20rpx; | 476 | + font-size: 24rpx; |
| 477 | + font-family: PingFang SC; | ||
| 478 | + font-weight: 400; | ||
| 479 | + color: #979797; | ||
| 480 | + text-align: right; | ||
| 494 | } | 481 | } |
| 495 | .stu_status{ | 482 | .stu_status{ |
| 496 | - font-size: 26rpx; | ||
| 497 | - color: #2D81FF; | ||
| 498 | - width: 78rpx; | ||
| 499 | - height: 38rpx; | ||
| 500 | - background: rgba(45, 129, 255, .1); | ||
| 501 | - border-radius: 4rpx; | ||
| 502 | - display: flex; | ||
| 503 | - align-items: center; | ||
| 504 | - justify-content: center; | 483 | + |
| 484 | + padding: 4rpx 6rpx; | ||
| 485 | + | ||
| 486 | + font-size: 20rpx; | ||
| 487 | + font-family: PingFang SC; | ||
| 488 | + font-weight: 500; | ||
| 489 | + | ||
| 490 | + background: #F3F4F6; | ||
| 491 | + border: 1px solid #CACACA; | ||
| 492 | + border-radius: 2px; | ||
| 493 | + color: #979797; | ||
| 494 | + margin-right: 20rpx; | ||
| 505 | &.stu_status1{ | 495 | &.stu_status1{ |
| 506 | - color: #AFB6C4; | ||
| 507 | - background: rgba(175, 182, 196, .1); | 496 | + background: #FFF1F0; |
| 497 | + border: 1px solid #FFAFAE; | ||
| 498 | + color: #EC5656; | ||
| 508 | } | 499 | } |
| 509 | } | 500 | } |
| 510 | } | 501 | } |
| @@ -513,39 +504,42 @@ | @@ -513,39 +504,42 @@ | ||
| 513 | width: 100%; | 504 | width: 100%; |
| 514 | position: fixed; | 505 | position: fixed; |
| 515 | bottom: 0; | 506 | bottom: 0; |
| 516 | - background: #f8f8f8; | 507 | + background: #FFFFFF; |
| 517 | z-index: 800; | 508 | z-index: 800; |
| 518 | left: 0; | 509 | left: 0; |
| 519 | - padding: 30rpx; | 510 | + padding: 15rpx 25rpx; |
| 520 | view{ | 511 | view{ |
| 521 | - font-size: 32rpx; | ||
| 522 | - color: #FFFFFF; | ||
| 523 | - width: 100%; | ||
| 524 | - height: 90rpx; | ||
| 525 | background: #2D81FF; | 512 | background: #2D81FF; |
| 526 | - border-radius: 10rpx; | ||
| 527 | - display: flex; | ||
| 528 | - align-items: center; | ||
| 529 | - justify-content: center; | 513 | + border-radius: 44rpx; |
| 514 | + line-height: 88rpx; | ||
| 515 | + font-size: 34rpx; | ||
| 516 | + font-family: PingFang SC; | ||
| 517 | + font-weight: 500; | ||
| 518 | + text-align: center; | ||
| 519 | + color: #FFFFFF; | ||
| 530 | } | 520 | } |
| 531 | } | 521 | } |
| 532 | .xzdata_null{ | 522 | .xzdata_null{ |
| 533 | - width: 100%; | ||
| 534 | - height: 110rpx; | ||
| 535 | display: flex; | 523 | display: flex; |
| 536 | align-items: center; | 524 | align-items: center; |
| 537 | - // justify-content: center; | ||
| 538 | - flex-direction: column; | ||
| 539 | - position: relative; | ||
| 540 | - // top: -20rpx; | ||
| 541 | - margin-bottom: -40rpx; | 525 | + margin: 50rpx 0; |
| 526 | + .icon { | ||
| 527 | + width: 60rpx; | ||
| 528 | + height: 60rpx; | ||
| 529 | + margin-right: 20rpx; | ||
| 530 | + } | ||
| 542 | .d1{ | 531 | .d1{ |
| 543 | - font-size: 36rpx; | 532 | + font-size: 32rpx; |
| 533 | + font-family: PingFang SC; | ||
| 534 | + font-weight: 500; | ||
| 544 | color: #FFFFFF; | 535 | color: #FFFFFF; |
| 545 | } | 536 | } |
| 546 | .d2{ | 537 | .d2{ |
| 547 | - font-size: 26rpx; | 538 | + font-size: 24rpx; |
| 539 | + font-family: PingFang SC; | ||
| 540 | + font-weight: 500; | ||
| 548 | color: #FFFFFF; | 541 | color: #FFFFFF; |
| 542 | + margin-top: 20rpx; | ||
| 549 | } | 543 | } |
| 550 | } | 544 | } |
| 551 | </style> | 545 | </style> |
static/imagesV2/stu_myseat/bg.png
0 → 100644
8.0 KB
static/imagesV2/stu_register/icon1.png
0 → 100644
609 字节
1.3 KB
555 字节
static/imagesV2/stu_selection/icon_male.png
0 → 100644
573 字节
32.8 KB
1.4 KB
static/imagesV2/study/bjbg.png
0 → 100644
1.6 KB
static/imagesV2/study/icon-edit.png
0 → 100644
470 字节
static/imagesV2/study/kcb.png
0 → 100644
1.9 KB
static/imagesV2/study/rxdj-go.png
0 → 100644
979 字节
static/imagesV2/study/rxdj.png
0 → 100644
18.4 KB
static/imagesV2/study/tkjsxz.png
0 → 100644
1.7 KB
static/imagesV2/study/xfqk.png
0 → 100644
1.6 KB
static/imagesV2/study/xjxg.png
0 → 100644
1.8 KB
static/imagesV2/study/xuanzuo.png
0 → 100644
1.4 KB
static/imagesV2/study/xuefen-bg.png
0 → 100644
34.2 KB
static/imagesV2/study/xuexicepingbj-go.png
0 → 100644
999 字节
static/imagesV2/study/xuexicepingbj.png
0 → 100644
18.7 KB
static/imagesV2/study/xzxx.png
0 → 100644
1.6 KB
-
请 注册 或 登录 后发表评论