Merge branch 'course-dev' into dev

src/view/course/deal/dealOrder.vue

@@ -93,12 +93,12 @@ export default {
   },
   created() {
     // this.getCourseList();
-    if(this.$isWx){
-      setWxConfig(info);
-    }
   },
   activated(){
     this.getCourseList();
+    if(this.$isWx){
+      setWxConfig(info);
+    }
   },
   deactivated(){
     this.resetList();

src/view/course/deal/limitRecord.vue

@@ -55,12 +55,12 @@ export default {
   },
   created() {
     // this.getList();
-    if(this.$isWx){
-      setWxConfig(info);
-    }
   },
   activated(){
     this.getList();
+    if(this.$isWx){
+      setWxConfig(info);
+    }
   },
   deactivated(){
     this.page.cur = 1;

src/view/course/deal/transfer.vue

@@ -63,13 +63,13 @@ export default {
   },
   activated(){
     this.init();
-  },
-  created() {
-    // this.init()
     if(this.$isWx){
       setWxConfig(info);
     }
   },
+  created() {
+    // this.init()
+  },
   methods: {
     // 初始化
     init(){

src/view/course/home.vue

@@ -67,16 +67,14 @@ export default {
   },
   activated(){
     this.init();
+    if(this.$isWx){
+      setWxConfig();
+    }
   },
   deactivated(){
     this.page.cur = 1;
     this.courseList = []
   },
-  created() {
-    if(this.$isWx){
-      setWxConfig();
-    }
-  },
   methods: {
     // 随机学习中
     getRandomNumber(min, max) {

src/view/course/user.vue

@@ -204,14 +204,12 @@
         wxId: "11770"
       };
     },
-    created() {
+    activated(){
+      this.init();
       if(this.$isWx){
         setWxConfig();
       }
     },
-    activated(){
-      this.init();
-    },
     methods: {
         //底部导航变化
         activeChange(){

src/view/course/user/courseAdDeal.vue

@@ -143,12 +143,12 @@ export default {
   },
   created() {
     // this.init();
-    if(this.$isWx){
-      setWxConfig();
-    }
   },
   activated(){
     this.init();
+    if(this.$isWx){
+      setWxConfig();
+    }
   },
   deactivated(){
     this.page.cur = 1;

src/view/course/user/courseDeal.vue

@@ -34,6 +34,17 @@
             >
           </div>
           <van-tabs v-model="activeTab" swipeable sticky>
+            <van-tab title="课程介绍">
+              <div class="images">
+                <div
+                  class="descImage"
+                  v-for="(item, index) in courseDetail.images"
+                  :key="index"
+                >
+                  <img :src="item" />
+                </div>
+              </div>
+            </van-tab>
             <van-tab title="课程目录">
               <div class="catelog">
                 <div class="logConetent">
@@ -48,17 +59,6 @@
                 </div>
               </div>
             </van-tab>
-            <van-tab title="课程介绍">
-              <div class="images">
-                <div
-                  class="descImage"
-                  v-for="(item, index) in courseDetail.images"
-                  :key="index"
-                >
-                  <img :src="item" />
-                </div>
-              </div>
-            </van-tab>
           </van-tabs>
           <div
             id="xxhh"

src/view/course/user/deal.vue

@@ -152,15 +152,15 @@ export default {
   },
   activated(){
     this.init();
+    if(this.$isWx){
+      setWxConfig();
+    }
   },
   deactivated(){
     this.resetList();
   },
   created() {
     // this.init();
-    if(this.$isWx){
-      setWxConfig();
-    }
   },
   methods: {
     // 初始化

src/view/course/user/login.vue

@@ -78,13 +78,13 @@ export default {
   },
   activated(){
     this.init();
-  },
-  created() {
-    // this.init();
     if(this.$isWx){
       setWxConfig();
     }
   },
+  created() {
+    // this.init();
+  },
   methods: {
     // 初始化
     init() {

src/view/course/user/team.vue

@@ -53,6 +53,9 @@ export default {
     }
   },
   created() {
+    
+  },
+  activated(){
     this.init();
     if(this.$isWx){
       setWxConfig();

src/view/course/video/courseVideo.vue

@@ -29,6 +29,17 @@
         </div>
         <scroller ref="scroller" :on-scrolling="scrollChange">
           <van-tabs v-model="activeTab" swipeable>
+            <van-tab title="课程介绍">
+              <div class="images">
+                <div
+                  class="descImage"
+                  v-for="(item, index) in courseDetail.images"
+                  :key="index"
+                >
+                  <img :src="item" />
+                </div>
+              </div>
+            </van-tab>
             <van-tab title="课程目录">
               <div class="catelog">
                 <div class="logConetent">
@@ -44,17 +55,6 @@
                 </div>
               </div>
             </van-tab>
-            <van-tab title="课程介绍">
-              <div class="images">
-                <div
-                  class="descImage"
-                  v-for="(item, index) in courseDetail.images"
-                  :key="index"
-                >
-                  <img :src="item" />
-                </div>
-              </div>
-            </van-tab>
           </van-tabs>
         </scroller>
       </div>
@@ -73,7 +73,7 @@ export default {
       showVideo: true,
       loading: false,
       finished: false,
-      activeTab: 0,
+      activeTab: 1,
       title: "课程详情",
       curTitle: "",
       videoSrc: "",
@@ -98,13 +98,14 @@ export default {
   },
   activated(){
     this.init();
-  },
-  created() {
-    // this.init();
     if(this.$isWx){
       setWxConfig();
     }
   },
+  created() {
+    // this.init();
+    
+  },
   methods: {
     //滚动监控
     scrollChange(e) {

src/view/course/video/freeVideo.vue

@@ -82,9 +82,6 @@ export default {
   },
   activated() {
     this.init();
-  },
-  created() {
-    // this.init();
     if (this.$isWx) {
       let info = {
         title:this.$route.query.name,// 分享标题
@@ -101,6 +98,9 @@ export default {
       setWxConfig(info);
     }
   },
+  created() {
+    // this.init();
+  },
   methods: {
     //删除URL的指定参数
     urlDelP(url,name){