Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php

src/frontend/web/css/main.css

@@ -424,8 +424,8 @@ a,a:hover,a:link {
     width: 100%;
     left: 0;
     top: 0;
-    height: 180px;
-    line-height: 180px;
+    height: 150px;
+    line-height: 150px;
     text-align: center;
     font-size: 64px;
     color: #fff;
@@ -507,6 +507,7 @@ a,a:hover,a:link {
     background-color: #fff;
     border: 1px solid #f3f3f3;
     border-top: none;
+    padding-left: 10px;
 }
 .video-teacher {
     padding: 10px;
@@ -538,7 +539,7 @@ a,a:hover,a:link {
 .video-sm-info {
     height: 80px;
     line-height: 80px;
-    padding-right: 30px;
+    padding-right: 20px;
 }
 .video-sm-info a {
     display: inline-block;
@@ -559,26 +560,22 @@ a,a:hover,a:link {
     line-height: 30px;
     top: 0;
     left: 0;
-    font-size: 30px;
+    font-size: 24px;
 }
 
 /*video detail*/
 .warp-box {
     background-color: #fff;
-    margin-top: 40px;
+    margin-top: 20px;
     padding: 20px 0;
     border-top: 1px solid #f3f3f3;
 }
-.video-description .title {
-    font-size: 16px;
-    color: #333;
-    padding-bottom: 10px;
-}
 .video-description .text {
     color: #999;
 }
 .video-description .text img {
     max-width: 100%;
+    height: auto;
     border: none;
     vertical-align: top;
 }
@@ -586,10 +583,14 @@ a,a:hover,a:link {
 .video-comment {
     margin-top: 30px;
 }
+.video-description .title,
 .video-comment .title {
     font-size: 16px;
     color: #333;
-    padding-bottom: 10px;
+    padding-left: 10px;
+    border-left: 3px solid #3f7de4;
+    margin-bottom: 20px;
+    margin-top: 20px;
 }
 .video-comment .title small {
     font-size: 12px;
@@ -608,30 +609,49 @@ a,a:hover,a:link {
 }
 .comment-box {
     position: relative;
-    padding-left: 60px;
-    margin-top: 20px;
-    padding-bottom: 40px;
+    margin-bottom: 40px;
 }
 .comment-head img {
-    width: 50px;
-    height: 50px;
+    width: 34px;
+    height: 34px;
     border-radius: 100%;
 }
 .comment-head {
-    position: absolute;
-    left: 0;
-    top: 0;
-    padding-right: 10px;
+    padding: 10px;
+}
+.comment-head span {
+    display: inline-block;
+    height: 34px;
+    line-height: 34px;
 }
 .comment-input {
     display: block;
+    border: 1px solid #e7e7e7;
 }
 .comment-input textarea {
-    height: 50px;
+    height: 80px;
+    border: none;
+    box-shadow: none;
+    border-radius: inherit;
+    width: 100%;
+    vertical-align: top;
+    outline: none;
+}
+.textarea-box {
+    padding: 10px;
+}
+.btn {
+    outline: none;
+}
+.comment-foot {
+    border-top:1px solid #f3f3f3;
 }
 .m-t-10 {
     margin-top: 10px;
 }
+.m-r-10 {
+    margin-right: 10px;
+}
 .m-l-20 {
     margin-left: 20px;
 }
@@ -643,16 +663,20 @@ a,a:hover,a:link {
     width: 50px;
     border-radius: 100%;
 }
-.user-i span,
-.user-i span small {
+.user-i span {
     font-size: 14px;
     color: #999;
 }
+.user-i span small {
+    font-size:12px;
+    color: #999;
+}
 .user-i span small {
     padding-left: 5px;
 }
 .user-i p {
     padding-top: 5px;
+    font-size: 14px;
 }
 .comment-main-list {
     margin-bottom: 40px;

src/frontend/web/js/home/components/video-intro.vue

@@ -13,21 +13,32 @@
                     <small>{{coursewareInfo.comment_count}}</small>
                 </div>
             </div>
-            <div v-if="coursewareInfo.isGuest" class="comment-login">
+            <!--<div v-if="coursewareInfo.isGuest" class="comment-login">
                 需要 <a @click="login" href="javascript:;">登录</a> 才能评论
-            </div>
+            </div>-->
             <div v-else class="comment-box">
 
                 <div class="comment-input">
-                    <textarea v-model="content" cols="30" rows="10" class="form-control"
-                              placeholder="说几句吧，亲..."></textarea>
+                    <div class="textarea-box">
+                        <textarea v-model="content" cols="30" rows="10" placeholder="说几句吧，亲..."></textarea>
+                    </div>
+
+                    <div v-if="coursewareInfo.isGuest" class="comment-foot clearfix">
+
+                        <div class="comment-head pull-left" >
+                            <span>需要 <a @click="login" href="javascript:;">登录</a> 才能评论</span>
+                        </div>
+
+                        <button @click="comment" class="btn btn-info pull-right m-t-10 m-r-10" disabled="disabled">发表评论</button>
+                    </div>
+
+                    <div v-else class="comment-foot clearfix">
 
-                    <div class="comment-foot clearfix">
-                        <div class="comment-head pull-left">
+                        <div class="comment-head pull-left" >
                             <img :src="coursewareInfo.userAvatar">
                         </div>
 
-                        <button @click="comment" class="btn btn-default pull-right m-t-10">发表评论</button>
+                        <button @click="comment" class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
                     </div>
 
                 </div>

src/frontend/web/js/home/components/video-play.vue

@@ -30,7 +30,7 @@
                 </button>
                 <template v-else>
                     <button v-if="coursewareInfo.isShop" class="btn btn-danger m-l-20 hidden-xs mb-left"
-                            data-toggle="modal">已购买
+                            data-toggle="modal" disabled="disabled">已购买
                     </button>
                     <template v-else>
                         <button v-if="isMobile === false && isWeixin === false" class="btn btn-danger m-l-20 mb-left"