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

src/pages/index/learn.vue

@@ -4,8 +4,7 @@
             <text class="title-view">学习</text>
         </u-navbar>
         <image :src="bannerImage" mode="" class="banner"></image>
-        <u-tabs-swiper bg-color="#F4F5F7" inactive-color="#999999" font-size="28" ref="uTabs" :list="tabs"
-         :current="current" @change="tabsChange" :is-scroll="false" :bar-width="52" swiperWidth="750"></u-tabs-swiper>
+        <u-tabs-swiper bg-color="#F4F5F7" inactive-color="#999999" font-size="28" ref="uTabs" :list="tabs" :current="current" @change="tabsChange" :is-scroll="false" :bar-width="52" swiperWidth="750"></u-tabs-swiper>
         <swiper class="swiper_group" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
             <swiper-item @touchmove.stop.prevent="stopTouchMove">
                 <scroll-view scroll-y style="height:100%;width:100%;">
@@ -636,10 +635,8 @@ export default {
         },
         //考核认证,通用认证,考试通过or未通过查询接口请求
         getUserExamInfo() {
-            uni.showLoading({
-                title: "请稍候",
-            });
-
+            uni.hideLoading();
+            
             let that = this;
             let token = that.vuex_token;
             let length = this.examList.length;
@@ -662,14 +659,16 @@ export default {
                         this.examList[i].status =
                             examResult != "" ? examResult : "未通过";
                         //动态获取条件
-                        
+
                         let ruleDisc = res.data.ruleDisc;
-                        let targetIndex = ruleDisc.indexOf('（');
-                        
-                        if(targetIndex){
-                            this.examList[i].condition = ruleDisc.substr(targetIndex + 1).replace('）', '');
+                        let targetIndex = ruleDisc.indexOf("（");
+
+                        if (targetIndex) {
+                            this.examList[i].condition = ruleDisc
+                                .substr(targetIndex + 1)
+                                .replace("）", "");
                         }
-                        
+
                         // examStatus 用户考试状态 0考试中 1考试完成 2未参与
                         that.exam = res.data;
                         if (res.data.examStatus == 2) {

src/pages/learn/assessment.vue

@@ -158,7 +158,7 @@ export default {
                     if (res.data.code == 200) {
                         if (res.data.data.ruleDisc) {
                             var str = res.data.data.ruleDisc;
-                            let strArr = str.split('（')[0].split('，');
+                            let strArr = str.split("（")[0].split("，");
                             this.desc.title = strArr[0];
                             this.desc.score = strArr[1];
                             this.desc.time = strArr[2];