Explorar el Código

Merge branch 'dev_winpc_touch' into online_winpc_angelbell

zhanghe hace 6 años
padre
commit
8bd6c1e137

+ 39 - 0
src/res/tpl/IndexScene.tpl

@@ -0,0 +1,39 @@
+<div id="IndexScene" fe-role="Switch">
+
+	<div class="m-logo"></div>
+
+ 	<div class="m-header-user" fe-role="Switch">
+		<div fe-role="Widget" class="user-info" id="user-info">
+			<div class="user-info-text">
+				<div id="terminal-name" class="terminal-name">未登陆, 请先点击这里</div>
+				<div id="terminal-id" class="terminal-id">再点击"退出账号"回到登陆页</div>
+			</div>
+		</div>
+	</div>
+	<div id="index-scroll" class="m-main" fe-role="Scroll" fe-cfg="scroll_dir:v,scroll_duration:0.2,scroll_easing:linear">
+		<div class="scroll-list">
+			<div id="history" class="history-wrapper"></div>
+			<div id="fun" class="fun-wrapper">
+				<div id="fun-download" class="fun-item" fe-role="Widget">
+					<img src="./../../stage/index/assets/img/IndexScene/entrance_download.png"/>
+				</div>
+				<div id="fun-collection" class="fun-item" fe-role="Widget">
+					<img src="./../../stage/index/assets/img/IndexScene/entrance_collection.png"/>
+				</div>
+				<div id="fun-resource" class="fun-item" fe-role="Widget">
+					<img src="./../../stage/index/assets/img/IndexScene/entrance_resource.png"/>
+					<div class="wave waves-effect"></div>
+				</div>
+				<div id="fun-periphery" class="fun-item" fe-role="Widget">
+					<img src="./../../stage/index/assets/img/IndexScene/entrance_periphery.png"/>
+				</div>
+				<div id="fun-training" class="fun-item" fe-role="Widget">
+					<img src="./../../stage/index/assets/img/IndexScene/entrance_training.png"/>
+				</div>
+			</div>
+		</div>
+	</div>
+	<p class="index_msg">
+		Powered by 领教云课堂
+	</p>
+</div>

+ 1 - 1
src/stage/index/style/CourseScene.less

@@ -52,7 +52,7 @@
 			display: inline-block;
 			width: 8rem;
 			height: 100%;
-			margin-left: 2.3rem;
+			margin-left: 2.1rem;
 
 			.nav-item {
 				position: relative;

+ 2 - 2
src/stage/index/style/WaterfallIndexScene.less

@@ -72,7 +72,7 @@
   .content {
     width: 100%;
     height: 8.8rem;
-    padding: 0 1.2rem;
+    padding: 0 1.1rem 0 1.2rem;
     /* 左右两侧入口浮动布局,尺寸固定 */
     .left,
     .right {
@@ -135,7 +135,7 @@
         font-size: 0;
         width: 100%;
         height: 4.78rem;
-        padding: .1rem 0 .1rem 0;
+        padding: .1rem 0.1rem .1rem 0;
         .product-item {
           display: inline-block;
           width: 20%;