Merge branch 'master' into dev

# Conflicts:
#	src/pages.json
#	src/pages/index/learn.vue
#	src/utils/util.js

src/pages/index/learn.vue

@@ -41,7 +41,7 @@
                     </view>
                 </scroll-view>
             </swiper-item>
-            <swiper-item @touchmove.stop.prevent="stopTouchMove">
+            <swiper-item @touchmove.stop.prevent="stopTouchMove" v-if="version">
                 <scroll-view scroll-y style="height:100%;width:100%;">
                     <view class="title u-margin-top-10 u-margin-bottom-30">通用课程</view>
                     <view class="learn-currency-class">
@@ -231,12 +231,12 @@ var json = {
             sectionId: "",
         },
         {
-            title: "充电桩安装要点提示",
-            desc: "在充电装安装过程中需要着重注意的要点",
+            title: "学习-我的模块",
+            desc: "学习-我的模块",
             pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png",
             percent: 0,
             status: "",
-            id: 151,
+            id: 152,
             sectionId: "",
         },
     ],
@@ -392,6 +392,17 @@ export default {
                     name: "考核认证",
                 },
             ],
+            tabs2: [
+                {
+                    name: "交付规范",
+                },
+                {
+                    name: "消息通知",
+                },
+                {
+                    name: "考核认证",
+                },
+            ],
             bofang: process.uniEnv.qn_base_url + "bofang@3x.png",
             current: 0,
             swiperCurrent: 0,
@@ -474,7 +485,7 @@ export default {
             isReflesh: true,
             triggered: false,
             _freshing: false,
-            version: false,
+            version: true,
         };
     },
     onLoad(param) {
@@ -512,8 +523,9 @@ export default {
                 .getVersionInfo(version)
                 .then((res) => {
                     let data = res.data;
-                    if(data.hasOwnProperty('is_audit') && data.is_audit == 1){
+                    if(data.hasOwnProperty('is_audit') && data.is_audit == 0){
                         that.tabs = that.tabs2;
+                        that.version = false
                     }
                 })
                 .catch((err) => {

src/utils/util.js

@@ -38,14 +38,14 @@ const setOpenid = function (openid) {
 function validImages(imgurl) {
 	return new Promise((resolve, reject) => {
 		uni.getImageInfo({
-				src: imgurl,
-				success (res) {
-					resolve(true)
-				},
-				fail () {
-					reject(false)
-				}
-			})
+			src: imgurl,
+			success(res) {
+				resolve(true)
+			},
+			fail() {
+				reject(false)
+			}
+		})
 	})
 }