Home Explore Help
Register Sign In
Rankin
/
2BTV-Web
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

:lipstick: 修改各场景背景布局样式

zhanghe 6 years ago
parent
c3ec59b7f5
commit
e2a3d5d93c
33 changed files with 132 additions and 202 deletions
Split View Show Diff Stats
  1. 0 1
      src/res/tpl/CLScene.tpl
  2. 0 3
      src/res/tpl/CourseScene.tpl
  3. 1 3
      src/res/tpl/DataBuildingScene.tpl
  4. 0 3
      src/res/tpl/DownloadScene.tpl
  5. 0 1
      src/res/tpl/IndexScene.tpl
  6. 0 3
      src/res/tpl/QuitConfirmScene.tpl
  7. 0 1
      src/res/tpl/ShopCartScene.tpl
  8. 1 3
      src/res/tpl/SplashScene.tpl
  9. 0 3
      src/res/tpl/TerminalScene.tpl
  10. 1 1
      src/stage/index/index.html
  11. 4 1
      src/stage/index/index.less
  12. 3 3
      src/stage/index/scene/CourseScene.js
  13. 11 6
      src/stage/index/scene/DataBuildingScene.js
  14. 1 1
      src/stage/index/scene/TerminalScene.js
  15. 3 3
      src/stage/index/style/BuyConfirmScene.less
  16. 9 19
      src/stage/index/style/CLScene.less
  17. 8 21
      src/stage/index/style/CourseScene.less
  18. 9 18
      src/stage/index/style/DataBuildingScene.less
  19. 3 3
      src/stage/index/style/DelConfirmScene.less
  20. 6 3
      src/stage/index/style/DownloadScene.less
  21. 9 5
      src/stage/index/style/GlobalGoodDetail.less
  22. 2 2
      src/stage/index/style/ImageWareFullScreen.less
  23. 11 18
      src/stage/index/style/IndexScene.less
  24. 3 3
      src/stage/index/style/LessonScene.less
  25. 4 4
      src/stage/index/style/LoginScene.less
  26. 10 19
      src/stage/index/style/QuitConfirmScene.less
  27. 3 3
      src/stage/index/style/RepeatLoginScene.less
  28. 3 3
      src/stage/index/style/ShopCartCheckScene.less
  29. 7 16
      src/stage/index/style/ShopCartScene.less
  30. 9 8
      src/stage/index/style/SplashScene.less
  31. 8 19
      src/stage/index/style/TerminalScene.less
  32. 2 2
      src/stage/index/style/VideoWareFullScreen.less
  33. 1 0
      src/util/API/AJAXHelper.js

+ 0 - 1
src/res/tpl/CLScene.tpl
View File 

@@ -1,5 +1,4 @@
 
 <div id="CLScene" fe-role="Switch">
 
-	<div class="cl-bg"><img id="CLSceneBG" src="assets/img/CLScene/background.jpg" alt=""></div>
 
     <div id="cl-left-panel">
 
         <div id="name-text"></div>
 
         <div id="cl-left-tab-scroll" fe-role="Scroll" fe-cfg="scroll_dir:v">

+ 0 - 3
src/res/tpl/CourseScene.tpl
View File 

@@ -1,7 +1,4 @@
 
 <div id="CourseScene" class="course clearfix" fe-role="Switch">
 
-	<div class="course-bg">
 
-		<img id="course-bg" src="assets/img/CourseScene/bg.jpg">
 
-	</div>
 
 	<div class="header">
 
 		<div class="course-name" id="course-name"></div>
 
 		<div class="nav" fe-role="Switch" id="course-nav">

+ 1 - 3
src/res/tpl/DataBuildingScene.tpl
View File 

@@ -1,3 +1 @@
 
-<div id="DataBuildingScene" fe-role="Switch">
 
-    <img id="building-pic-bg"  src="assets/img/default_bg.jpg" alt="">
 
-</div>
 
+<div id="DataBuildingScene" fe-role="Switch"></div>

+ 0 - 3
src/res/tpl/DownloadScene.tpl
View File 

