Skip to content

Commit

Permalink
Merge pull request #104 from Qsnh/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@Qsnh
Qsnh authored Mar 11, 2020
2 parents 384e736 + 881b325 commit ea1d50f
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 76 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
| --- | --- |
| `Baiyuetribe` | [https://github.com/Baiyuetribe](https://github.com/Baiyuetribe) |
| `Ron.wiki` | [http://ron.wiki](http://ron.wiki) |
| `Aunger` | [https://www.aunwen.com](https://www.aunwen.com) |

## 捐赠

Expand Down
2 changes: 1 addition & 1 deletion public/frontend/css/frontend.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/frontend/js/frontend.js": "/frontend/js/frontend.js?id=f46fb0b79170b0467ac3",
"/frontend/css/frontend.css": "/frontend/css/frontend.css?id=c0c2c9574ea5ac1ffc93",
"/frontend/css/frontend.css": "/frontend/css/frontend.css?id=58f1a661889e58d77294",
"/h5/css/app.css": "/h5/css/app.css?id=f6eef83bda7dfebec1f9",
"/h5/js/app.js": "/h5/js/app.js?id=f2ff2fe8da0a8a91a9f9"
}
10 changes: 5 additions & 5 deletions resources/assets/frontend/sass/app.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ $container-max-widths: (
body {
background-color: #f8fafb;
padding-top: 70px;
font-family: "微软雅黑";
}

input.form-control {
Expand Down Expand Up @@ -152,6 +153,8 @@ a {
}

footer.footer-box {
width: 100%;
height: auto;
background: #0e0c1e;
padding-top: 30px;

Expand Down Expand Up @@ -1471,7 +1474,6 @@ footer.footer-box {
.course-banner {
width: 100%;
height: 264px;
float: left;
background-image: url("/images/member-bg.png");
background-position: bottom center;
background-repeat: no-repeat;
Expand Down Expand Up @@ -1502,7 +1504,6 @@ footer.footer-box {
height: 300px;
float: left;
margin-top: -150px;
z-index: 22;
background-color: #ffffff;
border-radius: 8px 8px 0px 0px;
padding: 30px;
Expand Down Expand Up @@ -2235,7 +2236,6 @@ footer.footer-box {
.role-center-banner {
width: 100%;
height: 264px;
float: left;
background-image: url("/images/member-bg.png");
background-position: bottom center;
background-repeat: no-repeat;
Expand All @@ -2251,8 +2251,8 @@ footer.footer-box {
width: 100%;
height: auto;
float: left;
margin-top: 100px;
margin-bottom: 100px;
padding-top: 100px;
padding-bottom: 100px;
flex-flow: row wrap;

.role-list-item {
Expand Down
6 changes: 4 additions & 2 deletions resources/views/frontend/auth/login.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@
</div>
<div class="form-group text-center">
@foreach(enabled_socialites() as $socialite)
<a class="btn btn-square btn-primary mr-2"
href="{{route('socialite', $socialite['app'])}}">{!! $socialite['icon'] !!}</a>
<a class="mr-2 text-decoration-none"
href="{{route('socialite', $socialite['app'])}}">
<img src="{{$socialite['logo']}}" width="24" height="24">
</a>
@endforeach
</div>
@endif
Expand Down
2 changes: 1 addition & 1 deletion resources/views/frontend/components/mobile.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="input-group">
<input type="text" name="captcha" placeholder="验证码" class="form-control" required>
<div class="input-group-append">
<img src="{{ captcha_src() }}" class="captcha" width="120" height="36">
<img src="{{ captcha_src() }}" class="captcha" width="120" height="48">
</div>
</div>
</div>
Expand Down
90 changes: 46 additions & 44 deletions resources/views/frontend/course/show.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@section('content')

<div class="course-banner">
<div class="container-fluid course-banner">
<div class="container">
<div class="row">
<div class="col-12">
Expand All @@ -18,51 +18,53 @@
</div>
</div>

<div class="container">
<div class="row">
<div class="col-12">
<div class="course-info-box">
<div class="course-thumb">
<img class="course-thumb-img" src="{{$course['thumb']}}" width="320" height="240">
@if($isBuy)
<div class="paid">
<img src="/images/icons/paid.png" width="100" height="100">
</div>
@endif
</div>
<div class="course-info">
<h2 class="course-title">
{{$course['title']}}

@if($isLikeCourse)
<div data-login="{{$user ? 1 : 0}}"
data-url="{{route('ajax.course.like', [$course['id']])}}" class="like-button">
<img src="/images/icons/like-hover.png" width="24" height="24">
<span>已收藏</span>
</div>
@else
<div data-login="{{$user ? 1 : 0}}"
data-url="{{route('ajax.course.like', [$course['id']])}}" class="like-button">
<img src="/images/icons/like.png" width="24" height="24">
<span>收藏课程</span>
<div class="container-fluid">
<div class="container">
<div class="row">
<div class="col-12">
<div class="course-info-box">
<div class="course-thumb">
<img class="course-thumb-img" src="{{$course['thumb']}}" width="320" height="240">
@if($isBuy)
<div class="paid">
<img src="/images/icons/paid.png" width="100" height="100">
</div>
@endif
</h2>
<div class="course-description">{{$course['short_description']}}</div>
<div class="course-extra-info">
@if($isBuy)
@if($firstVideo)
<a href="{{route('video.show', [$firstVideo['course_id'], $firstVideo['id'], $firstVideo['slug']])}}"
class="buy-course-button">开始学习</a>
</div>
<div class="course-info">
<h2 class="course-title">
{{$course['title']}}

@if($isLikeCourse)
<div data-login="{{$user ? 1 : 0}}"
data-url="{{route('ajax.course.like', [$course['id']])}}" class="like-button">
<img src="/images/icons/like-hover.png" width="24" height="24">
<span>已收藏</span>
</div>
@else
<a href="javascript:void(0);" onclick="flashWarning('暂无视频')"
class="buy-course-button">开始学习</a>
<div data-login="{{$user ? 1 : 0}}"
data-url="{{route('ajax.course.like', [$course['id']])}}" class="like-button">
<img src="/images/icons/like.png" width="24" height="24">
<span>收藏课程</span>
</div>
@endif
@else
<span class="course-price"><small>￥</small>{{$course['charge']}}</span>
<a data-login="{{$user ? 1 : 0}}" href="{{route('member.course.buy', [$course['id']])}}"
class="buy-course-button login-auth">订阅课程</a>
@endif
</h2>
<div class="course-description">{{$course['short_description']}}</div>
<div class="course-extra-info">
@if($isBuy)
@if($firstVideo)
<a href="{{route('video.show', [$firstVideo['course_id'], $firstVideo['id'], $firstVideo['slug']])}}"
class="buy-course-button">开始学习</a>
@else
<a href="javascript:void(0);" onclick="flashWarning('暂无视频')"
class="buy-course-button">开始学习</a>
@endif
@else
<span class="course-price"><small>￥</small>{{$course['charge']}}</span>
<a data-login="{{$user ? 1 : 0}}" href="{{route('member.course.buy', [$course['id']])}}"
class="buy-course-button login-auth">订阅课程</a>
@endif
</div>
</div>
</div>
</div>
Expand All @@ -74,7 +76,7 @@ class="buy-course-button login-auth">订阅课程</a>
<div class="row">
<div class="col-12">
<div class="course-menu-box"
style="margin-top: 0px; border-radius:0px 0px 8px 8px; box-shadow:0px 4px 8px 0px rgba(229,229,229,1); padding-left: 30px;">
style="margin-top: 0px; border-radius:0px 0px 8px 8px;">
<div class="menu-item {{!$scene ? 'active' : ''}}">
<a href="{{route('course.show', [$course['id'], $course['slug']])}}"
class="course-show-menu-item" data-page="course-show-page-desc">课程介绍</a>
Expand All @@ -92,7 +94,7 @@ class="course-show-menu-item" data-page="course-show-page-chapter">课程目录<
</div>

@if(!$scene || $scene === 'chapter')
<div>
<div class="container-fluid">
<div class="container course-show-page-desc {{!$scene ? '' : 'display-none'}}">
<div class="row">
<div class="col-12">
Expand Down
42 changes: 20 additions & 22 deletions resources/views/frontend/role/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,29 @@
</div>
</div>

<div class="container-fluid">
<div class="container">
<div class="row">
<div class="col-12">
<div class="role-list-box d-flex justify-content-center">
@foreach($gRoles as $index => $roleItem)
<div data-url="{{route('member.role.buy', [$roleItem['id']])}}"
class="role-list-item {{$index % 3 === 0 ? 'first' : ''}}">
<div class="name">{{$roleItem['name']}}</div>
<div class="price">
<small>￥</small>{{$roleItem['charge']}}</div>
<div class="desc">
@foreach($roleItem['desc_rows'] as $item)
<p>{{$item}}</p>
@endforeach
</div>
<div class="container">
<div class="row">
<div class="col-12">
<div class="role-list-box d-flex justify-content-center">
@foreach($gRoles as $index => $roleItem)
<div data-url="{{route('member.role.buy', [$roleItem['id']])}}"
class="role-list-item {{$index % 3 === 0 ? 'first' : ''}}">
<div class="name">{{$roleItem['name']}}</div>
<div class="price">
<small>￥</small>{{$roleItem['charge']}}</div>
<div class="desc">
@foreach($roleItem['desc_rows'] as $item)
<p>{{$item}}</p>
@endforeach
</div>
@endforeach
</div>
</div>
<div class="col-12 text-center">
<a data-login="{{$user ? 1 : 0}}" href="javascript:void(0)"
class="role-join-button login-auth">开通会员</a>
</div>
@endforeach
</div>
</div>
<div class="col-12 text-center">
<a data-login="{{$user ? 1 : 0}}" href="javascript:void(0)"
class="role-join-button login-auth">开通会员</a>
</div>
</div>
</div>

Expand Down

0 comments on commit ea1d50f

Please sign in to comment.