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

src/components/mine/customer.vue

 <template>
 	<view class="cus-wrap-component">
-		<image class="top-image" mode="widthFix" v-if="!isPop" :src="minekefutuImage"></image>
+		<image class="top-image" mode="widthFix" v-if="!isPop" :src="qnFile(imageName)"></image>
 		<view class="content-view">
 			<view :class="['title-view', {'is-mine': isMine}]">
 				<text :class="['title-text', {'is-mine': isMine}]">{{titleText[typeIndex]}}</text>
 				<text>{{tipText[typeIndex]}}</text>
 			</view>
-			<u-image :class="['qrcode', {'is-mine': isMine}]" :src="cusQrcode" mode="widthFix" :fade="true"
-				duration="450">
+			<u-image :class="['qrcode', {'is-mine': isMine}]" :src="qnFile(cusQrcode)" mode="widthFix" :fade="false">
 				<u-loading slot="loading"></u-loading>
 				<view slot="error" style="font-size: 24rpx;">加载失败</view>
 			</u-image>
 			<button :class="['settle-button', {'is-mine': isMine}]" type="primary" :open-type="openTypes[typeIndex]" show-message-card
-				send-message-title="点击下方客服会话添加订单助手" shape="circle" @click="download" :send-message-img="kefuzxiaoxiImage"
+				send-message-title="点击下方客服会话添加订单助手" shape="circle" @click="download" :send-message-img="qnFile('kefuzxiaoxi.png')"
 				send-message-path="/pages/index/index">
 				{{buttonText[typeIndex]}}
 			</button>
