src/stage/index/scene/LoginScene.js

@@ -28,12 +28,12 @@ class LoginScene extends scene {
 			if (res.success) {
 				userDataStorage.setData(res.data);
 				if ( -1 != this.moye.focusList.indexOf('WaterfallIndexScene')){
-					this.hideScene({success: true}, 'WaterfallIndexScene');
+					this.hideScene({showQR: true}, 'WaterfallIndexScene');
 				} else {
-      				this.showScene(require('./WaterfallIndexScene.js'), {});
+      		this.showScene(require('./WaterfallIndexScene.js'), {});
 				}
 			} else if (Consts.API_CODE_ISBOUND == res.code) {
-				this.showScene(require('./RepeatLoginScene.js'), {});
+				this.showScene(require('./RepeatLoginScene.js'), {showQR: true});
 			} else {
 				TVUtil.Toast.show('帐号或密码错误！', 3000);
 				this.sidInput.value = '|';

src/stage/index/scene/WaterFallIndexScene.js

@@ -347,8 +347,11 @@ class WaterfallIndexScene extends scene {
     }
 
     onResume(data) {
-        // 重现页面,重新创建时钟
-        this.renderDigitalClock();
+      // 重现页面,重新创建时钟
+      this.renderDigitalClock();
+      if (data && data.showQR) {
+        this.showScene(require('./GeoCheckScene.js'), {});
+      }
     }
 
     onBack() {

src/stage/index/scene/WaterfallIndexScene.js

@@ -347,8 +347,11 @@ class WaterfallIndexScene extends scene {
     }
 
     onResume(data) {
-        // 重现页面,重新创建时钟
-        this.renderDigitalClock();
+      // 重现页面,重新创建时钟
+      this.renderDigitalClock();
+      if (data && data.showQR) {
+        this.showScene(require('./GeoCheckScene.js'), {});
+      }
     }
 
     onBack() {

src/stage/index/style/component/CourseItem.less

@@ -32,7 +32,7 @@
             margin-left: 0.06rem;
             font-size: 0.36rem;
             white-space: nowrap;
-			overflow: hidden;
+			      overflow: hidden;
             text-align: center;
         }
         .subject-sub{