修改 触摸反馈

src/res/tpl/CLScene.tpl

@@ -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">
@@ -21,4 +20,7 @@
             </div>
         </div>
     </div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/CourseScene.tpl

@@ -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">
@@ -15,4 +12,7 @@
 		</div>
 	</div>
 	<div class="main" id="course-main"></div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/DataBuildingScene.tpl

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

src/res/tpl/DownloadScene.tpl

@@ -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>
@@ -104,4 +101,7 @@
 			<div class="scroll-list scroll-lines-wrapper clearfix" id="download-status-table-wrapper"></div>
 		</div>
 	</div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/GlobalGoodDetail.tpl

@@ -23,4 +23,7 @@
             </ul>
         </div>
     </div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/ImageWareFullScreen.tpl

@@ -1,5 +1,12 @@
 <div id="ImageWareFullScreen" fe-role="Switch">
     <img id="wareImg" src="./assets/img/default_bg.jpg" />
-    <img id="imgLeft" src="./assets/img/LessonScene/arrow_left.png" />
-    <img id="imgRight" src="./assets/img/LessonScene/arrow_right.png" />
+    <div id="imgLeft" fe-role="Widget">
+        <img src="./assets/img/backward.png" />
+    </div>
+    <div id="imgRight" fe-role="Widget">
+        <img src="./assets/img/forward.png" />
+    </div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/IndexScene.tpl

@@ -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">

src/res/tpl/LessonScene.tpl

@@ -8,4 +8,7 @@
 		<div id="view-content"></div>
 		<div id="view-bottom"></div>
 	</div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/QuitConfirmScene.tpl

@@ -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="" />

src/res/tpl/ShopCartScene.tpl

@@ -1,13 +1,13 @@
 <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>
-		<div class="back-icon">
-		<img src="assets/img/ShopCartScene/backText.png" alt=""></div>
 	</div>
 	<div class="shop-cart-wrapper clearfix" fe-role="Scroll" fe-cfg="scroll_dir:h, auto_list_width:yes, scroll_right_padding: 3rem">
 		<div class="scroll-list" id="shop-cart-wrapper"></div>
 	</div>
 	<div fe-role="Widget" class="send-msg" id="send-msg"></div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/SplashScene.tpl

@@ -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>

src/res/tpl/TerminalScene.tpl

@@ -1,7 +1,7 @@
 <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 class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/stage/index/index.html

@@ -3,7 +3,7 @@
 
 <head>
 	<meta charset="UTF-8">
-	<meta name="viewport" content="width=1920,user-scalable=0">
+	<meta name="viewport" content="width=1920, user-scalable=no">
 	<title>双师教学标准平台</title>
 	<link rel="stylesheet" href="../../lib/css/base.css" />
 </head>
@@ -19,7 +19,7 @@
 		    var user_webset_font = getComputedStyle(doc.documentElement, false)['fontSize'];
 		  }
 			//取整后与默认16px的比例系数
-		  var xs = parseFloat(user_webset_font) / 16;
+		  // var xs = parseFloat(user_webset_font) / 16;
 			var docEl = doc.documentElement, //根元素html
 			//判断窗口有没有orientationchange这个方法，有就赋值给一个变量，没有就返回resize方法。
 			resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
@@ -27,7 +27,7 @@
 				var clientWidth = docEl.clientWidth;
 				if (!clientWidth) return;
 				if (clientWidth < 1920) {
-					docEl.style.fontSize = 100 * (clientWidth / 1920) / xs + 'px';
+					docEl.style.fontSize = 100 * (clientWidth / 1920) + 'px';
 				} else {
 					docEl.style.fontSize = 100 + 'px';
 				}
@@ -59,7 +59,7 @@
 	<!--水波纹插件-->
 	<script src="../../lib/js/waves.min.js"></script>
 	<script>
-		var ts = '201802051925';
+		var ts = '201807251125';
 
 		var appCss = document.createElement('link');
 		appCss.rel = 'stylesheet';

src/stage/index/index.less

@@ -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';*/

src/stage/index/scene/CLScene.js

