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

src/App.vue

@@ -77,7 +77,7 @@ export default {
     // 系统自动登录::每次运行小程序重新获取用户信息
     await this.autoLogin();
 
-    this.deleteTempImg()
+    //this.deleteTempImg()
   },
   onShow: async function () {
     // 应用启动，或从后台进入前台显示

src/components/createCom/XhServiceMeasure.vue

@@ -164,6 +164,9 @@
 	.text-title {
 		font-size: 26rpx;
 		color: #333333;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
 	}
 }
 </style>

src/components/mine/customer.vue

@@ -49,7 +49,7 @@
 		},
 		computed: {
 			cusQrcode() {
-				return process.uniEnv.qn_base_url + 'erweima-bg.png'
+				return process.uniEnv.qn_base_url + (this.isMine ? 'erweima-rk.png' : 'erweima-bg.png')
 			},
 			minekefutuImage() {
 				return process.uniEnv.qn_base_url + this.imageName
@@ -150,8 +150,6 @@
 				color: #666666;
 				width: 100%;
 				margin-top: 10rpx;
-				display: flex;
-				align-items: flex-end;
 
 				.title-text {
 					font-weight: bold;

src/components/photo/preview.vue

@@ -87,7 +87,6 @@
 					if(photo.tempPath.mixWater){
 						// 保存水印处理图片到本地
 						path = photo.tempPath.mixWater
-						console.log("path", path)
 						let result1 =  await this.saveLocal(path)
 						if(result1){
 							uni.showToast({

src/components/upload/index.js

@@ -47,13 +47,18 @@ export default {
 		 */
 		async saveToTask(files) {
 			// 生成key返回，然后把key放到异步上传的任务队列
-			let lists = []
-			for (let i = 0; i < files.length; i++) {
-				const path = files[i]
-				const row = await this.saveFiles(path)
-				lists.push(row)
+			let lists = files.map(v => {
+				return {
+					key: randomChar(10),
+					path: v,
+					src: ''
 				}
-
+			})
+			// for (let i = 0; i < files.length; i++) {
+			// 	const path = files[i]
+			// 	const row = await this.saveFiles(path)
+			// 	lists.push(row)
+			// }
 			const data = this.uploadTask
 			const saveLists = data.concat(lists)
 			this.$u.vuex('uploadTask', saveLists)

src/components/upload/task.js

@@ -32,7 +32,7 @@ export default {
                 }
             })
 
-            uni.setStorageSync('delImg', delImg) // 已上传完的图片，会在启动系统的时候做一次清理
+            // uni.setStorageSync('delImg', delImg) // 已上传完的图片，会在启动系统的时候做一次清理
             that.$u.vuex('uploadTask', newTask)
         }
         

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%;">
@@ -410,7 +409,6 @@ export default {
             isReflesh: true,
             triggered: false,
             _freshing: false,
-            isOnLoad: 0
         };
     },
     onLoad(param) {
@@ -428,14 +426,13 @@ export default {
         },
     },
     onShow: function (param) {
-        this.isOnLoad = 1;
         try {
             if (param.tabs) {
                 this.current = param.tabs;
                 this.swiperCurrent = param.tabs;
             }
         } catch (e) {}
-        if (this.current == 1 ||this.current == 2 || this.current == 3) {
+        if (this.current == 2 || this.current == 3) {
             this.tabsChange(this.current);
         }
     },
@@ -636,9 +633,7 @@ export default {
         },
         //考核认证,通用认证,考试通过or未通过查询接口请求
         getUserExamInfo() {
-            uni.showLoading({
-                title: "请稍候",
-            });
+            uni.hideLoading();
             
             let that = this;
             let token = that.vuex_token;
@@ -664,10 +659,12 @@ export default {
                         //动态获取条件
 
                         let ruleDisc = res.data.ruleDisc;
-                        let targetIndex = ruleDisc.indexOf('（');
+                        let targetIndex = ruleDisc.indexOf("（");
 
-                        if(targetIndex){
-                            this.examList[i].condition = ruleDisc.substr(targetIndex + 1).replace('）', '');
+                        if (targetIndex) {
+                            this.examList[i].condition = ruleDisc
+                                .substr(targetIndex + 1)
+                                .replace("）", "");
                         }
 
                         // examStatus 用户考试状态 0考试中 1考试完成 2未参与

src/pages/index/mine.vue

@@ -55,11 +55,10 @@
 				return this.vuex_settled && this.vuex_settled.avatar
 			},
 			name() {
-				return this.settled && (this.settled.id_card_name 
-				|| this.settled.nickname || this.settled.name)
+				return (this.settled && (this.settled.id_card_name || this.settled.name)) || (this.vuex_user && (this.vuex_user.name || this.vuex_user.loginName))
 			},
 			mobile() {
-				return this.settled && this.settled.mobile
+				return (this.settled && this.settled.mobile) || (this.vuex_user && this.vuex_user.mobile)
 			},
 			items() {
 				return [

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];

src/pages/learn/section.vue

@@ -4,9 +4,9 @@
             <u-navbar back-icon-color="#000000" :background="background" title-color="#000000" :border-bottom="false">
             </u-navbar>
             <view class="uni-padding-wrap uni-common-mt">
-                <view><video object-fit="cover" class="course-video" id="courseVideo" :src="courseSrc"
+                <view><video object-fit="fill" class="course-video" id="courseVideo" :src="courseSrc"
                         :options="playerOptions" :playsinline="true" @play="playCourse" @error="videoErrorCallback"
-                        @ready="playerReadied" @timeupdate="onPlayerTimeupdate($event)" autoplay="true"
+                        @ready="playerReadied" @timeupdate="onPlayerTimeupdate($event)" @ended="setLearned()" autoplay="true"
                         controls></video></view>
                 <view class="title-content">
                     <view class="item-content">
@@ -149,6 +149,16 @@
                     this.scrollValue = 0
                 }
             },
+            setLearned() {
+                let param = {
+                    section_id: this.section_id,
+                    video_time: this.videoTotalTime,
+                    status: 1
+                };
+                this.$u.api.updateLearnCourses(param).then((res) => {}).catch((err) => {
+                    console.log(err)
+                });
+            },
             onPlayerTimeupdate(player) {
                 let intCurrentTime = parseInt(player.detail.currentTime);
                 this.updateLearnedStatus(intCurrentTime)
@@ -247,20 +257,17 @@
                     video_time: nowTime,
                     status: this.status
                 };
-                nowTime = parseInt(nowTime);
                 if(nowTime == this.nowTime){
                     return
                 }
                 this.nowTime = nowTime;
-                if(this.status == 1 || nowTime < 5){
+                if(nowTime % this.howTimeToUpdateLearnedStatus != 0){
+                    //固定时间更新一次
                     return
                 }
-                if(nowTime == this.videoTotalTime){
-                    param.status = this.status = 1
-                }else if(nowTime % this.howTimeToUpdateLearnedStatus != 0){
-                    return
-                }else{
-                    param.status = 0;
+                if(this.status == 1){
+                    //已学再学时间设置为结束时间
+                    param.video_time = this.videoTotalTime
                 }
                 this.$u.api.updateLearnCourses(param).then((res) => {}).catch((err) => {
                     console.log(err)

src/pages/settle/file.vue

@@ -159,7 +159,7 @@ export default {
 					label: "电工证照",
 					required: true,
 					maxImgs: 1,
-					tips: "上传电工证证照片，图片大小不大于3M",
+					tips: "上传电工证或特种作业操作证",
 					imgs: [],
 					placeholderImages: [process.uniEnv.qn_base_url + 'diangong.png']
 				},

src/pages/settle/index.vue

@@ -52,7 +52,7 @@
 							4.有充电桩安装经验优先；'
 				}, {
 					title: '结算价格',
-					content: '1.不同车企品牌结算价格不一，675元-1890元不等；\n\
+					content: '1.不同车企品牌结算价格不一，600元-2000元不等；\n\
 							2.结算价格为包工包料价，安装材料根据车企品牌规格自行采购（电缆、空开、漏保）；\n\
 							3.结算账期：周结50%，剩余50%次月20号结算；'
 				}, {

src/pages/settle/prompt.vue

@@ -104,7 +104,7 @@
 					'icon-prompt.png'
 			},
 			erweimaImage() {
-				return process.uniEnv.qn_base_url + 'erweima-bg.png'
+				return process.uniEnv.qn_base_url + 'erweima-rk.png'
 			},
 		},
 		onLoad(e) {