Merge branch 'master' of http://60.205.254.193:3000/GCLS/eep_page

src/views/book/courseware/preview/components/article/index.vue

@@ -435,7 +435,11 @@ export default {
     },
     submit() {
       let access_token =
-        this.tokenData && this.tokenData.gcls_sys_session_info ? this.tokenData.gcls_sys_session_info.access_token : '';
+        this.tokenData && this.tokenData.gcls_sys_session_info
+          ? this.tokenData.gcls_sys_session_info.access_token
+          : this.tokenData && this.tokenData.access_token
+            ? this.tokenDataaccess_token
+            : '';
       let loading = this.$loading({
         lock: true,
         text: 'Loading',

src/views/book/courseware/preview/components/dialogue_article/index.vue

@@ -425,7 +425,11 @@ export default {
     },
     submit() {
       let access_token =
-        this.tokenData && this.tokenData.gcls_sys_session_info ? this.tokenData.gcls_sys_session_info.access_token : '';
+        this.tokenData && this.tokenData.gcls_sys_session_info
+          ? this.tokenData.gcls_sys_session_info.access_token
+          : this.tokenData && this.tokenData.access_token
+            ? this.tokenDataaccess_token
+            : '';
       let loading = this.$loading({
         lock: true,
         text: 'Loading',