@@ -1,7 +1,4 @@
 
 <div id="DownloadManagerScene" fe-role="Switch">
 
-	<div class="download-manager-bg">
 
-		<img src="./assets/img/GlobalGoodDetail/background.jpg" alt="" />
 
-	</div>
 
   	<div class="local-download-icon">
 
     	<img src="assets/img/DownloadScene/download.png" alt="" />
 
     	<div>本地下载列表</div>

+ 0 - 1
src/res/tpl/IndexScene.tpl
View File 

@@ -1,5 +1,4 @@
 
 <div id="IndexScene" fe-role="Switch">
 
-	<div class="index-bg"><img src="assets/img/IndexScene/background.jpg" alt=""></div>
 
  	<div class="m-header-user" fe-role="Switch">
 
 		<div fe-role="Widget" class="user-info" id="user-info">
 
 			<div class="user-info-text">

+ 0 - 3
src/res/tpl/QuitConfirmScene.tpl
View File 

@@ -1,7 +1,4 @@
 
 <div id="QuitConfirmScene" fe-role="Switch">
 
-    <div class="quit-app-bg">
 
-        <img src="http://ljimgs.ai160.com/2b/app_resource/app_quit_confirm_1116.jpg" alt="" />
 
-    </div>
 
     <div class="btn-select-wrapper">
 
         <div id="ret-btn" class="cancel" fe-role="Widget">
 
             <img src="assets/img/QuitConfirmScene/focusIcon.png" alt="" />

+ 0 - 1
src/res/tpl/ShopCartScene.tpl
View File 

@@ -1,5 +1,4 @@
 
 <div id="ShopCartScene" fe-role="Switch">
 
-	<div class="cart-bg"><img id="cart-bg" src="assets/img/ShopCartScene/shop_cart_bg.jpg" alt=""></div>
 
 	<p class="cart-name" fe-role="Widget" id="cart-name">购物车</p>
 
 	<div id="cart-empty" class="cart-empty">
 
 		<p class="empty-text">还没有添加商品</p>

+ 1 - 3
src/res/tpl/SplashScene.tpl
View File 

@@ -1,3 +1 @@
 
-<div id="SplashScene" fe-role="Switch">
 
-    <img src="assets/img/SplashScene/splash.jpg" alt="">
 
-</div>
 
+<div id="SplashScene" fe-role="Switch"></div>

+ 0 - 3
src/res/tpl/TerminalScene.tpl
View File 

@@ -1,7 +1,4 @@
 
 <div id="TerminalScene" fe-role="Switch">
 
-	<div class="terminal-bg">
 
-		<img src="assets/img/TerminalScene/background.jpg" alt="">
 
-	</div>
 
 	<ul fe-role="Switch" class="terminal-wrapper clearfix" id="terminal-wrapper"></ul>
 
 	<div class="terminal-quit" id="terminal-quit" fe-role="Widget" fe-cfg="default_focus:yes"></div>
 
 </div>

+ 1 - 1
src/stage/index/index.html
View File 

@@ -3,7 +3,7 @@
 
 
 <head>
 
 	<meta charset="UTF-8">
 
-	<meta name="viewport" content="width=1920">
 
+	<meta name="viewport" content="width=1920, user-scalable=no">
 
 	<title>双师教学标准平台</title>
 
 	<link rel="stylesheet" href="../../lib/css/base.css" />
 
 </head>

+ 4 - 1
src/stage/index/index.less
View File 

@@ -1,12 +1,15 @@
 
 @charset 'utf-8';
 
 
+@g-width: 19.2;
 
+@g-height: 10.8;
 
+
 
 @borderSize: 0.05;
 
 @borderRadius: 0.2;
 
 
 body {
 
     width: 100%;
 
     height: 100%;
 
-    background-color: #000;
 
+    background-color: #f5f5f5;
 
 }
 
 
 /*@import '../../lib/css/marquee.css';*/

+ 3 - 3
src/stage/index/scene/CourseScene.js
View File 