@@ -235,6 +235,12 @@ class CLScene extends scene {
     // 在使用Atv时Id对应：e.target.id
     // 非使用Atv是Id对应：e.target.id
     onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+
         // 进入购物车场景
         if (e.target.con.classList.contains('shopping-cart-btn-frame')) {
             this.showScene(require('./ShopCartScene.js'), {});

src/stage/index/scene/CourseScene.js

@@ -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;
@@ -346,6 +346,12 @@ class CourseScene extends scene {
 	// 在使用Atv时Id对应：e.target.id
 	// 非使用Atv是Id对应：e.target.id
 	onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+		
 		// 点击某一课
 		if (e.target.con.classList.contains('img-wrapper') || e.target.con.classList.contains('text-wrapper')) {
 			// 课件模版 COURSE_WARE_VIDEO（课视频模版）  COURSE_WARE_LIST（课列表）

src/stage/index/scene/DataBuildingScene.js

@@ -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() {
@@ -27,8 +32,11 @@ class DataBuildingScene extends scene {
 
     }
 
-    onOk() {
-
+    onOK(e) {
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
     }
 
     onActive() {

src/stage/index/scene/DownloadManagerScene.js

@@ -181,6 +181,11 @@ class DownloadManagerScene extends scene {
     }
 
     onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
         if(e.target.con.classList.contains('download-del-btn')){
             let lessonID = e.target.con.dataset.id;
             let title = this.lessonItems[lessonID].lessonName;

src/stage/index/scene/GlobalGoodDetailScene.js

@@ -156,6 +156,12 @@ class GlobalGoodDetailScene extends scene {
     // 在使用Atv时Id对应：e.target.id
     // 非使用Atv是Id对应：e.target.id
     onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+        
         if (e.target.con.classList.contains('item')) {
             let targetId = e.target.id.split('-')[2];
             // targetId = 6;

src/stage/index/scene/ImageWareFullScreenScene.js

@@ -112,8 +112,21 @@ class ImageWareFullScreenScene extends scene {
 
 	}
 
-	onOK() {
-
+	onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+			this.hideScene({
+				curWareIndex: this.curWareIndex,
+				curImageList: this.curImageList,
+				curImageIndex: this.curImageIndex,
+			}, 'LessonScene');
+            return;
+        }
+		if (e.target.id === 'imgLeft') {
+			this.keyLeftHandler();
+		} else if (e.target.id === 'imgRight') {
+			this.keyRightHandler();
+		}
 	}
 
 	onBack() {

src/stage/index/scene/LessonScene.js

@@ -334,7 +334,12 @@ class LessonScene extends scene {
         this.isBack = true;
     }
 
-    onOK() {
+    onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({id: this.courseId}, 'CourseScene');
+            return;
+        }
     	const leaf = FocusEngine.getFocusedLeaf();
     	switch (leaf.id) {
     		case 'view-video-start':
@@ -361,13 +366,14 @@ class LessonScene extends scene {
                 } else if (this.curWareType === Consts.TYPE_VIDEO) {
                     let video = document.getElementById('hls-video');
                     if (video) {
-                        document.getElementById('view-content').removeChild(video);
+                        video.webkitEnterFullScreen();
+                        // document.getElementById('view-content').removeChild(video);
                     }
-                    this.showScene(require('./VideoWareFullScreenScene.js'), {
-                        isFull: true,
-                        wareList: this.wareList,
-                        curWareIndex: this.curWareIndex,
-                    });
+                    // this.showScene(require('./VideoWareFullScreenScene.js'), {
+                    //     isFull: true,
+                    //     wareList: this.wareList,
+                    //     curWareIndex: this.curWareIndex,
+                    // });
                 }
     			this.postPlayRecord(this.cur_item_id, this.courseId);
     			break;

src/stage/index/scene/ShopCartScene.js

@@ -163,6 +163,12 @@ class ShopCartScene extends scene {
 	// 在使用Atv时Id对应：e.target.id
 	// 非使用Atv是Id对应：e.target.id
 	onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+		
 		if (e.target.con.id == 'send-msg' && this.goodsArr.length) {
 			this.showScene(require('./ShopCartCheckScene.js'), { id: 0 });
 		} else if (e.target.con.classList.contains('del')) {

src/stage/index/scene/TerminalScene.js

@@ -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>`;
@@ -60,6 +60,12 @@ class TerminalScene extends scene {
 	// 在使用Atv时Id对应：e.target.id
 	// 非使用Atv是Id对应：e.target.id
 	onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+		
 		if (e.target.con.classList.contains('terminal-quit')) {
 			APIClient.userLogoutAndUnbindDevice((isTrue, res) => {
 				if (!isTrue) { return; }

src/stage/index/scene/VideoWareFullScreenScene.js

@@ -104,8 +104,14 @@ class VideoWareFullScreenScene extends scene {
             window.efunbox.fullScreen();
             this.videoPlayer = window.efunbox;
         } else {
-    		const videoDom = `<video id="hls-full-video" controls>你的浏览器不支持视频播放</video>`;
+    		const videoDom = `
+                <video id="hls-full-video" controls>你的浏览器不支持视频播放</video>
+            	<div class="goback" fe-role="Widget">
+            		<img src="assets/img/goback.png" />
+            	</div>
+            `;
     		document.getElementById('VideoWareFullScreen').innerHTML = videoDom;
+            this.moye.root.reRender();
     		this.videoPlayer = new HlsVideoPlugin();
     		this.videoPlayer.initH5Player(playUrl, 'hls-full-video');
         }
@@ -145,7 +151,16 @@ class VideoWareFullScreenScene extends scene {
 
     }
 
-    onOK() {
+    onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+			this.hideScene({
+				curWareIndex: this.curWareIndex,
+				curImageList: this.curImageList,
+				curImageIndex: this.curImageIndex,
+			}, 'LessonScene');
+            return;
+        }
         if (this.videoPlayer.playStatus()) {
             this.videoPlayer.pause();
         } else {

src/stage/index/style/BuyConfirmScene.less

@@ -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 {

src/stage/index/style/CLScene.less

@@ -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;

src/stage/index/style/CourseScene.less

@@ -8,28 +8,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;
@@ -188,7 +175,7 @@
 			top: 2rem;
 			left: 0;
 			width: 100%;
-			padding: 0.28rem 1.43rem 0;
+			padding: 0.28rem 1.75rem 0;
 			margin-top: .5rem;
 			overflow: scroll;
 			height: 8.8rem;
@@ -201,7 +188,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;

src/stage/index/style/DataBuildingScene.less

@@ -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;
 }

src/stage/index/style/DelConfirmScene.less

@@ -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 {

src/stage/index/style/DownloadScene.less

@@ -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 {

src/stage/index/style/GlobalGoodDetail.less

@@ -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;

src/stage/index/style/ImageWareFullScreen.less

@@ -2,24 +2,44 @@
 	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%;
 	background-repeat: no-repeat;
 }
 #imgLeft {
-  position: absolute;
-  top: 5rem;
-  left: 0.5rem;
-  display: none;
-  z-index: 2;
+	position: absolute;
+	top: 5rem;
+	left: 0.15rem;
+	width: .77rem;
+	height: .78rem;
+	z-index: 2;
+	border: solid unit(@borderSize, rem) transparent;
+	border-radius: 50%;
+	img {
+		width: 100%;
+		height: 100%;
+	}
+	&.fe-focus {
+		border: solid unit(@borderSize, rem) #ffe100;
+	}
 }
 #imgRight {
-  position: absolute;
-  top: 5rem;
-  right: 0.5rem;
-  display: none;
-  z-index: 2;
+	position: absolute;
+	top: 5rem;
+	right: 0.15rem;
+	z-index: 2;
+	width: .87rem;
+	height: .88rem;
+	border: solid unit(@borderSize, rem) transparent;
+	border-radius: 50%;
+	img {
+		width: 100%;
+		height: 100%;
+	}
+	&.fe-focus {
+		border: solid unit(@borderSize, rem) #ffe100;
+	}
 }

src/stage/index/style/IndexScene.less

@@ -49,25 +49,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;
@@ -81,9 +71,12 @@
 			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;
-			position: relative;
+            position: relative;
+			border: solid unit(@borderSize, rem) transparent;
 
 			.user-info-text {
 				float: left;

src/stage/index/style/LessonScene.less

@@ -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 {
@@ -24,7 +24,7 @@
 
 	#list {
 		position: absolute;
-		top: 1.7rem;
+		top: 1.6rem;
 		left: 0.7rem;
 		width: 7.2rem;
 		height: 8.15rem;
@@ -94,7 +94,7 @@
 
 	#view {
 		position: absolute;
-		top: 1.7rem;
+		top: 1.6rem;
 		left: 7.9rem;
 		width: 10.72rem;
 		height: 8.15rem;

src/stage/index/style/LoginScene.less

@@ -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 {

src/stage/index/style/Mixins.less

@@ -29,3 +29,21 @@
 	box-shadow: .03rem .03rem unit(@boxShadowSize, rem) @boxShadowColor;
 	z-index: 9999;
 }
+
+.goback {
+	z-index: 99999;
+	position: absolute;
+	width: .93rem;
+	height: .94rem;
+	bottom: .15rem;
+	right: .15rem;
+	border: solid unit(@borderSize, rem) transparent;
+	border-radius: 50%;
+	img {
+		width: 100%;
+		height: 100%;
+	}
+	&.fe-focus {
+		border: solid unit(@borderSize, rem) #ffe100;
+	}
+}

src/stage/index/style/QuitConfirmScene.less

@@ -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%;

src/stage/index/style/RepeatLoginScene.less

@@ -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 {

src/stage/index/style/ShopCartCheckScene.less

@@ -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 {

src/stage/index/style/ShopCartScene.less

@@ -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;

src/stage/index/style/SplashScene.less

@@ -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;
 }

src/stage/index/style/TerminalScene.less

@@ -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;

src/stage/index/style/VideoWareFullScreen.less

@@ -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%;

src/util/API/AJAXHelper.js

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