:twisted_rightwards_arrows: Merge branch 'dev_base' into online_weichuang

src/res/tpl/DataBuildingScene.tpl

@@ -1,3 +1,3 @@
 <div id="DataBuildingScene" fe-role="Switch">
-    <img id="building-pic-bg"  src="http://ljimgs.ai160.com/2b/app_resource/data_building.jpg" alt="数据正在建设中...">
+    <img id="building-pic-bg"  src="assets/img/default_bg.jpg" alt="">
 </div>

src/stage/index/scene/DataBuildingScene.js

@@ -8,7 +8,9 @@ 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);
+            document.getElementById('building-pic-bg').setAttribute('src', Consts.IMG_PATH + '/' + data.bgUrl);
+        } else {
+            document.getElementById('building-pic-bg').setAttribute('src', Consts.DATA_BUILDING);
         }
       });
     }

src/stage/index/scene/IndexScene.js

@@ -1,5 +1,6 @@
 import CourseItem from '../../../component/CourseItem';
 import APIClient from '../../../util/API/APIClient';
+import ShopCartState from '../../../util/ShopCartState';
 import userDataStorage from '../../../util/userDataStorage';
 import Consts from '../../../util/Consts';
 import Utils from '../../../util/Utils';
@@ -31,6 +32,7 @@ class IndexScene extends scene {
 				//必须获取Token后才可以正常调用以下接口
 				this.loadHistoryList();
 				this.loadTerminal();
+				ShopCartState.updateCount();
 
 				//记录用户登录行为
 				let {status, data} = CommandBus.execute({

src/util/Consts.js

@@ -14,6 +14,9 @@ class Consts {
 Consts.IMG_PATH = 'https://efunimgs.ai160.com';
 Consts.VIDEO_PATH = 'https://efunvideo.ai160.com';
 
+//数据正在突击中图片地址
+Consts.DATA_BUILDING = 'http://ljimgs.ai160.com/2b/app_resource/data_building.jpg';
+
 //图片/视频资源类型代号
 Consts.TYPE_VIDEO = 0;
 Consts.TYPE_AUDIO = 1;