@@ -72,13 +72,13 @@ class CourseScene extends scene {
 
 
 			const { auth, bgUrl, title, breadCrumb, collected, list } = res.data;
 
 			let topBreadCrumb = document.getElementById('course-name');
 
-			let courseBG = document.getElementById('course-bg');
 
+			let courseBG = document.getElementById('CourseScene');
 
 			let collect = document.querySelector('#course-tab-collect');
 
 			// 1. set shopcart count
 
 			ShopCartState.getCount();
 
 			// 2. set backgroundImg
 
-			if (bgUrl) {
 
-				courseBG.setAttribute('src', `${Consts.IMG_PATH}/${bgUrl}`)
 
+			if (bgUrl && courseBG) {
 
+				courseBG.style.backgroundImage = `url(${Consts.IMG_PATH}/${bgUrl})`;
 
 			}
 
 			// 3. set breadCrumb
 
 			topBreadCrumb.innerHTML = breadCrumb;

+ 11 - 6
src/stage/index/scene/DataBuildingScene.js
View File 

@@ -7,12 +7,17 @@ class DataBuildingScene extends scene {
 
 
     onCreate(data) {
 
   		this.setContentView(require('../../../res/tpl/DataBuildingScene.tpl'), {}, 'DataBuildingScene', {}, () => {
 
-        if (data && data.bgUrl) {
 
-            document.getElementById('building-pic-bg').setAttribute('src', Consts.IMG_PATH + '/' + data.bgUrl);
 
-        } else {
 
-            document.getElementById('building-pic-bg').setAttribute('src', Consts.DATA_BUILDING);
 
-        }
 
-      });
 
+            let targetDom = document.getElementById('DataBuildingScene');
 
+            if (data && data.bgUrl) {
 
+                if (targetDom) {
 
+                    targetDom.style.backgroundImage = `url(${Consts.IMG_PATH})/${data.bgUrl}`;
 
+                }
 
+            } else {
 
+                if (targetDom) {
 
+                    targetDom.style.backgroundImage = `url(${Consts.DATA_BUILDING}`;
 
+                }
 
+            }
 
+        });
 
     }
 
 
     onDestory() {

+ 1 - 1
src/stage/index/scene/TerminalScene.js
View File 

@@ -8,7 +8,7 @@ class TerminalScene extends scene {
 
 	}
 
 
 	renderTerminalList(dataset) {
 
-		let stu_no = `<li class="info-item"><div>学号</div>：${dataset.eid.replace(/(\d{4})/g, '$1 ')}</li>`;
 
+		let stu_no = `<li class="info-item"><div>账号</div>：${dataset.eid.replace(/(\d{4})/g, '$1 ')}</li>`;
 
 		let cp_name = `<li class="info-item"><div>集团名称</div>：${dataset.merchantName}</li>`;
 
 		let schoole_name = `<li class="info-item"><div>校区名称</div>：${dataset.name}</li>`;
 
 		let contact_person = `<li class="info-item"><div>联系人</div>：${dataset.merchantContactName}</li>`;

+ 3 - 3
src/stage/index/style/BuyConfirmScene.less
View File 

@@ -2,9 +2,9 @@
 
 	position: absolute;
 
 	top: 0;
 
 	left: 0;
 
-	width: 100%;
 
-	height: 100%;
 
-	background-color: rgba(0, 0, 0, .5);
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	background-color: rgba(0, 0, 0, .7);
 
 	z-index: 2;
 
 
 	.toast {

+ 9 - 19
src/stage/index/style/CLScene.less
View File 

@@ -3,25 +3,15 @@
 
 @import './component/CourseItem.less';
 
 
 #CLScene {
 
-    position: absolute;
 
-    width: 100%;
 
-    height: 100%;
 
-
 
-  	.cl-bg {
 
-  		position: absolute;
 
-  		top: 0;
 
-  		left: 0;
 
-  		z-index: -1;
 
-  		width: 100%;
 
-  		height: 100%;
 
-  		img {
 
-  			position: absolute;
 
-  			top: 0;
 
-  			left: 0;
 
-  			width: 100%;
 
-  			height: 100%;
 
-  		}
 
-  	}
 
+	position: absolute;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	left: 0;
 
+	top: 0;
 
+	background-image: url('assets/img/CLScene/background.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
+	overflow: hidden;
 
 
     #cl-left-panel {
 
         float: left;

+ 8 - 21
src/stage/index/style/CourseScene.less
View File 

@@ -6,28 +6,15 @@
 
 
 #CourseScene {
 
 	position: absolute;
 
-	top: 0;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
 	left: 0;
 
-	width: 100%;
 
-	height: 100%;
 
+	top: 0;
 
+	background-image: url('assets/img/CourseScene/bg.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
 	overflow: hidden;
 
 
-	.course-bg {
 
-		position: absolute;
 
-		top: 0;
 
-		left: 0;
 
-		z-index: -1;
 
-		width: 100%;
 
-		height: 100%;
 
-		img {
 
-			position: absolute;
 
-			top: 0;
 
-			left: 0;
 
-			width: 100%;
 
-			height: 100%;
 
-		}
 
-	}
 
-
 
 	.header {
 
 		margin-top: 0.3rem;
 
 		height: 1.15rem;
 
@@ -187,7 +174,7 @@
 
 			top: 2rem;
 
 			left: 0;
 
 			width: 100%;
 
-			padding: 0.28rem 1.43rem 0;
 
+			padding: 0.28rem 1.75rem 0;
 
 			margin-top: .5rem;
 
 			overflow: hidden;
 
 			height: 8.8rem;
 
@@ -200,7 +187,7 @@
 
 					position: relative;
 
 					box-shadow: 0.03rem 0.03rem 0.1rem rgba(0, 0, 0, 0.3);
 
 					float: left;
 
-					width: 6.19rem;
 
+					width: 6.1rem;
 
 					height: 1.1rem;
 
 					line-height: 1.1rem;
 
 					overflow: hidden;

+ 9 - 18
src/stage/index/style/DataBuildingScene.less
View File 

@@ -1,20 +1,11 @@
 
 #DataBuildingScene {
 
-    position: absolute;
 
-    left: 0;
 
-    top: 0;
 
-    margin: 0;
 
-    padding: 0;
 
-    width: 100%;
 
-    height: 100%;
 
-    vertical-align: bottom;
 
-
 
-    img {
 
-        position: absolute;
 
-        left: 0;
 
-        top: 0;
 
-        margin: 0;
 
-        padding: 0;
 
-        width: 100%;
 
-        height: 100%;
 
-    }
 
+	position: absolute;
 
+	left: 0;
 
+	top: 0;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	overflow: hidden;
 
+	background-image: url('assets/img/default_bg.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
 }

+ 3 - 3
src/stage/index/style/DelConfirmScene.less
View File 

@@ -2,9 +2,9 @@
 
 	position: absolute;
 
 	top: 0;
 
 	left: 0;
 
-	width: 100%;
 
-	height: 100%;
 
-	background-color: rgba(0, 0, 0, .5);
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	background-color: rgba(0, 0, 0, .7);
 
 	z-index: 2;
 
 
 	.toast {

+ 6 - 3
src/stage/index/style/DownloadScene.less
View File 

@@ -2,11 +2,14 @@
 
 
 #DownloadManagerScene {
 
 	position: absolute;
 
-	top: 0;
 
 	left: 0;
 
-	width: 100%;
 
-	height: 100%;
 
+	top: 0;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
 	overflow: hidden;
 
+	background-image: url('assets/img/GlobalGoodDetail/background.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
 	text-align: center;
 
 
 	.download-manager-bg {

+ 9 - 5
src/stage/index/style/GlobalGoodDetail.less
View File 

@@ -1,11 +1,15 @@
 
 @import "./Mixins.less";
 
 
 #GlobalGoodDetailScene {
 
-    position: absolute;
 
-    width: 100%;
 
-    height: 100%;
 
-    background: url('./assets/img/GlobalGoodDetail/background.jpg') center no-repeat;
 
-    background-size: 100% 100%;
 
+	position: absolute;
 
+	left: 0;
 
+	top: 0;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	overflow: hidden;
 
+	background-image: url('assets/img/GlobalGoodDetail/background.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
 
     .control-panel {
 
         float: right;

+ 2 - 2
src/stage/index/style/ImageWareFullScreen.less
View File 

@@ -2,8 +2,8 @@
 
 	position: absolute;
 
 	left: 0;
 
 	top: 0;
 
-	width: 100%;
 
-	height: 100%;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
 	overflow: hidden;
 
 	background-image: url(assets/img/icon.png);
 
 	background-size: 100% 100%;

+ 11 - 18
src/stage/index/style/IndexScene.less
View File 

@@ -2,25 +2,15 @@
 
 
 #IndexScene {
 
 	position: absolute;
 
-	width: 100%;
 
-	height: 100%;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	left: 0;
 
+	top: 0;
 
 	padding: 0.05rem 1.2rem 0;
 
-
 
-	.index-bg {
 
-		position: absolute;
 
-		top: 0;
 
-		left: 0;
 
-		z-index: -1;
 
-		width: 100%;
 
-		height: 100%;
 
-		img {
 
-			position: absolute;
 
-			top: 0;
 
-			left: 0;
 
-			width: 100%;
 
-			height: 100%;
 
-		}
 
-	}
 
+	background-image: url('assets/img/Indexscene/background.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
+	overflow: hidden;
 
 
 	.m-header-user{
 
 		height: 0.96rem;
 
@@ -34,8 +24,11 @@
 
 			border-radius: 0.55rem;
 
 			padding-left: 0.2rem;
 
 			padding-right: 0.3rem;
 
+			padding-top: 0.1rem;
 
+			padding-bottom: 0.1rem;
 
 			margin-right: -0.3rem;
 
 			text-align: right;
 
+			border: solid unit(@borderSize, rem) transparent;
 
 
 			.user-info-text {
 
 				float: left;

+ 3 - 3
src/stage/index/style/LessonScene.less
View File 

@@ -4,11 +4,11 @@
 
 	position: absolute;
 
 	left: 0;
 
 	top: 0;
 
-	width: 100%;
 
-	height: 100%;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
 	overflow: hidden;
 
 	background-image: url("assets/img/LessonScene/background.jpg");
 
-	background-size: 100% 100%;
 
+	background-size: cover;
 
 	background-repeat: no-repeat;
 
 
 	#title {

+ 4 - 4
src/stage/index/style/LoginScene.less
View File 

@@ -15,12 +15,12 @@
 
 	position: absolute;
 
 	left: 0;
 
 	top: 0;
 
-	width: 100%;
 
-	height: 100%;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
 	overflow: hidden;
 
-	background-color: rgba(0, 0, 0, 0.1);
 
 	background-image: url('assets/img/LoginScene/background.png');
 
-	background-size: 100% 100%;
 
+	background-size: cover;
 
+	background-position: center;
 
 	background-repeat: no-repeat;
 
 
 	.formBox {

+ 10 - 19
src/stage/index/style/QuitConfirmScene.less
View File 

@@ -1,23 +1,14 @@
 
 #QuitConfirmScene {
 
-    position: absolute;
 
-    width: 100%;
 
-    height: 100%;
 
-    background-size: cover;
 
-    .quit-app-bg {
 
-        position: absolute;
 
-        left: 0;
 
-        top: 0;
 
-        width: 100%;
 
-        height: 100%;
 
-        z-index: -1;
 
-        img {
 
-            position: absolute;
 
-            top: 0;
 
-            left: 0;
 
-            width: 100%;
 
-            height: 100%;
 
-        }
 
-    }
 
+	position: absolute;
 
+	left: 0;
 
+	top: 0;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	overflow: hidden;
 
+	background-image: url('http://ljimgs.ai160.com/2b/app_resource/app_quit_confirm_1116.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
+
 
 	.btn-select-wrapper {
 
         position: absolute;
 
         width: 40.6%;

+ 3 - 3
src/stage/index/style/RepeatLoginScene.less
View File 

@@ -2,9 +2,9 @@
 
 	position: absolute;
 
 	top: 0;
 
 	left: 0;
 
-	width: 100%;
 
-	height: 100%;
 
-	background-color: rgba(0, 0, 0, .6);
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	background-color: rgba(0, 0, 0, .7);
 
 	z-index: 2;
 
 
 	.prompt-wrapper {

+ 3 - 3
src/stage/index/style/ShopCartCheckScene.less
View File 

@@ -2,9 +2,9 @@
 
 	position: absolute;
 
 	top: 0;
 
 	left: 0;
 
-	width: 100%;
 
-	height: 100%;
 
-	background-color: rgba(0, 0, 0, .5);
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	background-color: rgba(0, 0, 0, .7);
 
 	z-index: 2;
 
 
 	.toast {

+ 7 - 16
src/stage/index/style/ShopCartScene.less
View File 

@@ -3,24 +3,15 @@
 
 
 #ShopCartScene {
 
 	position: absolute;
 
-	top: 0;
 
 	left: 0;
 
-	width: 100%;
 
-	height: 100%;
 
+	top: 0;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
 	overflow: hidden;
 
-
 
-	.cart-bg {
 
-		position: absolute;
 
-		top: 0;
 
-		left: 0;
 
-		z-index: -1;
 
-		width: 100%;
 
-		height: 100%;
 
-		img {
 
-			width: 100%;
 
-			height: 100%;
 
-		}
 
-	}
 
+	background-image: url('assets/img/ShopCartScene/shop_cart_bg.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
+	
 	.cart-name {
 
 		position: absolute;
 
 		top: .7rem;

+ 9 - 8
src/stage/index/style/SplashScene.less
View File 

@@ -1,10 +1,11 @@
 
 #SplashScene {
 
-    position: absolute;
 
-    width: 100%;
 
-    height: 100%;
 
-
 
-    img {
 
-        width: 100%;
 
-        height: 100%;
 
-    }
 
+	position: absolute;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	left: 0;
 
+	top: 0;
 
+	background-image: url('assets/img/SplashScene/splash.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
+	overflow: hidden;
 
 }

+ 8 - 19
src/stage/index/style/TerminalScene.less
View File 

@@ -1,25 +1,14 @@
 
 #TerminalScene {
 
 	position: absolute;
 
-	width: 100%;
 
-	height: 100%;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
+	left: 0;
 
+	top: 0;
 
 	padding: 0 3.76rem;
 
-    background-size: cover;
 
-
 
-	.terminal-bg {
 
-		position: absolute;
 
-		top: 0;
 
-		left: 0;
 
-		z-index: -1;
 
-		width: 100%;
 
-		height: 100%;
 
-		img {
 
-			position: absolute;
 
-			top: 0;
 
-			left: 0;
 
-			width: 100%;
 
-			height: 100%;
 
-		}
 
-	}
 
+	background-image: url('assets/img/TerminalScene/background.jpg');
 
+	background-size: cover;
 
+	background-repeat: no-repeat;
 
+	overflow: hidden;
 
 
 	.terminal-wrapper {
 
 		margin-top: 2.78rem;

+ 2 - 2
src/stage/index/style/VideoWareFullScreen.less
View File 

@@ -2,8 +2,8 @@
 
 	position: absolute;
 
 	left: 0;
 
 	top: 0;
 
-	width: 100%;
 
-	height: 100%;
 
+	width: unit(@g-width, rem);
 
+	height: unit(@g-height, rem);
 
 	overflow: hidden;
 
   video {
 
     width: 100%;

+ 1 - 0
src/util/API/AJAXHelper.js
View File 

@@ -62,6 +62,7 @@ class AJAXHelper {
 
 		xmlHttpReq.setRequestHeader('uid', uid);
 
 		xmlHttpReq.setRequestHeader('sign', sign);
 
 		xmlHttpReq.setRequestHeader('terminal', platform);
 
+		xmlHttpReq.setRequestHeader('merchant', 'baby');
 
 		xmlHttpReq.setRequestHeader('requestId', requestId);
 
 		xmlHttpReq.setRequestHeader('Authentication', sign); //header中增加Authentication以兼容老版本
 
 		xmlHttpReq.setRequestHeader('Content-Type', 'application/' + (method == 'POST' || method == 'PUT' ? 'json' : 'text'));