Merge remote-tracking branch 'origin/master'

addons/theme/stv1/_header_w3g.html

@@ -59,9 +59,9 @@
 		//退出登录
 		//退出登录
 		var LOGINOUT_ADDRESS="{:U('basic/Passport/logout')}";
 		var LOGINOUT_ADDRESS="{:U('basic/Passport/logout')}";
 		//手机号正则
 		//手机号正则
-        var PHONE_MATCH = {:Model\\ValidateModel::get('phone')};
-        //邮箱正则
-        var EMAIL_MATCH = {:Model\\ValidateModel::get('email')};
+    var PHONE_MATCH = {:Model\\ValidateModel::get('phone')};
+    //邮箱正则
+    var EMAIL_MATCH = {:Model\\ValidateModel::get('email')};
     </script>
     </script>
     <script src="__THEMEW3G__/js/jquery-1.8.3.min.js" charset="utf-8"></script>
     <script src="__THEMEW3G__/js/jquery-1.8.3.min.js" charset="utf-8"></script>
     <script src="__THEME__/js/core.js?v={$site.sys_version}" charset="utf-8" ></script>
     <script src="__THEME__/js/core.js?v={$site.sys_version}" charset="utf-8" ></script>

apps/course/Tpl/default/Video/index_w3g.html

@@ -19,12 +19,14 @@
 	.van-dropdown-item__content {
 	.van-dropdown-item__content {
 		max-height: 100% !important;
 		max-height: 100% !important;
 	}
 	}
+  .van-dropdown-menu { flex-direction: row-reverse; align-items: center; }
 
 
 </style>
 </style>
 <div id="app" style="height: 100%;">
 <div id="app" style="height: 100%;">
 	<div class="layout_v">
 	<div class="layout_v">
 		<van-sticky>
 		<van-sticky>
 			<van-dropdown-menu>
 			<van-dropdown-menu>
+        <a href="{:U('classroom/Index/index')}"><i class="icon icon-zuojiantou"></i></a>
 			  <van-dropdown-item title="筛选条件" ref="filter">
 			  <van-dropdown-item title="筛选条件" ref="filter">
 					<div class="layout_v" style="width: 100vw">
 					<div class="layout_v" style="width: 100vw">
 						<span class="all_category_title text_16_600 color_333333">分类</span>
 						<span class="all_category_title text_16_600 color_333333">分类</span>

apps/home/Tpl/default/User/index_w3g.html

@@ -481,6 +481,7 @@
             }
             }
             break;
             break;
         }
         }
+
 			},
 			},
 			onCellTap: function(url) {
 			onCellTap: function(url) {
 				window.location.href = url
 				window.location.href = url