Merge remote-tracking branch 'origin/master'

addons/theme/stv1/_header_w3g.html

@@ -13,8 +13,6 @@
     <link href="__THEMEW3G__/css/style.css" rel="stylesheet">
 	<link href="__THEMEW3G__/icon/iconfont.css" rel="stylesheet">
 	
-	<link href="__THEMEW3G__/css/common.css" rel="stylesheet">
-	
     <link rel="stylesheet" href="__THEMEW3G__/js/layer/need/layer.css">
     <link rel="stylesheet" type="text/css" href="__THEMEW3G__/icon/iconfont-v4.css">
     <link rel="stylesheet" type="text/css" href="__THEMEW3G__/icon/eduline-icon.css">
@@ -31,6 +29,7 @@
 	<php>}</php>
     <link rel="shortcut icon" href="{:getImageUrlByAttachId($site['site_ico'])}" type="image/x-icon">
 	
+	<link href="__THEMEW3G__/css/common.css" rel="stylesheet">
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vant@2.6/lib/index.css" />
 	<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/vant@2.6/lib/vant.min.js"></script>

addons/theme/stv1/_static_w3g/css/common.css

@@ -15,6 +15,12 @@ div::-webkit-scrollbar {
 
 .tab_container {
 	padding-bottom: 4.125rem;
+}
+
+.layout_h_wrap {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
 }
 
 .layout_v {
@@ -318,6 +324,37 @@ div::-webkit-scrollbar {
 	background: rgba(163,228,96,0.5);
 }
 
+.tabs_container {
+	height: 2.25rem;
+	display: flex;
+	flex-direction: row;
+	border-bottom: 0.0625rem solid #ebedf0;
+}
+
+.tab_item_normal {
+	display: flex;
+	flex-direction: row;
+	flex-grow: 1;
+	width: 0;
+	align-items: center;
+	justify-content: center;
+	font-size:14px;
+	font-weight:400;
+	color:rgba(51,51,51,1);
+}
+
+.tab_item_selected {
+	display: flex;
+	flex-direction: row;
+	flex-grow: 1;
+	width: 0;
+	align-items: center;
+	justify-content: center;
+	font-size:14px;
+	font-weight:600;
+	color:rgba(101,192,0,1);
+}
+
 /*
  * Home
  */
@@ -499,4 +536,25 @@ div::-webkit-scrollbar {
 /* Extension */
 .van-cell:not(:last-child)::after {
 	left: 0 !important;
+}
+
+/* Search */
+.search_hot_title {
+	margin-left: 0.75rem;
+	margin-top: 0.75rem;
+}
+
+.search_hot_title_flow {
+	padding-top: 0.75rem;
+	padding-left: 0.75rem;
+}
+
+.search_flex_item {
+	box-sizing: border-box;
+	height:32px;
+	background:rgba(245,245,245,1);
+	border-radius:16px;
+	margin-right: 0.75rem;
+	margin-bottom: 0.75rem;
+	padding: 0.4375rem 0.75rem;
 }
\ No newline at end of file

apps/classroom/Tpl/default/Index/search_w3g.html

@@ -29,6 +29,7 @@
         <script src="__THEMEW3G__/js/jquery-1.8.3.min.js"></script>
         <script src="__THEMEW3G__/js/search_media.js"></script>
 		
+		<link href="__THEMEW3G__/css/common.css" rel="stylesheet">
 		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vant@2.6/lib/index.css" />
 		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.min.js"></script>
 		<script src="https://cdn.jsdelivr.net/npm/vant@2.6/lib/vant.min.js"></script>
@@ -104,19 +105,39 @@
 						v-model="keyword"
 						style="padding-bottom: 0 !important;" 
 						left-icon="__THEME__/img/serch@3x.png"
+						@focus="onFocus"
+						@search="onSearch"
 						shape="round"
 						background="#ffffff" 
 						placeholder="请输入关键词...">
 						
 					</van-search>
 					
+					<div v-if="!showHistory" class="tabs_container" style="margin-top: 0.5rem;">
+						<div @click="onTab(idx)" v-for="(opt, idx) in options" :key="idx" :class="idx == tab ? 'tab_item_selected' : 'tab_item_normal'">
+							<span>{{opt.title}}</span>
+						</div>
+					</div>
+					
 				</van-sticky>
 				
+				<!-- 热门搜索 -->
+				<div v-if="showHistory" class="layout_v">
+				    <span class="search_hot_title text_12_400 color_999999">历史搜索：</span>
+					<div class="layout_h_wrap search_hot_title_flow">
+						<volist name="video" id="vo">
+							<div @click="onHotKeyword({$vo.video_title|mStr=10})" class="search_flex_item layout_center">
+								<span class="text_14_400 color_999999">{$vo.video_title|mStr=10}</span>
+							</div>
+						    <!-- <li><a <eq name="vo.type" value="1">href="{:U('course/Video/view',array('id'=>$vo['id']))}"<else/>href="{:U('live/Index/view',array('id'=>$vo['id']))}"</eq>>{$vo.video_title|mStr=10}</a></li> -->
+						</volist>
+					</div>
+				</div>
+				
 			</div>
 				
 		</div>
-        <div class="search-bodyer">
-            <!-- 搜索 -->
+        <!-- <div class="search-bodyer">
             <div class="goods-eac-box">
                 <div class="eac-per-ens">
                     <div class="aingstoit">
@@ -181,8 +202,7 @@
                 </div>
             </div>
 
-            <!-- 热门搜索 -->
-            <div class="headlines">
+           <div class="headlines">
                 <h5>大家都在搜</h5>
                 <ul id="video_list">
                     <volist name="video" id="vo">
@@ -190,18 +210,38 @@
                     </volist>
                 </ul>
             </div>
-        </div>
+        </div> -->
     </body>
 	<script type="text/javascript">
 		new Vue({
 			el: '#app',
 			data: function() {
 				return {
-					keyword: ""
+					keyword: "",
+					showHistory: true,
+					tab: 0,
+					options: [{
+						title: '视频'
+					},{
+						title: '真题'
+					},{
+						title: '实物'
+					}]
 				}
 			},
 			methods: {
-				
+				onFocus: function() {
+					this.showHistory = true
+				},
+				onHotKeyword: function(keyword) {
+					
+				},
+				onSearch: function() {
+					this.showHistory = false
+				},
+				onTab: function(idx) {
+					this.tab = idx
+				}
 			}
 		})
 	</script>

apps/classroom/Tpl/default/Index/theme_x7_w3g.html

@@ -4,7 +4,7 @@
 		<!--search-->
 		<a href="{:U('classroom/Index/search')}">
 			<van-search style="padding-bottom: 0 !important;" left-icon="__THEME__/img/serch@3x.png" readonly shape="round"
-			 background="#FBFFF7" placeholder="搜索课程...">
+			 background="#FFFFFF" placeholder="搜索课程...">
 			</van-search>
 		</a>