@@ -45,14 +44,7 @@
 		},
 		computed: {
 			cusQrcode() {
-				let src = this.isMine ? 'erweima-rk.png' : 'dingdanzhushou-n.png';
-				return util.imageCache(this, src)
-			},
-			kefuzxiaoxiImage() {
-				return util.imageCache(this, 'kefuzxiaoxi.png')
-			},
-			minekefutuImage() {
-				return util.imageCache(this, this.imageName)
+				return this.isMine ? 'erweima-rk.png' : 'dingdanzhushou-n.png';
 			},
 			imageName() {
 				return this.isMine ? 'kefufuwu-n.png' : 'kefutuzs.png'
@@ -92,6 +84,9 @@
 			}
 		},
 		methods: {
+			qnFile(src) {
+				return process.uniEnv.qn_base_url + src
+			},
 			phoneToCustomer() { // 联系客户
 				uni.makePhoneCall({
 					phoneNumber: this.phone, //仅为示例

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: "",
         },
     ],
@@ -374,6 +374,9 @@ export default {
                 {
                     name: "消息通知",
                 },
+                {
+                    name: "在线学习",
+                },
                 {
                     name: "考核认证",
                 },
@@ -385,9 +388,6 @@ export default {
                 {
                     name: "消息通知",
                 },
-                {
-                    name: "在线学习",
-                },
                 {
                     name: "考核认证",
                 },
@@ -474,7 +474,7 @@ export default {
             isReflesh: true,
             triggered: false,
             _freshing: false,
-            version: false,
+            version: true,
         };
     },
     onLoad(param) {
@@ -512,8 +512,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/pages/index/mine.vue

@@ -23,7 +23,7 @@
 				<u-cell-group :border="false">
 					<view v-for="(item, index) in items" :key="index">
 						<u-cell-item :value="item.value" :border-bottom="false" @click="handleClick(item.pathName)">
-							<image slot="icon" :src="qnPath + item.icon" :style="item.imageStyle"></image>
+							<image slot="icon" :src="qnFile(item.icon)" :style="item.imageStyle"></image>
 							<view slot="title" class="item-title">{{item.title}}</view>
 							<view slot="value" class="item-value">{{value}}</view>
 						</u-cell-item>
@@ -43,7 +43,6 @@
 	export default {
 		data() {
 			return {
-				qnPath: process.uniEnv.qn_base_url,
 				serviceTel: '18124099271',
 				showSuperButton: false,
 				show: false,
@@ -142,10 +141,13 @@
 					this.getData()
 				}
 			}
-			this.wodebeijingImage = await util.imageCache(this, 'wodebeijing.png')
-			this.placeholderImage = await util.imageCache(this, 'touxiang.png')
+			this.wodebeijingImage = this.qnFile('wodebeijing.png')
+			this.placeholderImage = this.qnFile('touxiang.png')
 		},
 		methods: {
+			qnFile(src) {
+				return process.uniEnv.qn_base_url + src
+			},
 			getData() {
 				let self = this
 				app.getBaseInfo(self);

src/pages/learn/course-detail.vue

 <template>
     <view class="learn-vedio">
+        <view v-if="version && loaded">
             <u-navbar title="培训视频"></u-navbar>
             <view class="uni-padding-wrap uni-common-mt">
-      <view
-        ><video
-          object-fit="fill"
-          class="course-video"
-          id="courseVideo"
-          :src="courseSrc"
-		  @play="playCourse"
-          @error="videoErrorCallback"
-          controls
-        ></video
-      ></view>
+                <view><video object-fit="fill" class="course-video" id="courseVideo" :src="courseSrc" @play="playCourse"
+                        @error="videoErrorCallback" controls></video></view>
                 <view class="title-content">
                     <view class="item-content">
                         <view class="item-st">
                             <image style="width: 80rpx; height: 36rpx" :src="kcImage"></image>
-            <text class="item-st-text">{{
-              courseTitle.split(" ") ? courseTitle.split(" ")[0] : ""
-            }}</text>
+                            <text class="item-st-text">{{ courseTitle.split(" ") ? courseTitle.split(" ")[0] : "" }}</text>
                         </view>
-          <view class="item-title">{{
-            courseTitle.split(" ") ? courseTitle.split(" ")[1] : ""
-          }}</view>
+                        <view class="item-title">{{ courseTitle.split(" ") ? courseTitle.split(" ")[1] : "" }}</view>
                     </view>
-        <view
-          >接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。</view
-        >
+                    <view>接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。</view>
                 </view>
                 <view class="learn-view" v-if="courseId >= 0">
                     <view class="learn-view-title">视频内容介绍</view>
-        <view
-          class="learn-list"
-          v-for="(item, key) in courseOutlines[courseId]"
-          :key="key"
-        >
+                    <view class="learn-list" v-for="(item, key) in courseOutlines[courseId]" :key="key">
                         <view class="learn-list-item">{{ item }}</view>
                     </view>
                 </view>
             </view>
         </view>
+        <view v-else-if="loaded">
+            <u-navbar title=" "></u-navbar>
+            <view style="text-align: center;">暂无数据</view>
+        </view>
+    </view>
 </template>
 
 <script>
-let app = getApp();
-export default {
+    let app = getApp();
+    export default {
         data() {
             return {
                 courseId: "",
@@ -54,6 +41,8 @@ export default {
                 courseTitle: "",
                 courseDesc: "",
                 currentIndex: -1, // 第几个视频
+                version: true,
+                loaded: false
             };
         },
         computed: {
@@ -103,21 +92,38 @@ export default {
                     this.courseStatus = e.status;
                 }
             }
+            this.getVersion();
         },
-  onReady: function (res) {
+        onReady: function(res) {
             // #ifndef MP-ALIPAY
             this.videoContext = uni.createVideoContext("courseVideo");
             // #endif
         },
         methods: {
-    videoErrorCallback: function (e) {
+            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) => {
+
+                    });
+            },
+            videoErrorCallback: function(e) {
                 uni.showModal({
                     content: e.target.errMsg,
                     showCancel: false,
                 });
             },
-	playCourse: function (e) {
-		if(this.courseStatus && (this.courseStatus == "1"||this.courseStatus == 1)) {
+            playCourse: function(e) {
+                if (this.courseStatus && (this.courseStatus == "1" || this.courseStatus == 1)) {
                     return
                 }
                 this.changeCourseStatus();
@@ -144,11 +150,11 @@ export default {
                 }
             },
         },
-};
+    };
 </script>
 
 <style lang="scss" scoped>
-.learn-vedio {
+    .learn-vedio {
         background-color: #f4f5f7;
         position: absolute;
         top: 0;
@@ -157,24 +163,24 @@ export default {
         height: 100%;
         display: flex;
         flex-direction: column;
-  overflow-y:auto;
-}
+        overflow-y: auto;
+    }
 
-.course-video {
+    .course-video {
         width: 750rpx;
-}
+    }
 
-.course-title {
+    .course-title {
         font-size: 36rpx;
         font-weight: 700;
         padding: 80rpx 60rpx 40rpx 60rpx;
-}
+    }
 
-.course-desc {
+    .course-desc {
         margin-left: 60rpx;
-}
+    }
 
-.title-content {
+    .title-content {
         padding: 40rpx 30rpx;
         margin-bottom: 20rpx;
         background-color: #ffffff;
@@ -194,6 +200,7 @@ export default {
             margin-right: 20rpx;
             line-height: 24rpx;
             position: relative;
+
             .item-st-text {
                 color: #ffffff;
                 position: absolute;
@@ -209,19 +216,19 @@ export default {
             font-size: 44rpx;
             font-weight: bold;
         }
-}
+    }
 
-.item-content {
+    .item-content {
         display: flex;
         padding-bottom: 30rpx;
-}
+    }
 
-.item-title {
+    .item-title {
         color: #333333;
         font-size: 28rpx;
-}
+    }
 
-.learn-view {
+    .learn-view {
         background-color: #ffffff;
         border-radius: 12rpx;
         padding: 38rpx 30rpx 30rpx 30rpx;
@@ -234,6 +241,7 @@ export default {
             font-weight: bold;
             margin-bottom: 10rpx;
         }
+
         .learn-list {
             .learn-list-item {
                 font-size: 28rpx;
@@ -248,5 +256,5 @@ export default {
                 width: 100%;
             }
         }
-}
+    }
 </style>

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) {
+            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
             },

src/pages/login/index.vue

 <template>
 	<view class="">
+		<w-navbar></w-navbar>
 		<view class="backView">
 			<view class="login-block" v-if="needAuth">
-				<u-image class="u-flex u-row-center logo" :src="logo" width="200" height="200">
+				<u-image :fade="false" class="u-flex u-row-center logo" :src="logo" width="200" height="200">
 					<u-loading slot="loading"></u-loading>
 					<view slot="error" style="font-size: 24rpx;">加载失败</view>
 				</u-image>
-				<u-image class="u-flex u-row-center logo2" :src="logo2" width="214" height="60">
+				<u-image :fade="false" class="u-flex u-row-center logo2" :src="logo2" width="214" height="60">
 					<u-loading slot="loading"></u-loading>
 					<view slot="error" style="font-size: 24rpx;">加载失败</view>
 				</u-image>
 			</view>
 			<view class="bind-block" v-else>
-				<u-image class="u-flex u-row-between logo" :src="logo" width="148" height="148">
+				<u-image :fade="false" class="u-flex u-row-between logo" :src="logo" width="148" height="148">
 					<u-loading slot="loading"></u-loading>
 					<view slot="error" style="font-size: 24rpx;">加载失败</view>
 				</u-image>
@@ -38,7 +39,6 @@ const app = getApp()
 export default {
 	data() {
 		return {
-			qnPath: process.uniEnv.qn_base_url,
 			needAuth: true,
 			TimeID: -1,
 			loginTitle: '用户登录',
@@ -50,10 +50,10 @@ export default {
 	},
 	computed: {
 		logo() {
-			return util.imageCache(this, 'logo.png')
+			return this.qnFile('logo.png')
 		},
 		logo2() {
-			return util.imageCache(this, 'logo-2.png')
+			return this.qnFile('logo-2.png')
 		},
 	},
 	onLoad(e) {
@@ -67,6 +67,9 @@ export default {
 		this.getCode()
 	},
 	methods: {
+		qnFile(src) {
+			return process.uniEnv.qn_base_url + src
+		},
 		async getCode() {
 			login.appLogin().then(res => {
 				this.code = res.code

src/pages/mine/wallet/index.vue

@@ -4,7 +4,7 @@
 			:border-bottom="false" title-bold></u-navbar>
 		<view class="wallet-content-view">
 			<view class="header-view">
-				<image class="header-image" :src="qianbaobeijing"></image>
+				<image class="header-image" :src="qnFile('qianbaobeijing.png')"></image>
 			</view>
 			<view class="survey-view">
 				<view class="survey-top-view">
@@ -109,9 +109,6 @@
 			imageUrl() {
 				return process.uniEnv.qn_base_url
 			},
-			qianbaobeijing() {
-				return util.imageCache(this, 'qianbaobeijing.png')
-			},
 			buttonStyle() {
 				return {
 					width: "200rpx",
@@ -139,6 +136,9 @@
 			this.loadStatement()
 		},
 		methods: {
+			qnFile(src) {
+				return process.uniEnv.qn_base_url + src
+			},
 			// 提现
 			handleClickWithdraw() {
 				this.$u.route({

src/pages/mine/wallet/settlement.vue

@@ -20,7 +20,7 @@
 						</view>
 					</view>
 				</view>
-				<image :src="liushuibeijingImage" class="head-back-image" mode="widthFix"></image>
+				<image :src="qnFile('liushuibeijing.png')" class="head-back-image" mode="widthFix"></image>
 				<view class="list-view" v-if="hasInfo">
 					<view class="u-flex u-row-center" v-if="loading">
 						<u-gap height="20"></u-gap>
@@ -31,7 +31,7 @@
 					</view>
 				</view>
 				<view class="list-view-empty" v-else>
-					<u-image class="empty-image" :src="banner" width="374" height="246" mode="widthFix" :fade="true" duration="450">
+					<u-image class="empty-image" :src="banner" width="374" height="246" mode="widthFix" :fade="false">
 						<u-loading slot="loading"></u-loading>
 						<view slot="error" style="font-size: 24rpx;">加载失败</view>
 					</u-image>
@@ -64,9 +64,6 @@
 			}
 		},
 		computed: {
-			liushuibeijingImage() {
-				return util.imageCache(this, 'liushuibeijing.png')
-			},
 			imageUrl() {
 				return process.uniEnv.qn_base_url
 			},
@@ -74,7 +71,7 @@
 				return this.loading || this.info.payableRecordExtendDtos && this.info.payableRecordExtendDtos.length
 			},
 			banner() {
-				return util.imageCache(this, 'receipt.png')
+				return this.qnFile('receipt.png')
 			},
 		},
 		onLoad() {
@@ -82,6 +79,9 @@
 			this.loadPayRecord()
 		},
 		methods: {
+			qnFile(src) {
+				return process.uniEnv.qn_base_url + src
+			},
 			async loadPayRecord() {
 				let self = this
 				self.loading = true

src/pages/mine/wallet/statement.vue

@@ -20,7 +20,7 @@
 						</view>
 					</view>
 				</view>
-				<image :src="liushuibeijingImage" class="head-back-image" mode="widthFix"></image>
+				<image :src="qnFile('liushuibeijing.png')" class="head-back-image" mode="widthFix"></image>
 				<view class="list-view"  v-if="hasInfo">
 					<view class="u-flex u-row-center" v-if="loading">
 						<u-gap height="20"></u-gap>
@@ -31,7 +31,7 @@
 					</view>
 				</view>
 				<view class="list-view-empty" v-else>
-					<u-image class="empty-image" :src="banner" width="374" height="246" mode="widthFix" :fade="true" duration="450">
+					<u-image class="empty-image" :src="banner" width="374" height="246" mode="widthFix" :fade="false">
 						<u-loading slot="loading"></u-loading>
 						<view slot="error" style="font-size: 24rpx;">加载失败</view>
 					</u-image>
@@ -84,14 +84,11 @@
 				}
 
 			},
-			liushuibeijingImage() {
-				return util.imageCache(this, 'liushuibeijing.png')
-			},
 			imageUrl() {
 				return process.uniEnv.qn_base_url
 			},
 			banner() {
-				return util.imageCache(this, 'receipt.png')
+				return this.qnFile('receipt.png')
 			},
 			hasInfo() {
 				return this.loading || this.data.statementList && this.data.statementList.length
@@ -102,6 +99,9 @@
 			this.loadStatement()
 		},
 		methods: {
+			qnFile(src) {
+				return process.uniEnv.qn_base_url + src
+			},
 			bindDateChange: function(e) {
 			   this.date = e.target.value
 			   this.loadStatement()

src/utils/util.js

@@ -39,10 +39,10 @@ function validImages(imgurl) {
 	return new Promise((resolve, reject) => {
 		uni.getImageInfo({
 			src: imgurl,
-				success (res) {
+			success(res) {
 				resolve(true)
 			},
-				fail () {
+			fail() {
 				reject(false)
 			}
 		})
@@ -58,7 +58,6 @@ function validImages(imgurl) {
 const imageCache = async function (vm, src, host) {
 	host = host || process.uniEnv.qn_base_url
 	let image_url = host + src
-	return image_url // 临时
 	let image_name = md5Libs.md5(image_url)
 	var arr = Object.keys(vm.vuex_cache);
 	const result = await validImages(vm.vuex_cache[image_name])
@@ -70,7 +69,6 @@ const imageCache = async function (vm, src, host) {
 			url: image_url,
 			success: (res) => {
 				if (res.statusCode === 200) {
-					// call_back(res.tempFilePath)
 					vm.$u.vuex(`vuex_cache.${image_name}`, res.tempFilePath)
 				}
 			}