Merge branch 'dev-fix' into test

src/pages/index/learn.vue

@@ -98,6 +98,23 @@
                                 <text class="font-default-color" :class="{'font-active-color':courselist[2].percent}" v-text="courselist[2].status"></text>
                             </view>
                         </view>
+                        <!-- <view class="learn-class1 u-margin-left-30" @click="goPlay(courselist[3])">
+                            <image class="learn-img" :src="courselist[3].pic" mode=""></image>
+                            <image class="bofang" :src="bofang" mode=""></image>
+                            <view class="learn-desc">
+                                <view class="u-font-28 font-bold h68">
+                                    {{ courselist[3].title }}
+                                </view>
+                                <view class="u-font-20 learn-intro h48">
+                                    {{ courselist[3].desc }}
+                                </view>
+                            </view>
+                            <view class="line-percent u-margin-top-35">
+                                <u-line-progress active-color="#2979ff" :percent="courselist[3].percent" :show-percent="false">
+                                </u-line-progress>
+                                <text class="font-default-color" :class="{'font-active-color':courselist[3].percent}" v-text="courselist[3].status"></text>
+                            </view>
+                        </view> -->
                     </view>
                 </scroll-view>
             </swiper-item>
@@ -175,6 +192,15 @@ var json = {
             id: 173,
             sectionId: "",
         },
+        // {
+        //     title: "充电桩安装要点提示",
+        //     desc: "在充电装安装过程中需要着重注意的要点",
+        //     pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png",
+        //     percent: 0,
+        //     status: "",
+        //     id: 173,
+        //     sectionId: "",
+        // },
     ],
     test: [
         {
@@ -204,6 +230,15 @@ var json = {
             id: 151,
             sectionId: "",
         },
+        // {
+        //     title: "充电桩安装要点提示",
+        //     desc: "在充电装安装过程中需要着重注意的要点",
+        //     pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png",
+        //     percent: 0,
+        //     status: "",
+        //     id: 151,
+        //     sectionId: "",
+        // },
     ],
     prod: [
         {
@@ -233,6 +268,15 @@ var json = {
             id: 599,
             sectionId: "",
         },
+        // {
+        //     title: "学习-我的模块",
+        //     desc: "学习-我的模块",
+        //     pic: process.uniEnv.qn_base_url + "yaodiantishi.png",
+        //     percent: 0,
+        //     status: "",
+        //     id: 600,
+        //     sectionId: "",
+        // },
     ],
 };
 
@@ -374,7 +418,17 @@ export default {
                     pic: courseListJson[2].pic,
                     id: courseListJson[2].id,
                     sectionId: courseListJson[2].sectionId,
-                },
+                }
+                // ,
+                // {
+                //     title: courseListJson[3].title,
+                //     desc: courseListJson[3].desc,
+                //     percent: courseListJson[3].percent,
+                //     status: courseListJson[3].status,
+                //     pic: courseListJson[3].pic,
+                //     id: courseListJson[3].id,
+                //     sectionId: courseListJson[3].sectionId,
+                // },
             ],
             examList: [
                 {

src/pages/mine/cert/index.vue

@@ -128,6 +128,11 @@
                     this.isRuZhu = false;
                 });
         },
+       onUnload() {
+           uni.switchTab({
+               url: '/pages/index/mine'
+           });
+       },
         methods: {
             isUpload(typeBool) {
                 return typeBool ? '已上传' : '未上传'