样式调整

src/res/tpl/SplashScene.tpl

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

src/stage/index/scene/WaterFallIndexScene.js

@@ -370,6 +370,8 @@ class WaterfallIndexScene extends scene {
         } else if (e.target.con.classList.contains('swiper-container-advert') && this.advertList.length) {
             let currentAdvert = this.advertList[this.advertSwiper.activeIndex];
             const { pid, type } = currentAdvert;
+            // 未关联课程不跳场景
+            if (!pid) { return; }
             if (type === Consts.TYPE_COURSE) {
                 this.showScene(require('./CourseScene.js'), { id: pid });
             } else if (type === Consts.TYPE_TRAINING) {

src/stage/index/style/WaterfallIndexScene.less

@@ -86,15 +86,15 @@
         img {
           width: 3.1rem;
           height: 1.84rem;
-					border: solid unit(@borderSize, rem) transparent;
+		  border: solid unit(@borderSize, rem) transparent;
           border-radius: .25rem;
         }
         &:last-child {
           margin-top: .22rem - 2 * unit(@borderSize, rem);
         }
-				&.fe-focus img {
-					.after-focus(@borderSize; #ffe100);
-				}
+		&.fe-focus img {
+			.after-focus(@borderSize; #ffe100);
+		}
       }
     }
     /* 中间轮播图左侧浮动，尺寸固定 */
@@ -108,10 +108,10 @@
         margin: 0 .22rem - .06rem - 2 * unit(@borderSize, rem);
         width: 9.74rem + 2 * unit(@borderSize, rem);
         height: 3.9rem + 2 * unit(@borderSize, rem);
-				border: solid unit(@borderSize, rem) transparent;
+		border: solid unit(@borderSize, rem) transparent;
         border-radius: .25rem;
         &.fe-focus {
-					.after-focus(@borderSize; #ffe100);
+			.after-focus(@borderSize; #ffe100);
         }
         .swiper-wrapper {
           width: 9.74rem;

src/util/API/AJAXHelper.js

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