Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/pages/index/learn.vue

@@ -374,6 +374,9 @@ export default {
                 {
                     name: "消息通知",
                 },
+                {
+                    name: "在线学习",
+                },
                 {
                     name: "考核认证",
                 },
@@ -385,9 +388,6 @@ export default {
                 {
                     name: "消息通知",
                 },
-                {
-                    name: "在线学习",
-                },
                 {
                     name: "考核认证",
                 },

src/pages/learn/section.vue

-<template>
+<template v-cloak>
     <view class="">
-        <view class="learn-vedio">
+        <view class="learn-vedio" v-if="version && loaded">
             <u-navbar back-icon-color="#000000" :background="background" title-color="#000000" :border-bottom="false">
             </u-navbar>
             <view class="uni-padding-wrap uni-common-mt">
@@ -48,6 +48,11 @@
                 </view>
             </view>
         </view>
+        <view v-else-if="loaded">
+            <u-navbar back-icon-color="#000000" :background="background" title-color="#000000" :border-bottom="false">
+            </u-navbar>
+            <view style="text-align: center;">暂无数据</view>
+        </view>
     </view>
 </template>
 
@@ -100,7 +105,9 @@
                     scrollTop: null
                 },
                 scrollValue: 0,
-                nowTime: 0
+                nowTime: 0,
+                version: true,
+                loaded: false
             };
         },
         computed: {
@@ -109,18 +116,37 @@
             },
         },
         onLoad(e) {
-			getApp().trackPage('学习视频详情页')
-            this.section_id = e.section_id
-            this.params.course_id = e.course_id
-            this.getCapterDetails()
-            this.getSectionInfo({
-                section_id: e.section_id
-            })
+            this.getVersion();
+            getApp().trackPage('学习视频详情页')
+            if(e){
+                this.section_id = e.section_id
+                this.params.course_id = e.course_id
+                this.getCapterDetails()
+                this.getSectionInfo({
+                    section_id: e.section_id
+                })
+            }
         },
         onReady: function(res) {
             this.videoContext = uni.createVideoContext("courseVideo");
         },
         methods: {
+            getVersion() {
+                let version = process.uniEnv.version_number;
+                let that = this;
+                this.$u.api
+                    .getVersionInfo(version)
+                    .then((res) => {
+                        that.loaded = true
+                        let data = res.data;
+                        if(data.hasOwnProperty('is_audit') && data.is_audit == 0){
+                            that.version = false
+                        }
+                    })
+                    .catch((err) => {
+                        that.loaded = true
+                    });
+            },
             scroll: function(e) {
                 this.old.scrollTop = e.detail.scrollTop
             },