From 266533ff4d4a8078004de5dec579ef651074c25d Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Mon, 4 Jan 2021 15:49:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E5=AF=B9=E6=8E=A5=E4=B8=AD=E8=BD=AC?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81=E5=88=9D=E5=A7=8B=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=8F=90=E4=BA=A4=20--=E6=8F=90=E4=BA=A4=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/train/train.js           | 11 +++++
 src/router/ebiz/train.js              | 14 ++++++
 src/views/ebiz/train/TrainLoading.vue | 63 +++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 src/api/ebiz/train/train.js
 create mode 100644 src/router/ebiz/train.js
 create mode 100644 src/views/ebiz/train/TrainLoading.vue

diff --git a/src/api/ebiz/train/train.js b/src/api/ebiz/train/train.js
new file mode 100644
index 000000000..ff20ce190
--- /dev/null
+++ b/src/api/ebiz/train/train.js
@@ -0,0 +1,11 @@
+import request from '@/assets/js/utils/request'
+import getUrl from '@/assets/js/utils/get-url'
+
+// 获取培训系统中心页面
+export function trainHomeUrl(data) {
+  return request({
+    url: getUrl('/customer/train/account/trainHomeUrl', 0),
+    method: 'post',
+    data
+  })
+}
diff --git a/src/router/ebiz/train.js b/src/router/ebiz/train.js
new file mode 100644
index 000000000..0738bfda4
--- /dev/null
+++ b/src/router/ebiz/train.js
@@ -0,0 +1,14 @@
+//培训系统 定义相关组件
+const trainLoading = () => import('@/views/ebiz/train/TrainLoading')
+
+export default [
+  {
+    path: '/train/trainLoading',
+    name: 'trainLoading',
+    component: trainLoading,
+    meta: {
+      title: '培训中心。。。',
+      index: 1
+    }
+  }
+]
diff --git a/src/views/ebiz/train/TrainLoading.vue b/src/views/ebiz/train/TrainLoading.vue
new file mode 100644
index 000000000..5e7b03054
--- /dev/null
+++ b/src/views/ebiz/train/TrainLoading.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="loading-content flex justify-content align-items-c">
+    <div class="context-core">
+      正在跳转培训中心，<span>**</span>秒
+    </div>
+  </div>
+</template>
+
+<script>
+import { Image as VanImage, Lazyload, Grid, GridItem } from 'vant'
+import { trainHomeUrl } from '@/api/ebiz/train/train.js'
+
+export default {
+  components: {
+    [VanImage.name]: VanImage,
+    [Grid.name]: Grid,
+    [GridItem.name]: GridItem,
+    [Lazyload.name]: Lazyload
+  },
+  data() {
+    return {
+      trainHomeUrl: '',
+      time: 10
+    }
+  },
+  created() {
+    this.initThisPage()
+  },
+  methods: {
+    initThisPage() {
+      trainHomeUrl({}).then(res => {
+        if (res.result == 0) {
+          this.trainHomeUrl = res.content
+          this.timeOut()
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
+    timeOut() {
+      let timer = setInterval(() => {
+        this.time--
+        if (this.time <= 0) {
+          this.time = 0
+          clearInterval(timer)
+          this.time = false
+          window.location.href = this.trainHomeUrl
+        }
+      }, 1000)
+    },
+    next() {
+      window.location.href = this.trainHomeUrl
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.loading-content {
+  width: 100vw;
+  height: 100vh;
+}
+</style>

From 67a20c4e808f6d2e44121338c7f32d9809a3096f Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Mon, 4 Jan 2021 15:52:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E9=A6=96=E9=A1=B5=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E8=B0=83=E6=95=B4=20--=E6=8F=90=E4=BA=A4=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/product/HomeProduct.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/ebiz/product/HomeProduct.vue b/src/views/ebiz/product/HomeProduct.vue
index 3b3854453..9766cfe50 100644
--- a/src/views/ebiz/product/HomeProduct.vue
+++ b/src/views/ebiz/product/HomeProduct.vue
@@ -164,7 +164,9 @@ export default {
   },
   async created() {
     await this.getAgentInfo()
-    await this.getTableData()
+    if(this.isGoodStart){
+      await this.getTableData()
+    }
   },
   methods: {
     async getTableData() {

From 5ade8b26f56098b1f258aef573d3c4a98335f204 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Wed, 6 Jan 2021 18:18:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/train/TrainLoading.vue | 33 ++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/views/ebiz/train/TrainLoading.vue b/src/views/ebiz/train/TrainLoading.vue
index 5e7b03054..ad92ebe9e 100644
--- a/src/views/ebiz/train/TrainLoading.vue
+++ b/src/views/ebiz/train/TrainLoading.vue
@@ -1,8 +1,13 @@
 <template>
-  <div class="loading-content flex justify-content align-items-c">
+  <div class="loading-content">
     <div class="context-core">
       正在跳转培训中心，<span>**</span>秒
     </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>
 
@@ -20,13 +25,32 @@ export default {
   data() {
     return {
       trainHomeUrl: '',
-      time: 10
+      time: 10,
+      requestRes: ''
     }
   },
   created() {
-    this.initThisPage()
+    // this.initThisPage()
   },
   methods: {
+    async getDeviceInfo() {
+      this.requestRes = ''
+      // eslint-disable-next-line no-undef
+      const res = await EWebBridge.webCallAppInJs('getDeviceInfo', {
+        secretKey: 'trainSecretKey'
+      })
+      this.requestRes = JSON.stringify(res, null, '\t')
+      console.log('getDeviceInfo :>> ', this.requestRes)
+    },
+    async getUserInfo() {
+      this.requestRes = ''
+      // eslint-disable-next-line no-undef
+      const res = await EWebBridge.webCallAppInJs('getUserInfo', {
+        secretKey: 'trainSecretKey'
+      })
+      this.requestRes = JSON.stringify(res, null, '\t')
+      console.log('getUserInfo :>> ', res)
+    },
     initThisPage() {
       trainHomeUrl({}).then(res => {
         if (res.result == 0) {
@@ -59,5 +83,8 @@ export default {
 .loading-content {
   width: 100vw;
   height: 100vh;
+  display: flex;
+  justify-content: flex-start;
+  flex-direction: column;
 }
 </style>