Skip to content

S
self-support
Commit 6871ae58 authored by Morson's avatar Morson
Browse files
Options

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

parents 20020e2e a7d87ed3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 680 additions and 584 deletions
.env.js
View file @ 6871ae58
......@@ -17,7 +17,7 @@
}
if (ENV_VAR) {
process.uniEnv = {};
process.uniEnv['node_env'] = NODE_ENV;
process.uniEnv['node_env'] = NODE_ENV;
for (let key in ENV_VAR) {
process.uniEnv[key] = ENV_VAR[key];
}
......
src/App.vue
View file @ 6871ae58
......@@ -77,7 +77,7 @@ export default {
// 系统自动登录::每次运行小程序重新获取用户信息
await this.autoLogin();
this.deleteTempImg()
//this.deleteTempImg()
},
onShow: async function () {
// 应用启动，或从后台进入前台显示
......
src/components/createCom/XhFiles.vue
View file @ 6871ae58
This diff is collapsed.
src/components/createCom/XhServiceMeasure.vue
View file @ 6871ae58
......@@ -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
View file @ 6871ae58
......@@ -48,8 +48,8 @@
};
},
computed: {
cusQrcode() {
return process.uniEnv.qn_base_url + 'erweima-bg.png'
cusQrcode() {
return process.uniEnv.qn_base_url + (this.isMine ? 'erweima-rk.png' : 'erweima-bg.png')
},
minekefutuImage() {
return process.uniEnv.qn_base_url + this.imageName
......@@ -88,7 +88,7 @@
complete() {}
});
},
download() {
download() {
let self = this
uni.downloadFile({ //获得二维码的临时地址
url: self.cusQrcode,
......@@ -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
View file @ 6871ae58
......@@ -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
View file @ 6871ae58
import uploader from '@/plugins/uploader/index.js'
const globalUrl = process.uniEnv || {}
const randomChar = function(l, url = "") {
const x = "0123456789qwertyuioplkjhgfdsazxcvbnm";
let tmp = "";
let time = new Date();
for (let i = 0; i < l; i++) {
tmp += x.charAt(Math.ceil(Math.random() * 100000000) % x.length);
}
return (
"file/" +
url +
time.getTime() +
tmp
);
}
export default {
name: 'upload',
components: {},
data() {
return {
imgList:[],
// 上传文件种类：0--头像、1--证件、2--身份证
categories: ['avatar', 'cert', 'id'],
};
},
created() {
// this.initQiniu()
},
methods: {
async uploadPath(type){
// 可以直接上传path
const self = this
let imgList = []
let options = {
files:[] // 文件路径
}
if(type==='qiniu'){
let res = await uploader.qnFileUpload(options)
return
}
let res = await uploader.urlFileUpload(options)
},
/**
* 存储图片到任务队列
* @param {Array} files 图片路径
*/
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)
}
const data = this.uploadTask
const saveLists = data.concat(lists)
this.$u.vuex('uploadTask', saveLists)
return lists
},
/**
* 选择图片
* @param {Object} data option
*/
async chooseImg(data){
const self = this
return new Promise((resolve, reject) => {
uni.chooseImage({
count: data.count || 9, //默认9
sizeType: data.sizeType || ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: data.sourceType || ['album', 'camera'], //从相册选择
success: function(res) {
const lists = self.saveToTask(res.tempFilePaths)
resolve(lists)
},
fail: err => {
console.log("err", err)
}
})
})
},
// 保存图片到本地
saveFiles(path) {
return new Promise((resolve, reject) => {
uni.saveFile({
tempFilePath: path,
success(e) {
const { savedFilePath } = e
const img = {
key: randomChar(10),
path: savedFilePath,
src: ''
}
resolve(img)
},
fail: reject
})
})
},
/**
* 上传图片公用组件
* @param {Object} type 文件上传方式
* @param {Object} attr 文件属性：图片种类[category]（身份证、证件、头像）;
* 图片上传其他配置[options】（如，选择图片或拍摄options.consourceType，['album', 'camera']；）其他
*/
async chooseImage(type, attr={}){
const self = this
let imgList = []
if(type==='qiniu'){
// 图片种类
let category = attr && attr.category || self.categories[0]
let config = attr && attr.options || {} // 图片上传参数配置
// 七牛上传
let options = {
onProgressUpdate(res){
let item = {
path:res.path, // 图片临时缓存路径
key:'', // 图片上传成功后相对路径
src:'', // 访问图片的绝对路径
progress:res.progress // 图片上传进度
}
if(res.fileIndex<imgList.length){
imgList[res.fileIndex].progress = res.progress
}else{
imgList.push(item)
}
imgList[res.fileIndex]
self.imgList = imgList
// 多文件上传每个文件进度条
},
onEachUpdate(res){
// 多文件上传每个文件上传成功触发
if(imgList.length>res.fileIndex){
imgList[res.fileIndex].key = res.url
imgList[res.fileIndex].src = uploader.qiniuTokenObj.visitPrefix + res.url
}
self.imgList = imgList
},
cardType: category,
...config
}
// 不需要进度条等可直接获取
let res = await uploader.qnImgUpload(options)
// let imgList = res.map(item=>{
// return {
// key:item,
// src:uploader.qiniuTokenObj.visitPrefix + item
// }
// })
// this.imgList = imgList
return
}
// 本地服务上传
let res = await uploader.urlUpload()
this.imgList = res
},
perviewImg(index) {
let urls = []
this.imgList.map(item => {
urls.push(item.src)
})
uni.previewImage({
current: index,
urls: urls
});
},
removeImg(index) {
this.imgList.splice(index, 1)
// this.$emit('image-change', this.imgList) //将图片回传父页面
},
}
}
import uploader from '@/plugins/uploader/index.js'
const globalUrl = process.uniEnv || {}
const randomChar = function(l, url = "") {
const x = "0123456789qwertyuioplkjhgfdsazxcvbnm";
let tmp = "";
let time = new Date();
for (let i = 0; i < l; i++) {
tmp += x.charAt(Math.ceil(Math.random() * 100000000) % x.length);
}
return (
"file/" +
url +
time.getTime() +
tmp
);
}
export default {
name: 'upload',
components: {},
data() {
return {
imgList:[],
// 上传文件种类：0--头像、1--证件、2--身份证
categories: ['avatar', 'cert', 'id'],
};
},
created() {
// this.initQiniu()
},
methods: {
async uploadPath(type){
// 可以直接上传path
const self = this
let imgList = []
let options = {
files:[] // 文件路径
}
if(type==='qiniu'){
let res = await uploader.qnFileUpload(options)
return
}
let res = await uploader.urlFileUpload(options)
},
/**
* 存储图片到任务队列
* @param {Array} files 图片路径
*/
async saveToTask(files) {
// 生成key返回，然后把key放到异步上传的任务队列
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)
return lists
},
/**
* 选择图片
* @param {Object} data option
*/
async chooseImg(data){
const self = this
return new Promise((resolve, reject) => {
uni.chooseImage({
count: data.count || 9, //默认9
sizeType: data.sizeType || ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: data.sourceType || ['album', 'camera'], //从相册选择
success: function(res) {
const lists = self.saveToTask(res.tempFilePaths)
resolve(lists)
},
fail: err => {
console.log("err", err)
}
})
})
},
// 保存图片到本地
saveFiles(path) {
return new Promise((resolve, reject) => {
uni.saveFile({
tempFilePath: path,
success(e) {
const { savedFilePath } = e
const img = {
key: randomChar(10),
path: savedFilePath,
src: ''
}
resolve(img)
},
fail: reject
})
})
},
/**
* 上传图片公用组件
* @param {Object} type 文件上传方式
* @param {Object} attr 文件属性：图片种类[category]（身份证、证件、头像）;
* 图片上传其他配置[options】（如，选择图片或拍摄options.consourceType，['album', 'camera']；）其他
*/
async chooseImage(type, attr={}){
const self = this
let imgList = []
if(type==='qiniu'){
// 图片种类
let category = attr && attr.category || self.categories[0]
let config = attr && attr.options || {} // 图片上传参数配置
// 七牛上传
let options = {
onProgressUpdate(res){
let item = {
path:res.path, // 图片临时缓存路径
key:'', // 图片上传成功后相对路径
src:'', // 访问图片的绝对路径
progress:res.progress // 图片上传进度
}
if(res.fileIndex<imgList.length){
imgList[res.fileIndex].progress = res.progress
}else{
imgList.push(item)
}
imgList[res.fileIndex]
self.imgList = imgList
// 多文件上传每个文件进度条
},
onEachUpdate(res){
// 多文件上传每个文件上传成功触发
if(imgList.length>res.fileIndex){
imgList[res.fileIndex].key = res.url
imgList[res.fileIndex].src = uploader.qiniuTokenObj.visitPrefix + res.url
}
self.imgList = imgList
},
cardType: category,
...config
}
// 不需要进度条等可直接获取
let res = await uploader.qnImgUpload(options)
// let imgList = res.map(item=>{
// return {
// key:item,
// src:uploader.qiniuTokenObj.visitPrefix + item
// }
// })
// this.imgList = imgList
return
}
// 本地服务上传
let res = await uploader.urlUpload()
this.imgList = res
},
perviewImg(index) {
let urls = []
this.imgList.map(item => {
urls.push(item.src)
})
uni.previewImage({
current: index,
urls: urls
});
},
removeImg(index) {
this.imgList.splice(index, 1)
// this.$emit('image-change', this.imgList) //将图片回传父页面
},
}
}
src/components/upload/task.js
View file @ 6871ae58
......@@ -32,7 +32,7 @@ export default {
}
})
uni.setStorageSync('delImg', delImg) // 已上传完的图片，会在启动系统的时候做一次清理
// uni.setStorageSync('delImg', delImg) // 已上传完的图片，会在启动系统的时候做一次清理
that.$u.vuex('uploadTask', newTask)
}
......
src/pages/index/learn.vue
View file @ 6871ae58
......@@ -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,10 +633,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 +657,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/index/mine.vue
View file @ 6871ae58
......@@ -53,13 +53,12 @@
},
avatar() {
return this.vuex_settled && this.vuex_settled.avatar
},
name() {
return this.settled && (this.settled.id_card_name
|| this.settled.nickname || this.settled.name)
},
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
View file @ 6871ae58
......@@ -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
View file @ 6871ae58
......@@ -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/order/complete.vue
View file @ 6871ae58
This diff is collapsed.
src/pages/settle/file.vue
View file @ 6871ae58
......@@ -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
View file @ 6871ae58
......@@ -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
View file @ 6871ae58
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment