Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev

src/views/ebiz/train/TrainLoading.vue

@@ -1,13 +1,13 @@
 <template>
-  <div class="loading-content">
+  <div class="loading-content flex justify-content-c align-items-c">
-    <div class="context-core">
+    <div class="context-core text-center line-height">
-      正在跳转培训中心，<span>**</span>秒
+      正在跳转培训中心，请稍候
+      <span>{{ time }}</span
+      >秒。<br />
+      <div class="next-step" @click="next">点击跳转</div>
     </div>
     <van-button class="mt20" type="info" @click="getDeviceInfo">getDeviceInfo</van-button>
     <van-button class="mt20 mb20" type="info" @click="getUserInfo">getUserInfo</van-button>
-    <div>
-      {{ requestRes }}
-    </div>
   </div>
 </template>
 
@@ -30,7 +30,7 @@ export default {
     }
   },
   created() {
-    // this.initThisPage()
+    this.timeOut()
   },
   methods: {
     async getDeviceInfo() {
@@ -67,13 +67,21 @@ export default {
         if (this.time <= 0) {
           this.time = 0
           clearInterval(timer)
-          this.time = false
+          this.time = '--'
-          window.location.href = this.trainHomeUrl
+          //window.location.href = this.trainHomeUrl
         }
       }, 1000)
     },
     next() {
+      trainHomeUrl({}).then(res => {
+        console.log('培训中心链接查询配置=>>', res)
+        if (res.result == 0) {
+          this.trainHomeUrl = res.content
           window.location.href = this.trainHomeUrl
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
     }
   }
 }
@@ -83,8 +91,10 @@ export default {
 .loading-content {
   width: 100vw;
   height: 100vh;
-  display: flex;
-  justify-content: flex-start;
   flex-direction: column;
 }
+.next-step {
+  text-decoration: underline;
+  color: #5ca5ea;
+}
 </style>