Commit 45422886 authored by Morson's avatar Morson

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

# Conflicts:
#	src/common/api/order.js
parents ce18827b 95ef590c
...@@ -5,17 +5,14 @@ const formType = {'content-type': 'application/x-www-form-urlencoded'} ...@@ -5,17 +5,14 @@ const formType = {'content-type': 'application/x-www-form-urlencoded'}
let orderApiFun = function(vm){ let orderApiFun = function(vm){
// 接口公共前缀 // 接口公共前缀
const prefix = '/wxh-worker-rest/rest/' const prefix = '/wxh-worker-rest/rest/'
let prefix2 = '/wxh-worker-rest/rest/' + vm.vuex_token
let order = '/wxh-worker-rest/rest/order/' let order = '/wxh-worker-rest/rest/order/'
let settle = '/wxh-worker-rest/rest/settle/' + vm.vuex_token let settle = '/wxh-worker-rest/rest/settle/'
let token = vm.vuex_token
let listByRecommendOrder = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/recommend/order', params); let listByRecommendOrder = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/recommend/order', params);
/** /**
* 工单数量查询接口 * 工单数量查询接口
*/ */
let listOrderCount = async (params = {}) => await vm.$u.get(prefix2 + '/wokerOrder/queryOrdersCount/V2', params); let listOrderCount = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/wokerOrder/queryOrdersCount/V2', params);
/** /**
* 工单列表接口 * 工单列表接口
...@@ -25,7 +22,7 @@ let orderApiFun = function(vm){ ...@@ -25,7 +22,7 @@ let orderApiFun = function(vm){
/** /**
* 获取师傅的预约日历 * 获取师傅的预约日历
*/ */
let workerCalendar = async (params = {}) => await vm.$u.get(prefix2 + '/wokerOrder/appointment/calendar', params); let workerCalendar = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/wokerOrder/appointment/calendar', params);
/** /**
* 师傅预约 * 师傅预约
...@@ -37,7 +34,7 @@ let orderApiFun = function(vm){ ...@@ -37,7 +34,7 @@ let orderApiFun = function(vm){
/** /**
* 师傅签到接口 * 师傅签到接口
*/ */
let maintainWorkerCheckin = async (params = {},orderId) => await vm.$u.post(prefix2 + '/order/'+orderId+'/maintainWorkerCheckin', params,formType); let maintainWorkerCheckin = async (params = {},orderId) => await vm.$u.post(prefix + vm.vuex_token + '/order/'+orderId+'/maintainWorkerCheckin', params,formType);
/** /**
* 订单详情查询 * 订单详情查询
*/ */
...@@ -50,7 +47,7 @@ let orderApiFun = function(vm){ ...@@ -50,7 +47,7 @@ let orderApiFun = function(vm){
let traceAndAppointment = async (params = {}, orderId) => await vm.$u.post('/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/' + vm.vuex_token + `/`+orderId, params) let traceAndAppointment = async (params = {}, orderId) => await vm.$u.post('/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/' + vm.vuex_token + `/`+orderId, params)
/* 师傅拒单 */ /* 师傅拒单 */
let rejectOrder = async (params = {}, orderId) => await vm.$u.get(prefix2 + `/order/${orderId}/workerReject/V2`, params) let rejectOrder = async (params = {}, orderId) => await vm.$u.get(prefix + vm.vuex_token + `/order/${orderId}/workerReject/V2`, params)
/** /**
...@@ -61,7 +58,7 @@ let orderApiFun = function(vm){ ...@@ -61,7 +58,7 @@ let orderApiFun = function(vm){
/** /**
* 接单 * 接单
*/ */
let orderAccept = async (params = {},orderId) => await vm.$u.post(prefix2+'/order/'+orderId+'/accept', params, formType); let orderAccept = async (params = {},orderId) => await vm.$u.post(prefix + vm.vuex_token+'/order/'+orderId+'/accept', params, formType);
/** /**
* 抢单 * 抢单
...@@ -71,31 +68,31 @@ let orderApiFun = function(vm){ ...@@ -71,31 +68,31 @@ let orderApiFun = function(vm){
/** /**
* 获取拍照标准 * 获取拍照标准
*/ */
let orderStandard = async (params = {}) => await vm.$u.get(prefix2+'/photo/standard', params); let orderStandard = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token+'/photo/standard', params);
/** /**
* 获取拍照标准单独项目 * 获取拍照标准单独项目
*/ */
let orderStandardItem = async (params = {}) => await vm.$u.get(prefix2+'/photo/standard/only', params); let orderStandardItem = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token+'/photo/standard/only', params);
/** /**
* 保存图片信息 * 保存图片信息
*/ */
let saveImage = async (params = {},orderId) => await vm.$u.post(prefix2 + '/order/'+orderId+'/maintain/saveImage', params); let saveImage = async (params = {},orderId) => await vm.$u.post(prefix + vm.vuex_token + '/order/'+orderId+'/maintain/saveImage', params);
/** /**
* 获取师傅水印 or 默认水印 * 获取师傅水印 or 默认水印
*/ */
let getWatermark = async (params = {}) => await vm.$u.get(prefix2 + '/photo/watermark', params); let getWatermark = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/photo/watermark', params);
/** /**
* 保存师傅水印 * 保存师傅水印
*/ */
let saveWatermark = async (params = {}) => await vm.$u.post(prefix2 + '/photo/watermark', params); let saveWatermark = async (params = {}) => await vm.$u.post(prefix + vm.vuex_token + '/photo/watermark', params);
/** /**
* 获取师傅开放可选时间段 * 获取师傅开放可选时间段
*/ */
let openTimerange = async (params = {}) => await vm.$u.get(prefix2 + '/wokerOrder/appointment/timerange', params); let openTimerange = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/wokerOrder/appointment/timerange', params);
/** /**
* 联系时间接口 * 联系时间接口
...@@ -116,7 +113,7 @@ let orderApiFun = function(vm){ ...@@ -116,7 +113,7 @@ let orderApiFun = function(vm){
/** /**
* 获取订单的完工项目(配置+数据) * 获取订单的完工项目(配置+数据)
*/ */
let getCompleteConfigAndData= async (orderId) => await vm.$u.get(prefix2+'/order/'+ orderId +'/maintain/info'); let getCompleteConfigAndData= async (orderId) => await vm.$u.get(prefix + vm.vuex_token+'/order/'+ orderId +'/maintain/info');
/** /**
* 查询措施 * 查询措施
...@@ -131,16 +128,16 @@ let orderApiFun = function(vm){ ...@@ -131,16 +128,16 @@ let orderApiFun = function(vm){
/** /**
* 保存售后记录 * 保存售后记录
*/ */
let saveCompleteData = async (params = {},orderId) => await vm.$u.post(prefix2+'/order/'+ orderId +'/maintain/saveMaintainInfoV2', params); let saveCompleteData = async (params = {},orderId) => await vm.$u.post(prefix + vm.vuex_token+'/order/'+ orderId +'/maintain/saveMaintainInfoV2', params);
/** /**
* 保内工单完工 * 保内工单完工
*/ */
let inOrderFinish = async (orderId) => await vm.$u.post(prefix2+'/order/'+ orderId +'/finishedAndConfirm',{}, formType); let inOrderFinish = async (orderId) => await vm.$u.post(prefix + vm.vuex_token+'/order/'+ orderId +'/finishedAndConfirm',{}, formType);
/** /**
* 保外工单完工 * 保外工单完工
*/ */
let outOrderFinish = async (params = {},orderId) => await vm.$u.post(prefix2+'/order/'+ orderId +'/v1/finishedAndConfirmOutGuaranteePeriod', params, formType); let outOrderFinish = async (params = {},orderId) => await vm.$u.post(prefix + vm.vuex_token+'/order/'+ orderId +'/v1/finishedAndConfirmOutGuaranteePeriod', params, formType);
/** /**
...@@ -151,21 +148,21 @@ let orderApiFun = function(vm){ ...@@ -151,21 +148,21 @@ let orderApiFun = function(vm){
/** /**
* 我的库存明细(物料) * 我的库存明细(物料)
*/ */
let listBystock= async () => await vm.$u.get(prefix2 +'/myinfo/stock', {}, jsonType); let listBystock= async () => await vm.$u.get(prefix + vm.vuex_token +'/myinfo/stock', {}, jsonType);
/** /**
* 我的出入库流水 * 我的出入库流水
*/ */
let listAccessHistory= async (params = {}) => await vm.$u.get(prefix2 +'/myinfo/access/history', params, jsonType); let listAccessHistory= async (params = {}) => await vm.$u.get(prefix + vm.vuex_token +'/myinfo/access/history', params, jsonType);
// 获取我的钱包-资产信息 // 获取我的钱包-资产信息
let getAssets = async (params = {}) => await vm.$u.get(settle + '/v2/total', params); let getAssets = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/v2/total', params);
// 获取我的钱包-师傅提现
let workerApplyPay = async (payableId) => await vm.$u.post(`/wxh-worker-rest/rest/${token}/applypay/${payableId}/workerApplyPay`);
// 获取我的钱包-结算账单
let payableRecord = async (params = {}) => await vm.$u.post(settle + '/payable/v2/queryPayableRecord', params, formType);
// 获取我的钱包-收入流水 // 获取我的钱包-收入流水
let listStatement = async (params = {}) => await vm.$u.get(settle + '/v2/statement', params); let listStatement = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/v2/statement', params);
// 获取我的钱包-支付单一览
let payableRecord = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params);
// 获取我的钱包-师傅提现
let workerApplyPay = async (payableId) => await vm.$u.post(`/wxh-worker-rest/rest/${vm.vuex_token}/applypay/${payableId}/workerApplyPay`);
const orderApi = { const orderApi = {
listByRecommendOrder, listByRecommendOrder,
listOrderCount, listOrderCount,
......
...@@ -17,6 +17,16 @@ ...@@ -17,6 +17,16 @@
type: String, type: String,
default: '请输入' default: '请输入'
}, },
item: {
type: Object,
default() {
return {}
}
},
type: {
type: String,
default: 'text'
}
// width: { // 例如:454rpx // width: { // 例如:454rpx
// type: String, // type: String,
// default: '100%' // default: '100%'
...@@ -24,32 +34,36 @@ ...@@ -24,32 +34,36 @@
}, },
data() { data() {
return { return {
maxlength: 140, inputType: 'text',
// type: 'text'
} }
}, },
computed: { computed: {
type() { // type() {
if (this.item) { // if (this.item) {
let ty = this.item.fieldsType.toLocaleLowerCase() // let ty = this.item.fieldsType.toLocaleLowerCase()
switch (ty) { // switch (ty) {
case 'text': // case 'text':
return 'textarea' // return 'textarea'
case 'password': // case 'password':
return this.item.fieldsType // return this.item.fieldsType
case 'decimal': // case 'decimal':
case 'number': // case 'number':
case 'double': // case 'double':
case 'integer': // case 'integer':
this.maxlength = 9 // this.maxlength = 9
return 'digit' // return 'digit'
case 'textarea': // case 'textarea':
default: // default:
return 'text' // return 'text'
} // }
} else { // } else {
return 'text' // return 'text'
} // }
// },
maxlength() {
return this.type == 'digit' ? 9 : 140
}, },
fieldsWidth() { fieldsWidth() {
return this.item.fieldsWidth ? (this.item.fieldsWidth + 'rpx') : '100%' return this.item.fieldsWidth ? (this.item.fieldsWidth + 'rpx') : '100%'
...@@ -71,7 +85,7 @@ ...@@ -71,7 +85,7 @@
return this.textarea return this.textarea
}, },
textarea() { textarea() {
return this.type == 'textarea' return this.inputType == 'textarea'
}, },
backgroundColor() { backgroundColor() {
return this.textarea ? 'transparent' : '#F4F5F7' return this.textarea ? 'transparent' : '#F4F5F7'
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view> <view>
<view class="list u-flex u-row-between"> <view class="list u-flex u-row-between">
<image class="item-image" :src="mixingImage" v-if="item.required"></image> <image class="item-image" :src="mixingImage" v-if="item.required"></image>
<view class="u-m-r-20">{{item.fieldsTitle}}</view> <view class="u-m-r-20 title-text">{{item.fieldsTitle}}</view>
<view class="u-flex-1 location-name" >{{valueTxt}}</view> <view class="u-flex-1 location-name" >{{valueTxt}}</view>
</view> </view>
</view> </view>
...@@ -55,13 +55,18 @@ ...@@ -55,13 +55,18 @@
line-height: 40rpx; line-height: 40rpx;
color: #fa3534; color: #fa3534;
} }
.title-text {
font-size: 26rpx;
color: #333333;
}
.item-image { .item-image {
width: 24rpx; width: 24rpx;
height: 24rpx; height: 24rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.location-name { .location-name {
color: #2272FF; color: #333333;
font-size: 26rpx;
text-align: right; text-align: right;
} }
.location { .location {
......
<!-- ******************* 输入框 ******************* --> <!-- ******************* 输入框 ******************* -->
<template> <template>
<view> <view>
<view class="list u-flex u-row-between"> <view class="list u-flex item-row-between">
<image class="item-image" :src="mixingImage" v-if="item.required"></image> <view class="item-title">
<view class="u-m-r-20">{{item.fieldsTitle}}</view> <image class="item-image" :src="mixingImage" v-if="item.required"></image>
<view class="u-flex-1 location-name" @click="toMaterialPage"> <view class="u-m-r-20">{{item.fieldsTitle}}</view>
<u-icon name="map" color="#2979ff" size="30"></u-icon>请选择 </view>
<view class="location-name" @click="toMaterialPage">
<text class="arrow-text">{{arrowText}}</text>
<u-icon name="arrow-right" color="#2979ff" size="30"></u-icon>
</view> </view>
</view> </view>
<!-- <view class="u-flex-1 location">{{valueTxt || '正在获取中...'}}</view> --> <!-- <view class="u-flex-1 location">{{valueTxt || '正在获取中...'}}</view> -->
...@@ -36,6 +39,9 @@ ...@@ -36,6 +39,9 @@
computed: { computed: {
mixingImage() { mixingImage() {
return process.uniEnv.qn_base_url + 'mixing.png' return process.uniEnv.qn_base_url + 'mixing.png'
},
arrowText() {
return false ? '已选择' : '请选择'
} }
}, },
watch: {}, watch: {},
...@@ -57,7 +63,7 @@ ...@@ -57,7 +63,7 @@
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
.required { .required {
padding-right: 10rpx; padding-right: 10rpx;
font-size: 28rpx; font-size: 28rpx;
...@@ -69,10 +75,29 @@ ...@@ -69,10 +75,29 @@
height: 24rpx; height: 24rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.location-name { .item-row-between {
color: #2272FF; display: flex;
text-align: right; align-items: center;
justify-content: space-between;
.item-title {
display: flex;
font-size: 26rpx;
color: #333333;
align-items: center;
}
.location-name {
color: #2272FF;
text-align: right;
font-size: 26rpx;
display: flex;
align-items: center;
.arrow-text {
margin-right: 6rpx;
}
}
} }
.location { .location {
background: #F4F5F7; background: #F4F5F7;
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<view class="line-view"></view> <view class="line-view"></view>
<view class="reason-view" v-if="showReason"> <view class="reason-view" v-if="showReason">
<view><text class="reason-title">未通过原因:</text></view> <view class="reason-title"><text>未通过原因:</text></view>
<view class="reason-text"><text v-for="(item, index) in orderData.auditResults" :key="index">{{item}}</text></view> <view class="reason-text"><text v-for="(item, index) in orderData.auditResults" :key="index">{{item}}</text></view>
</view> </view>
<view class="bottom-view"> <view class="bottom-view">
......
<template> <template>
<view> <view>
<view class="topView" :style="{'height':navHeight/2 + 'px'}"></view>
<view class="contentView"> <view class="contentView">
<!-- <u-image class="pic" :src="files[0]" bg-color="transparent" @click="showPreviewFn"></u-image> --> <!-- <u-image class="pic" :src="files[0]" bg-color="transparent" @click="showPreviewFn"></u-image> -->
<image class="pic" :src="files[0]" v-lazy mode="aspectFit" @click="showPreviewFn"></image> <image class="pic" :src="files[0]" v-lazy mode="aspectFit" @click="showPreviewFn"></image>
...@@ -29,12 +30,13 @@ ...@@ -29,12 +30,13 @@
keys: [], keys: [],
token: '', token: '',
product: '', product: '',
allImages: [] allImages: [],
navHeight: 130
} }
}, },
created(e) { created(e) {
// 获取照片选项对象 // 获取照片选项对象
console.log(getApp().globalData.photo.currentItem) this.navHeight = getApp().globalData.navHeight
const product = app.globalData.photo.product const product = app.globalData.photo.product
this.product = `?brandId=${product.brandId}&brand=${product.brandName}&classifyId=${product.classifyId}&systemId=${product.systemId}` this.product = `?brandId=${product.brandId}&brand=${product.brandName}&classifyId=${product.classifyId}&systemId=${product.systemId}`
if(app.globalData.photo.currentItem) { if(app.globalData.photo.currentItem) {
...@@ -73,17 +75,7 @@ ...@@ -73,17 +75,7 @@
}) })
} }
} }
// if(photo.currentItem){
// photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
// }
// if(photo.productList && photo.productList[photo.topIndex]){
// const topArr = photo.productList[photo.topIndex]
// if(topArr[photo.itemIndex]){
// topArr[photo.itemIndex].imageList.push(photo.tempPath.mixWater)
// }
// }
// photo.
if(photo.tempPath.mixWater){ if(photo.tempPath.mixWater){
// 保存水印处理图片到本地 // 保存水印处理图片到本地
path = photo.tempPath.mixWater path = photo.tempPath.mixWater
...@@ -122,6 +114,7 @@ ...@@ -122,6 +114,7 @@
}, },
finishPhoto(){ finishPhoto(){
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
if (photo.currentItemLength === 10) return
photo.currentItemLength = 10 photo.currentItemLength = 10
this.continuePhoto() this.continuePhoto()
// 完成本项 // 完成本项
...@@ -149,29 +142,18 @@ ...@@ -149,29 +142,18 @@
}else{ }else{
this.$emit('finish') this.$emit('finish')
} }
}, }
downloadImages() {
let self = this;
for (let url of this.images) {
uni.downloadFile({
url: url, //仅为示例,并非真实的资源
success(res) {
// 只要服务器有响应数据,就会把响应内容写入文件并进入 success 回调,业务需要自行判断是否下载到了想要的内容
if (res.statusCode === 200) {
self.files.push(res.tempFilePath)
}
},
fail(e) {
}
})
}
},
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.topView {
background: #000;
width: 100%;
position: fixed;
top: 0;
}
.contentView { .contentView {
background-color: #333333; background-color: #333333;
/* padding-top: 120rpx; */ /* padding-top: 120rpx; */
...@@ -181,7 +163,7 @@ ...@@ -181,7 +163,7 @@
flex-direction: column; flex-direction: column;
} }
/deep/ .u-image{ /deep/ .u-image{
height:100%!important; height:100% !important;
} }
/deep/ .u-image__loading{ /deep/ .u-image__loading{
background-color: transparent!important; background-color: transparent!important;
...@@ -192,8 +174,8 @@ ...@@ -192,8 +174,8 @@
.pic { .pic {
flex:1; flex:1;
width: 100%; width: 100%;
height: 100%;
/* height:auto */ // height:auto;
/* height: 760rpx; */ /* height: 760rpx; */
} }
......
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100vh;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
markImage: 'https://qn-static.banshouhui.com/live_mark.png' markImage: 'https://qn-static.banshouhui.com/live_mark.png'
}, },
tempImgs: { tempImgs: {
'markImage': '', // 拍照水印 'markImage': 'https://qn-static.banshouhui.com/live_mark.png', // 拍照水印
'origin': '', // 无水印照片 'origin': '', // 无水印照片
'mixWater': '', // 有水印照片 'mixWater': '', // 有水印照片
}, },
...@@ -206,10 +206,6 @@ ...@@ -206,10 +206,6 @@
}, },
updateTime() { updateTime() {
this.waterInfo.date = this.getTime() this.waterInfo.date = this.getTime()
// let timer = setTimeout(() => {
// clearTimeout(timer);
// this.updateTime()
// }, 1000)
}, },
setCameraInfo(type) { setCameraInfo(type) {
// 设置相机前置后置、闪关灯等 // 设置相机前置后置、闪关灯等
...@@ -261,7 +257,6 @@ ...@@ -261,7 +257,6 @@
const { const {
errMsg errMsg
} = e.detail } = e.detail
// console.log(e.detail, 'e.detail')
if (errMsg !== 'insertCamera:fail auth deny') { if (errMsg !== 'insertCamera:fail auth deny') {
return return
} }
...@@ -431,10 +426,10 @@ ...@@ -431,10 +426,10 @@
} }
canvas.fillText(title.substr(0, 14), 10, canvasHeight - txtHeight * h++ - titleHeight / 2 + 10); canvas.fillText(title.substr(0, 14), 10, canvasHeight - txtHeight * h++ - titleHeight / 2 + 10);
} }
if (this.waterSetting && this.waterSetting.mid_text) { // if (this.waterSetting && this.waterSetting.mid_text) {
//加入 水印图片 //加入 水印图片
canvas.drawImage(this.tempImgs.markImage, canvasWidth / 2 - 100, canvasHeight / 2 - 25, 200, 50) canvas.drawImage(this.tempImgs.markImage, canvasWidth / 2 - 100, canvasHeight / 2 - 25, 200, 50)
} // }
// canvas.drawImage(this.tempImgs.markImage, canvasWidth / 2 - 100, canvasHeight / 2 - 25, 200, 50) // canvas.drawImage(this.tempImgs.markImage, canvasWidth / 2 - 100, canvasHeight / 2 - 25, 200, 50)
canvas.draw(false, canvas.draw(false,
setTimeout(() => { setTimeout(() => {
......
...@@ -94,14 +94,14 @@ ...@@ -94,14 +94,14 @@
"path": "news-details", "path": "news-details",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle":"default" "navigationStyle":"custom"
} }
}, },
{ {
"path":"section", "path":"section",
"style" :{ "style" :{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle":"default" "navigationStyle":"custom"
} }
}, },
{ {
...@@ -221,6 +221,13 @@ ...@@ -221,6 +221,13 @@
} }
}, },
{ {
"path":"contract/out",
"style":{
"navigationBarTitleText":""
}
},
{
"path": "customer/index", "path": "customer/index",
"style": { "style": {
"navigationStyle":"custom", "navigationStyle":"custom",
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</view> </view>
<view class="bottomRightView"> <view class="bottomRightView">
<view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' " <view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' "
@click="handleClick()"> @click="$u.throttle(handleClick, 500)">
<text class="bottomTitle">{{bottomTitle}}</text> <text class="bottomTitle">{{bottomTitle}}</text>
</view> </view>
</view> </view>
......
This diff is collapsed.
This diff is collapsed.
<template> <template>
<view class="content"> <view class="content">
<u-navbar <u-navbar back-icon-color="#FFFFFF" :background="background" title-color="#fff" :border-bottom="false"></u-navbar>
back-icon-color="#FFFFFF"
:background="background"
title-color="#fff"
:border-bottom="false"
></u-navbar>
<view class="title">考试规则</view> <view class="title">考试规则</view>
<view class="test"> <view class="test">
<view class="slogan"> <view class="slogan">
这是一场严肃的考试,请认真查看 规则,预祝您顺利通过考试! 这是一场严肃的考试,请认真查看 规则,预祝您顺利通过考试!
</view> </view>
<view class="text"> <view class="text">
<text class="left">考试科目:</text <text class="left">考试科目:</text><text style="color: #007aff">{{ desc.title }}</text>
><text style="color: #007aff">{{ desc.title }}</text>
</view> </view>
<view class="text"> <view class="text">
<text class="left">合格条件:</text><text>{{ desc.score }}</text> <text class="left">合格条件:</text><text>{{ desc.score }}</text>
...@@ -22,7 +16,7 @@ ...@@ -22,7 +16,7 @@
<text class="left">考试时间:</text><text>{{ desc.time }}</text> <text class="left">考试时间:</text><text>{{ desc.time }}</text>
</view> </view>
<view class="text"> <view class="text">
<text class="left">题目来源:</text><text>系统随机{{ desc.number }}题</text> <text class="left">题目来源:</text><text>{{ ruleDisc }}</text>
</view> </view>
<button @click="getUserExamId()">开始考试</button> <button @click="getUserExamId()">开始考试</button>
</view> </view>
...@@ -31,66 +25,66 @@ ...@@ -31,66 +25,66 @@
<script> <script>
let condition = { let condition = {
"dev": { dev: {
"id-2": { "id-2": {
"score": "60分", score: "60分",
"time": "30分钟", time: "30分钟",
"number": "20", number: "20",
"title": "服务规范" title: "服务规范",
}, },
"id-3": { "id-3": {
"score": "30分", score: "30分",
"time": "15分钟", time: "15分钟",
"number": "10", number: "10",
"title": "服务规范" title: "服务规范",
}, },
"id-4": { "id-4": {
"score": "15分", score: "15分",
"time": "6分钟", time: "6分钟",
"number": "4", number: "4",
"title": "交付规范" title: "交付规范",
} },
}, },
"test": { test: {
"id-2": { "id-2": {
"score": "60分", score: "60分",
"time": "30分钟", time: "30分钟",
"number": "20", number: "20",
"title": "服务规范" title: "服务规范",
}, },
"id-3": { "id-3": {
"score": "30分", score: "30分",
"time": "15分钟", time: "15分钟",
"number": "10", number: "10",
"title": "服务规范" title: "服务规范",
}, },
"id-4": { "id-4": {
"score": "15分", score: "15分",
"time": "6分钟", time: "6分钟",
"number": "4", number: "4",
"title": "交付规范" title: "交付规范",
} },
}, },
"prod": { prod: {
"id-2": { "id-2": {
"score": "60分", score: "60分",
"time": "30分钟", time: "30分钟",
"number": "20", number: "20",
"title": "服务规范" title: "服务规范",
}, },
"id-3": { "id-3": {
"score": "30分", score: "30分",
"time": "15分钟", time: "15分钟",
"number": "10", number: "10",
"title": "服务规范" title: "服务规范",
}, },
"id-4": { "id-4": {
"score": "15分", score: "15分",
"time": "6分钟", time: "6分钟",
"number": "4", number: "4",
"title": "交付规范" title: "交付规范",
} },
} },
}; };
let env = process.uniEnv.node_env; let env = process.uniEnv.node_env;
let desc = condition[env]; let desc = condition[env];
...@@ -102,11 +96,13 @@ export default { ...@@ -102,11 +96,13 @@ export default {
examId: null, examId: null,
exam: null, exam: null,
userExamId: null, userExamId: null,
ruleDisc: "",
}; };
}, },
onLoad(param) { onLoad(param) {
this.examId = param.examId this.examId = param.examId;
this.desc = desc["id-" + this.examId] this.desc = desc["id-" + this.examId];
this.getExamResult();
// this.getUserExamInfo(); // this.getUserExamInfo();
}, },
methods: { methods: {
...@@ -119,33 +115,58 @@ export default { ...@@ -119,33 +115,58 @@ export default {
}, },
getUserExamInfo() { getUserExamInfo() {
uni.request({ uni.request({
url: url:
process.uniEnv.systemUrl.apiUrl + process.uniEnv.systemUrl.apiUrl +
"/wxh-worker-rest/rest/exam/serviceRule/" + "/wxh-worker-rest/rest/exam/serviceRule/" +
this.vuex_token + this.vuex_token +
"?examId=" + "?examId=" +
this.examId, this.examId,
method: "POST", method: "POST",
header: { header: {
"Content-Type": "application/x-www-from-urlencoded", "Content-Type": "application/x-www-from-urlencoded",
}, },
success: (res) => { success: (res) => {
console.log("标识符1", res.data); console.log("标识符1", res.data);
uni.hideLoading(); uni.hideLoading();
if (res.data.code == 200) { if (res.data.code == 200) {
if (res.data.data.userExamId) { if (res.data.data.userExamId) {
this.userExamId = res.data.data.userExamId; this.userExamId = res.data.data.userExamId;
console.log("这个是个标识符", this.userExamId); console.log("这个是个标识符", this.userExamId);
} }
} }
}, },
}); });
setTimeout(() => { setTimeout(() => {
wx.navigateTo({ wx.navigateTo({
url: "/pages/learn/answer?userExamId=" + this.userExamId, url: "/pages/learn/answer?userExamId=" + this.userExamId,
}); });
}, 1000); }, 1000);
},
getExamResult() {
uni.request({
url:
process.uniEnv.systemUrl.apiUrl +
"/wxh-worker-rest/rest/exam/serviceRule/userExamInfo/" +
this.vuex_token +
"?examId=" +
this.examId,
method: "POST",
header: {
"Content-Type": "application/x-www-from-urlencoded",
},
success: (res) => {
uni.hideLoading();
if (res.data.code == 200) {
if (res.data.data.ruleDisc) {
console.log(res.data.data.ruleDisc);
var str = res.data.data.ruleDisc;
console.log(str.substring(0, 11));
this.ruleDisc = str.substring(0, 11);
}
}
},
});
}, },
}, },
}; };
......
<template> <template>
<view> <view>
<u-navbar
back-icon-color="#000000"
:background="background"
title-color="#000000"
:border-bottom="false">
</u-navbar>
<view class="title"> <view class="title">
{{ title }} {{ title }}
</view> </view>
...@@ -25,7 +31,7 @@ ...@@ -25,7 +31,7 @@
that.body = data.body; that.body = data.body;
}) })
this.$u.mpShare.path = '' this.$u.mpShare.path = ''
}, },
} }
</script> </script>
......
<template> <template>
<view class=""> <view class="">
<view class="learn-vedio" v-if="isShowVideo"> <view class="learn-vedio" v-if="isShowVideo">
<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 class="uni-padding-wrap uni-common-mt">
<view><video object-fit="cover" class="course-video" id="courseVideo" :src="courseSrc" <view><video object-fit="cover" class="course-video" id="courseVideo" :src="courseSrc"
:options="playerOptions" :playsinline="true" @play="playCourse" @error="videoErrorCallback" :options="playerOptions" :playsinline="true" @play="playCourse" @error="videoErrorCallback"
...@@ -137,9 +143,9 @@ ...@@ -137,9 +143,9 @@
}, },
gklog: '', gklog: '',
videoTotalTime: 0, videoTotalTime: 0,
howTimeToUpdateLearnedStatus: 5, //设置几秒提交一次状态 howTimeToUpdateLearnedStatus: 10, //设置几秒提交一次状态
status: 1, //是否已学习默认1已学习 status: 1, //是否已学习默认1已学习
howLongIsLearned: this.videoTotalTime / 2, //默认设置观看1/2就是已学 isLearned: false, //默认设置观看1/2就是已学
}; };
}, },
computed: { computed: {
...@@ -185,19 +191,21 @@ ...@@ -185,19 +191,21 @@
this.videoContext = uni.createVideoContext("courseVideo"); this.videoContext = uni.createVideoContext("courseVideo");
// #endif // #endif
}, },
onUnload() {
wx.reLaunch({
url: '/pages/index/learn?tabs=2'
});
},
methods: { methods: {
goNext(info) { goNext(info) {
uni.navigateTo({ uni.navigateTo({
url: "./section?section_id=" + info.id + "&course_id=" + info.course_id url: "/pages/learn/section?section_id=" + info.id + "&course_id=" + info.course_id
}); });
}, },
onPlayerTimeupdate(player) { onPlayerTimeupdate(player) {
console.log('-----onplay----');
console.log(player);
let intCurrentTime = parseInt(player.detail.currentTime); let intCurrentTime = parseInt(player.detail.currentTime);
this.updateLearnedStatus(intCurrentTime); this.updateLearnedStatus(intCurrentTime);
this.gklog = intCurrentTime; this.gklog = intCurrentTime;
console.log(' onPlayerTimeupdate!', this.gklog)
}, },
videoErrorCallback: function(e) { videoErrorCallback: function(e) {
uni.showModal({ uni.showModal({
...@@ -220,7 +228,6 @@ ...@@ -220,7 +228,6 @@
} }
}, },
playerReadied(player) { playerReadied(player) {
console.log('i go to playerReadied gklog:' + this.gklog)
player.currentTime(this.gklog) player.currentTime(this.gklog)
}, },
getCourseSection(param) { getCourseSection(param) {
...@@ -240,7 +247,7 @@ ...@@ -240,7 +247,7 @@
this.section_content = res.data.content; this.section_content = res.data.content;
this.teacher.name = res.data.teachers[0].name; this.teacher.name = res.data.teachers[0].name;
this.teacherImage = res.data.teachers[0].avatar; this.teacherImage = res.data.teachers[0].avatar;
this.teacherIntro = res.data.teachers[0].intro.replace(/<p.*?>|<\/p>/ig, ""); this.teacherIntro = res.data.teachers[0].intro.replace(/<.*?>|<\/.*?>/ig, "");
this.params.course_id = res.data.course_id; this.params.course_id = res.data.course_id;
if (this.isShowVideo) { if (this.isShowVideo) {
let coureWareList = res.data.courseware; let coureWareList = res.data.courseware;
...@@ -254,8 +261,6 @@ ...@@ -254,8 +261,6 @@
} }
}) })
.catch((err) => { .catch((err) => {
console.log('--------settttt---------');
console.log(err);
uni.showToast({ uni.showToast({
title: err, title: err,
icon: "none", icon: "none",
...@@ -272,10 +277,7 @@ ...@@ -272,10 +277,7 @@
status: 1, status: 1,
}; };
this.$u.api.updateLearnCourses(param).then((res) => { this.$u.api.updateLearnCourses(param).then((res) => {
// console.log('--' + this.howTimeToUpdateLearnedStatus + '更新一次观看状态--time:' + nowTime);
}).catch((err) => { }).catch((err) => {
console.log('--------updateLearnedStatusForText---------');
console.log(err);
uni.showToast({ uni.showToast({
title: err, title: err,
icon: "none", icon: "none",
...@@ -284,11 +286,13 @@ ...@@ -284,11 +286,13 @@
}, },
updateLearnedStatus(nowTime) { updateLearnedStatus(nowTime) {
if (this.gklog != nowTime && nowTime % this.howTimeToUpdateLearnedStatus == 0) { if (this.gklog != nowTime && nowTime % this.howTimeToUpdateLearnedStatus == 0) {
if (nowTime < this.howLongIsLearned) { let howLongIsLearned = parseInt(this.videoTotalTime / 2);
if (nowTime < howLongIsLearned) {
this.status = 0; this.status = 0;
} else if(this.isLearned){
return;
} else { } else {
this.status = 1; this.status = 1;
console.log('--大于规定时间标记为已学习--');
} }
let param = { let param = {
...@@ -297,20 +301,13 @@ ...@@ -297,20 +301,13 @@
status: this.status, status: this.status,
}; };
this.$u.api.updateLearnCourses(param).then((res) => { this.$u.api.updateLearnCourses(param).then((res) => {
console.log('--' + this.howTimeToUpdateLearnedStatus + '更新一次观看状态--time:' + nowTime);
}).catch((err) => { }).catch((err) => {
console.log('--------updateLearnedStatus---------');
console.log(err); console.log(err);
uni.showToast({
title: err,
icon: "none",
});
}); });
} }
}, },
//获取章节详情 //获取章节详情
getCapterDetails() { getCapterDetails() {
console.log('获取章节详情')
this.$u.api this.$u.api
.ChapterDetails(this.params) .ChapterDetails(this.params)
.then((res) => { .then((res) => {
...@@ -325,8 +322,6 @@ ...@@ -325,8 +322,6 @@
this.list[i].isActive = this.active_section_id == this.list[i].id ? true : this.list[i].isActive = this.active_section_id == this.list[i].id ? true :
false; false;
} }
console.log('--select-list--')
console.log(this.list)
} }
} else { } else {
//接口请求失败的处理 //接口请求失败的处理
...@@ -493,7 +488,7 @@ ...@@ -493,7 +488,7 @@
} }
.color-teacher { .color-teacher {
color: #999999; color: #000000;
} }
.catalogue { .catalogue {
......
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
></u-navbar> ></u-navbar>
<view class="content"> <view class="content">
<text class="title">合同清单</text> <text class="title">合同清单</text>
<view class="jf-currency-class" v-for="item in res" :key="item.id"> <view
class="jf-currency-class"
v-for="item in res"
:key="item.id"
@click="goBaidu(item.url)"
>
<view class="left">{{ item.name }}</view> <view class="left">{{ item.name }}</view>
<view class="text1">《{{ item.name }}》</view> <view class="text1">《{{ item.name }}》</view>
<view class="text2">下载时间: {{ item.create_at }}</view> <view class="text2">下载时间: {{ item.create_at }}</view>
</view> </view>
<!-- <view class="jf-currency-class">
<view class="left">新风机技工入驻签约合同</view>
<view class="text1">《新风机技工入驻签约合同》</view>
<view class="text2">下载时间: 2021.05.06 15:01:48</view>
</view> -->
</view> </view>
</view> </view>
</template> </template>
...@@ -28,14 +28,6 @@ export default { ...@@ -28,14 +28,6 @@ export default {
return { return {
background: { background: {
backgroundColor: "#F4F5F7", backgroundColor: "#F4F5F7",
// 导航栏背景图
// background: 'url(https://cdn.uviewui.com/uview/swiper/1.jpg) no-repeat',
// 还可以设置背景图size属性
// backgroundSize: 'cover',
// 渐变色
// backgroundImage: 'linear-gradient(45deg, rgb(28, 187, 180), rgb(141, 198, 63))'
}, },
res: [], res: [],
type: "充电桩", type: "充电桩",
...@@ -52,50 +44,37 @@ export default { ...@@ -52,50 +44,37 @@ export default {
if (res.data) { if (res.data) {
let length = res.data.length; let length = res.data.length;
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
var re = /[^\u4e00-\u9fa5]/gi;
// res.data.name = res.data.name.replace(re, "");
let data = new Date( let data = new Date(
Number(res.data[i].create_at) * 1000 Number(res.data[i].create_at) * 1000
); );
res.data[i].create_at = moment(data).format( res.data[i].create_at = moment(data).format(
"yyyy.MM.DD HH:mm:ss" "yyyy.MM.DD HH:mm:ss"
); );
res.data[i].name = res.data[i].name.replace(re, "");
} }
this.res = this.res.concat(res.data); this.res = this.res.concat(res.data);
console.log(this.res); console.log(this.res);
} }
} else { } else {
console.log(res.code); //接口请求失败的处理
uni.showToast({
title: res.message,
icon: "none",
});
} }
}); });
}, },
add0(m) { goBaidu(a) {
return m < 10 ? "0" + m : m; getApp().globalData.contractUrl = a;
wx.navigateTo({
url: "./out",
success: function () {}, //成功回调
fail: function () {},
complete: function () {},
});
}, },
// format(shijianchuo) {
// //shijianchuo是整数,否则要parseInt转换
// var time = new Date(shijianchuo * 1000);
// var y = time.getFullYear();
// var m = time.getMonth() + 1;
// var d = time.getDate();
// var h = time.getHours();
// var mm = time.getMinutes();
// var s = time.getSeconds();
// return (
// y +
// "." +
// this.add0(m) +
// "." +
// this.add0(d) +
// " " +
// this.add0(h) +
// ":" +
// this.add0(mm) +
// ":" +
// this.add0(s)
// );
// // },
// gettime(time) {
// moment(new Date(time).format("yyyy.MM.DD HH:mm:ss"));
// },
}, },
}; };
</script> </script>
...@@ -122,7 +101,6 @@ export default { ...@@ -122,7 +101,6 @@ export default {
} }
.jf-currency-class { .jf-currency-class {
width: 100%; width: 100%;
height: 180rpx;
border-radius: 12rpx; border-radius: 12rpx;
padding-top: 40rpx; padding-top: 40rpx;
margin-top: 74rpx; margin-top: 74rpx;
......
<template>
<view>
<web-view :src="url"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
url: "",
};
},
onLoad(option) {
this.url = option.url;
var app = getApp();
this.url = app.globalData.contractUrl;
console.log(app.globalData, "这是个标识符");
},
methods: {},
};
</script>
<style>
</style>
\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check> <complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check>
<view class="u-wrap"> <view class="u-wrap">
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar> <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar>
<u-tabs-swiper class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs-swiper> <u-tabs class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
<view class="u-menu-wrap"> <view class="u-menu-wrap">
<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" :scroll-into-view="itemId" v-if="list[tabIndex].items.length > 1"> <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" :scroll-into-view="itemId" v-if="list[tabIndex].items.length > 1">
<view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item" <view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item"
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
{{item.fieldsTitle}} {{item.fieldsTitle}}
</view> </view>
<template v-if="item.fieldsType"> <template v-if="item.fieldsType">
<xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex" <xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex" :type="inputType(item.fieldsType)"
:itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' @value-change="fieldValueChange"> :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' @value-change="fieldValueChange">
</xh-input> </xh-input>
<xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'" <xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'"
...@@ -487,6 +487,30 @@ ...@@ -487,6 +487,30 @@
}) })
} }
}, },
inputType(type) {
var inputType = ''
let ty = type.toLocaleLowerCase()
switch (ty) {
case 'text':
inputType = 'textarea'
break
case 'password':
inputType = ty
break
case 'decimal':
case 'number':
case 'double':
case 'integer':
inputType = 'digit'
break
case 'textarea':
default:
inputType = 'text'
break
}
return inputType
},
typeToComponentType(type) { typeToComponentType(type) {
// 将fieldType类型统一转换为公共组件判定类型 // 将fieldType类型统一转换为公共组件判定类型
let formType = '' let formType = ''
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<view class="line-view"></view> <view class="line-view"></view>
<u-tr class="u-tr" v-for="(item, index) in list" :key="index"> <u-tr class="u-tr" v-for="(item, index) in list" :key="index">
<u-td class="u-td" v-for="(value, key) in titles" :key="key"> <u-td class="u-td" v-for="(value, key) in titles" :key="key">
<text :class="['tab-th-txt', {'left': key == firstKey}]">{{item[key]}}</text> <u-input v-if="key == 'useLength'" @blur="handleBlur(item)" @focus="handleFocus(item)" type="digit" :placeholder="null" v-model="item[key]" placeholder-style="color: #999999;font-size:26rpx" input-align="center" :clearable="false"><u-icon name="edit"></u-icon></u-input>
<text v-else :class="['tab-th-txt', {'left': key == firstKey}]">{{item[key]}}</text>
</u-td> </u-td>
</u-tr> </u-tr>
</u-table> </u-table>
...@@ -80,22 +81,12 @@ ...@@ -80,22 +81,12 @@
}; };
}, },
titles() { titles() {
if(this.isMaterial){ return {
return { matName: this.isMaterial ? '工艺名称' : '材料名称',
matName: '材料名称', matUnit: '单位',
matUnit: '单位', freeLength: '免费量',
freeLength: '免费量', unitAmt: '单价/元',
unitAmt: '单价/元', useLength: '用量'
useLength: '用量'
}
}else{
return {
matName: '工艺名称',
matUnit: '单位',
freeLength: '免费量',
unitAmt: '单价/元',
useLength: '用量'
}
} }
}, },
thStyle() { thStyle() {
...@@ -148,6 +139,15 @@ ...@@ -148,6 +139,15 @@
self.formatServiceMoreList(data) self.formatServiceMoreList(data)
} }
}); });
/*
// 测试数据
var item = {matName: '碳纤维',
matUnit: '米',
freeLength: 4,
unitAmt: '2',
useLength: 6}
this.list = [{...item}, {...item}, {...item}, {...item}]
*/
}, },
created() { created() {
}, },
...@@ -174,6 +174,16 @@ ...@@ -174,6 +174,16 @@
} }
}) })
}, },
handleBlur(item) { // 失去焦点如果没输入用原先的值
if (!item.useLength) {
item.useLength = item.temp
}
},
handleFocus(item) { // 点击清空
item.temp = item.useLength;
item.useLength = ''
},
/* 其他添加新的 */ /* 其他添加新的 */
handleAdd() { handleAdd() {
this.other.push({ this.other.push({
......
This diff is collapsed.
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