Merge remote-tracking branch 'origin/dev' into dev

src/frontend/views/layouts/center.php

@@ -66,10 +66,52 @@ $this->registerCss('[v-cloak] {display:none;}');
 <?= $content ?>
 
 <div class="foot navbar-fixed-bottom">
-    <p><a href="javascript:;">使用协议</a> - <a href="javascript:;">帮助中心</a> - <a href="javascript:;">联系我们</a></p>
+    <p><a href="http://yunya.my.pp.cc/detail/178567.htm" target="_blank">使用协议</a> - <a href="http://yunya.my.pp.cc/category/20422.htm" target="_blank">帮助中心</a> - <a href="http://yunya.my.pp.cc/contact" target="_blank">联系我们</a></p>
     <p>©2016 c.pp.cc</p>
 </div>
 
+<script type='text/javascript'>
+    $(function () {
+
+        // 左侧菜单
+        var justic = $(window).width();
+        if (justic > 768){
+            $('.menu-btn').click(function () {
+                var bj = $('#biaoJi').val();
+                if (bj == 0) {
+                    $('.tp-sidebar').css('display', 'none');
+                    $('.auto-main').css('padding-left', '30px');
+                    $('.menu-btn').css('padding-left', '30px');
+                    $('.foot p').css('padding-left', '30px');
+                    $('#biaoJi').val('1');
+                } else {
+                    $('.tp-sidebar').css('display', 'block');
+                    $('.auto-main').css('padding-left', '255px');
+                    $('.menu-btn').css('padding-left', '255px');
+                    $('.foot p').css('padding-left', '255px');
+                    $('#biaoJi').val('0');
+                }
+            });
+        }else {
+            $('.menu-btn').click(function () {
+                $('.menu-mask').css('display', 'block');
+                $('.tp-sidebar').animate({left: "0"});
+            });
+            $('.menu-mask').click(function () {
+                $(this).css('display', 'none');
+                $('.tp-sidebar').animate({left: "-225px"});
+            });
+        }
+
+
+        //课程列表
+        turmbw = $('.video-img-box img').width();
+        turmbh = turmbw*5/9;
+        $('.video-img-box img,.play-mask').css('height',turmbh);
+        $('.play-mask').css('padding-top',turmbh/2-20);
+    })
+</script>
+
 <?php $this->endBody(); ?>
 </body>
 </html>

src/frontend/views/layouts/classCenter.php

@@ -63,40 +63,6 @@ $this->beginContent('@app/views/layouts/center.php');
     </div>
 
     <input id="biaoJi" type="text" value="0" style="display: none">
-
-    <script type='text/javascript'>
-        $(function () {
-            var justic = $(window).width();
-            if (justic > 768){
-                $('.menu-btn').click(function () {
-                    var bj = $('#biaoJi').val();
-                    if (bj == 0) {
-                        $('.tp-sidebar').css('display', 'none');
-                        $('.auto-main').css('padding-left', '30px');
-                        $('.menu-btn').css('padding-left', '30px');
-                        $('.foot p').css('padding-left', '30px');
-                        $('#biaoJi').val('1');
-                    } else {
-                        $('.tp-sidebar').css('display', 'block');
-                        $('.auto-main').css('padding-left', '255px');
-                        $('.menu-btn').css('padding-left', '255px');
-                        $('.foot p').css('padding-left', '255px');
-                        $('#biaoJi').val('0');
-                    }
-                });
-            }else {
-                $('.menu-btn').click(function () {
-                    $('.menu-mask').css('display', 'block');
-                    $('.tp-sidebar').animate({left: "0"});
-                });
-                $('.menu-mask').click(function () {
-                    $(this).css('display', 'none');
-                    $('.tp-sidebar').animate({left: "-225px"});
-                });
-            }
-        })
-    </script>
-
     <div class="menu-mask"></div>
 
     <div class="auto-main">

src/frontend/views/layouts/userCenter.php

@@ -53,6 +53,7 @@ $this->beginContent('@app/views/layouts/center.php');
     </div>
 
     <div class="menu-mask"></div>
+    <input id="biaoJi" type="text" value="0" style="display: none">
 
     <div class="auto-main">
         <?= $this->render('centerHeader') ?>
@@ -63,40 +64,6 @@ $this->beginContent('@app/views/layouts/center.php');
         </div>
     </div>
 
-    <input id="biaoJi" type="text" value="0" style="display: none">
-
-    <script type='text/javascript'>
-        $(function () {
-            var justic = $(window).width();
-            if (justic > 768){
-                $('.menu-btn').click(function () {
-                    var bj = $('#biaoJi').val();
-                    if (bj == 0) {
-                        $('.tp-sidebar').css('display', 'none');
-                        $('.auto-main').css('padding-left', '30px');
-                        $('.menu-btn').css('padding-left', '30px');
-                        $('.foot p').css('padding-left', '30px');
-                        $('#biaoJi').val('1');
-                    } else {
-                        $('.tp-sidebar').css('display', 'block');
-                        $('.auto-main').css('padding-left', '255px');
-                        $('.menu-btn').css('padding-left', '255px');
-                        $('.foot p').css('padding-left', '255px');
-                        $('#biaoJi').val('0');
-                    }
-                });
-            }else {
-                $('.menu-btn').click(function () {
-                    $('.menu-mask').css('display', 'block');
-                    $('.tp-sidebar').animate({left: "0"});
-                });
-                $('.menu-mask').click(function () {
-                    $(this).css('display', 'none');
-                    $('.tp-sidebar').animate({left: "-225px"});
-                });
-            }
-        })
-    </script>
 <?php
 $this->endContent();
 $this->endBody();

src/frontend/views/my-course/index.php

@@ -9,15 +9,6 @@ use yii\helpers\Url;
 use yii\widgets\LinkPager;
 
 $this->title = '课程列表';
-$js = <<<JS
-    $(function () {
-        turmbw = $('.video-img-box img').width();
-        turmbh = turmbw * 5 / 9;
-        $('.video-img-box img').css('height', turmbh);
-    });
-JS;
-
-$this->registerJs($js);
 
 /**
  * @var $qiniu common\components\Qiniu;

src/frontend/views/user-center/browseRecord.php

@@ -68,13 +68,3 @@ $this->title = '浏览记录';
 <?php endif; ?>
 
 
-
-<script type='text/javascript'>
-    $(function () {
-        turmbw = $('.video-img-box img').width();
-        turmbh = turmbw*5/9;
-        $('.video-img-box img,.play-mask').css('height',turmbh);
-        $('.play-mask').css('padding-top',turmbh/2-20);
-    })
-</script>
-

src/frontend/views/user-center/favorite.php

@@ -58,13 +58,3 @@ $this->title = '收藏记录';
         您没有任何收藏记录！
     </div>
 <?php endif;?>
-
-
-<script type='text/javascript'>
-    $(function () {
-        turmbw = $('.video-img-box img').width();
-        turmbh = turmbw*5/9;
-        $('.video-img-box img,.play-mask').css('height',turmbh);
-        $('.play-mask').css('padding-top',turmbh/2-20);
-    })
-</script>
\ No newline at end of file

src/frontend/views/user-center/purchasedCourse.php

@@ -61,12 +61,4 @@ $this->title = '已购课程';
     </div>
 <?php endif;?>
 
-<script type='text/javascript'>
-    $(function () {
-        turmbw = $('.video-img-box img').width();
-        turmbh = turmbw*5/9;
-        $('.video-img-box img,.play-mask').css('height',turmbh);
-        $('.play-mask').css('padding-top',turmbh/2-20);
-    })
-</script>