Commit c1743b6b authored by 刘用法's avatar 刘用法
parents 3d99afba ee3fb5c7
import util from '@/utils/util.js' import util from '@/utils/util.js'
const jsonType = {'content-type': 'application/json'} const jsonType = {'content-type': 'application/json'}
const formType = {'content-type': 'application/x-www-form-urlencoded'} const formType = {'content-type': 'application/x-www-form-urlencoded'}
const dataType = {'content-type': 'multipart/form-data'}
let orderApiFun = function(vm){ let orderApiFun = function(vm){
// 接口公共前缀 // 接口公共前缀
...@@ -47,7 +48,7 @@ let orderApiFun = function(vm){ ...@@ -47,7 +48,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(prefix + vm.vuex_token + `/order/${orderId}/workerReject/V2`, params) let rejectOrder = async (params = {}, orderId) => await vm.$u.post(prefix + vm.vuex_token + `/order/${orderId}/workerReject/V2`, params, formType)
/** /**
...@@ -161,7 +162,7 @@ let orderApiFun = function(vm){ ...@@ -161,7 +162,7 @@ let orderApiFun = function(vm){
// 获取我的钱包-支付单一览 // 获取我的钱包-支付单一览
let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params, formType); let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params, formType);
// 获取我的钱包-师傅提现 // 获取我的钱包-师傅提现
let workerApplyPay = async (payableId) => await vm.$u.post(`/wxh-worker-rest/rest/${vm.vuex_token}/applypay/${payableId}/workerApplyPay`); let workerApplyPay = async (payableId) => await vm.$u.post(`/wxh-worker-rest/rest/${vm.vuex_token}/applypay/${payableId}/workerApplyPay`, {}, dataType);
const orderApi = { const orderApi = {
listByRecommendOrder, listByRecommendOrder,
......
...@@ -2,50 +2,6 @@ import {apiFun} from '@/common/api/index.js'; ...@@ -2,50 +2,6 @@ import {apiFun} from '@/common/api/index.js';
import { import {
cloudRulesApiFun cloudRulesApiFun
} from "@/common/api/cloud_rules.js" } from "@/common/api/cloud_rules.js"
// const upload = async function(path, params = {}, vm) {
// return new Promise((resolve, reject) => {
// uni.showLoading({
// mask: true,
// title: '上传中'
// });
// let data = {
// url: vm.vuex_config.upload.uploadurl,
// filePath: path,
// header: {
// token: vm.vuex_token || '',
// uid: vm.vuex_user.id || 0
// },
// name: 'file',
// fileType:'image',
// complete: function() {
// uni.hideLoading();
// },
// success: uploadFileRes => {
// try {
// var res = uploadFileRes.data;
// if (vm.$u.test.jsonString(res)) {
// resolve(JSON.parse(res).data)
// }
// if (vm.$u.test.object(res)) {
// resolve(res.data)
// }
// } catch (e) {
// reject(uploadFileRes.data);
// }
// },
// fail: (e) => {
// reject(e);
// }
// };
// let isObj = vm.$u.test.object(vm.vuex_config.upload.multipart);
// if (isObj) {
// data.formData = vm.vuex_config.upload.multipart;
// }
// uni.uploadFile(data);
// })
// }
const install = (Vue, vm) => { const install = (Vue, vm) => {
let apiUrls = apiFun(vm) let apiUrls = apiFun(vm)
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</view> </view>
<u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet> <u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet>
</view> </view>
<take-photo v-if="takeStatus" @close="closeTake" :currentItem="currentItemDate"></take-photo> <take-photo v-if="takeStatus" @close="closeTake" :upload="false" :currentItem="currentItemDate"></take-photo>
</view> </view>
</template> </template>
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
import arrMixin from './arrMixin' import arrMixin from './arrMixin'
import baseFile from '@/components/upload/index'; import baseFile from '@/components/upload/index';
import takePhoto from '@/components/take/index.vue' import takePhoto from '@/components/take/index.vue'
import uploader from '@/plugins/uploader/index.js'
export default { export default {
name: 'XhFiles', name: 'XhFiles',
components: { components: {
...@@ -132,10 +134,30 @@ ...@@ -132,10 +134,30 @@
val.forEach(item=>{ val.forEach(item=>{
this.imgList.push(item) this.imgList.push(item)
}) })
this.setValue() const files = val.map(v => {
return { path: v.path }
})
this.uploadTakeImg(files)
// this.setValue()
} }
this.takeStatus = false this.takeStatus = false
}, },
uploadTakeImg(files) {
const options = {
files:files, // 必填 临时文件路径 格式: [{path: "图片地址"}]
load: false, //(默认 true 说明:本接口是否提示加载动画)
maxSize: 300000, //(默认 无 说明:上传的文件最大字节数限制,默认不限制)
onEachUpdate: res => {
console.log("上传成功返回:",res);
const value = [uploader.qiniuTokenObj.visitPrefix + res.url]
this.valueChange(value)
},
Update: res => {
console.log("上传进度返回:",res);
}
}
uploader.qnFileUpload(options)
},
prviewImage(item, index) { prviewImage(item, index) {
uni.previewImage({ uni.previewImage({
urls: [item.path ? item.path : item.src], urls: [item.path ? item.path : item.src],
......
...@@ -216,7 +216,6 @@ ...@@ -216,7 +216,6 @@
} }
}, },
created() { created() {
console.log('+++++++++++')
/* /*
orderStatus: orderStatus:
待接单 orderStatus<31 工单状态小于31 待接单 orderStatus<31 工单状态小于31
...@@ -252,7 +251,6 @@ ...@@ -252,7 +251,6 @@
} }
this.timeout = this.orderData.currentOverTime < new Date().getTime() this.timeout = this.orderData.currentOverTime < new Date().getTime()
this.timestamp = Math.round(Math.abs(this.orderData.currentOverTime - new Date().getTime()) / 1000) this.timestamp = Math.round(Math.abs(this.orderData.currentOverTime - new Date().getTime()) / 1000)
console.log('++++++', this.timestamp)
}, },
methods: { methods: {
handleClick() { handleClick() {
......
...@@ -17,7 +17,14 @@ ...@@ -17,7 +17,14 @@
import qiniup from '@/components/upload/qiniup'; import qiniup from '@/components/upload/qiniup';
const app = getApp() const app = getApp()
export default { export default {
props: {}, props: {
upload: { // 是否默认上传 true:会自动上传好图片并返回绝对路径 false: 只返回临时路径,需要在父组件做上传动作
type: Boolean,
default () {
return true
}
}
},
mixins: [qiniup], mixins: [qiniup],
data() { data() {
return { return {
...@@ -128,7 +135,13 @@ ...@@ -128,7 +135,13 @@
title:'图片保存中…' title:'图片保存中…'
}) })
self.saveTempToLocal() self.saveTempToLocal()
if (this.upload) {
self.confirmUpload(true) self.confirmUpload(true)
} else {
this.submitFile()
}
}, },
submitFile() { submitFile() {
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
...@@ -138,8 +151,9 @@ ...@@ -138,8 +151,9 @@
// 拍照项张数目增加 等于10张 // 拍照项张数目增加 等于10张
photo.allImages.unshift( photo.allImages.unshift(
{ {
key: photo.tempPath.mixWater, path: photo.tempPath.mixWater,
src: this.fileMaps[0].key src: photo.tempPath.mixWater,
key: this.fileMaps[0] ? this.fileMaps[0].key : '',
} }
) )
if(photo.currentItemLength<10){ if(photo.currentItemLength<10){
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</view> </view>
</view> </view>
</view> </view>
<photo-preview v-if="showType === 2" @changeType="changeType" @finish="finish" /> <photo-preview v-if="showType === 2" @changeType="changeType" @finish="finish" :upload="upload" />
<photo-setting v-if="showType === 3" @changeType="changeType" @changeWatermark="changeWatermark"/> <photo-setting v-if="showType === 3" @changeType="changeType" @changeWatermark="changeWatermark"/>
</view> </view>
</template> </template>
...@@ -65,6 +65,12 @@ ...@@ -65,6 +65,12 @@
main_point: [] // 要点 main_point: [] // 要点
} }
} }
},
upload: { // 是否默认上传 true:会自动上传好图片并返回绝对路径 false: 只返回临时路径,需要在父组件做上传动作
type: Boolean,
default () {
return true
}
} }
}, },
components: { components: {
...@@ -103,7 +109,7 @@ ...@@ -103,7 +109,7 @@
cameraChange: false, cameraChange: false,
waterSetting: null, waterSetting: null,
shadowInitShow: false, // 第一次进入页面需显示弹窗 shadowInitShow: false, // 第一次进入页面需显示弹窗
standardStatus: false // 是否显示拍照要求 standardStatus: false, // 是否显示拍照要求
} }
}, },
created(e) { created(e) {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
该组件仅用于拍照后返回图片,与业务不关联,目前最多一次可以拍10张图片 该组件仅用于拍照后返回图片,与业务不关联,目前最多一次可以拍10张图片
``` ```
### 因为相机组件需要全屏展示,所以加载该组件需要在当前页面隐藏顶部导航栏,底部的TabBar以及其他页面元素 ### 因为相机组件需要全屏展示,所以加载该组件需要在当前页面隐藏顶部导航栏,底部的TabBar
``` ```
uni.hideTabBar() uni.hideTabBar()
``` ```
...@@ -17,6 +17,7 @@ uni.hideTabBar() ...@@ -17,6 +17,7 @@ uni.hideTabBar()
### Props ### Props
| 属性名 | 类型 | 默认值 | 可选值 | 说明 | | 属性名 | 类型 | 默认值 | 可选值 | 说明 |
| :-: | :-: | :-: | :-: | :-: | | :-: | :-: | :-: | :-: | :-: |
| update | Boolean | true | true/false | 是否默认上传 true:会自动上传好图片并返回绝对路径 false: 只返回临时路径,需要在父组件做上传动作 |
| currentItem | Object | - | - | 对应的规范数据,用于获取示意图和水印,以及保存图片所需的ID **格式见下文** | | currentItem | Object | - | - | 对应的规范数据,用于获取示意图和水印,以及保存图片所需的ID **格式见下文** |
### currentItem 格式 ### currentItem 格式
......
...@@ -185,11 +185,9 @@ ...@@ -185,11 +185,9 @@
this.initSettleInfo(); this.initSettleInfo();
}, },
handleClick(orderId) { // 点击了cell handleClick(orderId) { // 点击了cell
console.log('点击了cell')
this.viewOderItem(orderId) this.viewOderItem(orderId)
}, },
handleAction(orderId) { // 点击了按钮 handleAction(orderId) { // 点击了按钮
console.log('点击了按钮')
this.viewOderItem(orderId) this.viewOderItem(orderId)
}, },
viewOderItem(orderId) { // 跳转工单详情页面 viewOderItem(orderId) { // 跳转工单详情页面
...@@ -333,7 +331,6 @@ ...@@ -333,7 +331,6 @@
var self = this; // 加载订单列表 var self = this; // 加载订单列表
self.$u.api.listOrderCount().then((res) => { self.$u.api.listOrderCount().then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log("===", res.data)
if (res.data) { if (res.data) {
var count = 0 var count = 0
for (var i in res.data) { for (var i in res.data) {
......
...@@ -202,7 +202,6 @@ ...@@ -202,7 +202,6 @@
}, },
reachBottom(e) { reachBottom(e) {
console.log('-------底部-------', this.loadStatus)
if (this.loadStatus != 'loadmore') return if (this.loadStatus != 'loadmore') return
this.loadStatus == 'loading' this.loadStatus == 'loading'
this.getOrderList(this.currentIndex) this.getOrderList(this.currentIndex)
...@@ -247,7 +246,6 @@ ...@@ -247,7 +246,6 @@
var self = this; // 加载订单列表 var self = this; // 加载订单列表
self.$u.api.listOrderCount().then((res) => { self.$u.api.listOrderCount().then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log("===", res.data)
if (res.data) { if (res.data) {
self.list.forEach(item => { self.list.forEach(item => {
if (item.name === '待预约') { if (item.name === '待预约') {
...@@ -293,7 +291,6 @@ ...@@ -293,7 +291,6 @@
this.filish(item) this.filish(item)
return return
} }
console.log('click cell')
this.viewOderItem(item.orderId) this.viewOderItem(item.orderId)
}, },
filish(item){ filish(item){
...@@ -307,7 +304,6 @@ ...@@ -307,7 +304,6 @@
}) })
}, },
handleAction(item) { handleAction(item) {
console.log('click button')
if(item.orderStatus===86 || item.orderStatus===88){ if(item.orderStatus===86 || item.orderStatus===88){
this.filish(item) this.filish(item)
return return
......
...@@ -264,12 +264,6 @@ ...@@ -264,12 +264,6 @@
if (res.code == 200) { if (res.code == 200) {
self.list = res.data.config self.list = res.data.config
self.form = res.data.value || {} self.form = res.data.value || {}
uni.showLoading({
title: '加载中'
})
setTimeout(() => {
uni.hideLoading()
}, 1000)
// 异常单处理 // 异常单处理
if (self.auditResultsId) self.checkCompleteError() if (self.auditResultsId) self.checkCompleteError()
} else { } else {
......
...@@ -237,7 +237,6 @@ ...@@ -237,7 +237,6 @@
}, },
onLoad(option) { onLoad(option) {
// 生命周期函数--监听页面加载 // 生命周期函数--监听页面加载
console.log("option", option)
if (option && option.id) { if (option && option.id) {
this.orderId = option.id this.orderId = option.id
} }
...@@ -306,7 +305,6 @@ ...@@ -306,7 +305,6 @@
// } // }
// , // ,
// complete: function(res) { // complete: function(res) {
// console.log('-------complete-----', res)
// if (res.errMsg.indexOf('auth') != -1) { // if (res.errMsg.indexOf('auth') != -1) {
// uni.showModal({ // uni.showModal({
// title: '提示', // title: '提示',
...@@ -348,13 +346,7 @@ ...@@ -348,13 +346,7 @@
let self = this let self = this
var data={} var data={}
if(this.submitType === "workerAppointment"){ if(this.submitType === "workerAppointment"){
self.$u.api.contactTime(data,this.order.orderId).then((res)=>{ self.$u.api.contactTime(data,this.order.orderId)
if (res.code == 200) {
console.log("===", res.data)
} else {
console.log(res.message);
}
})
} }
}, },
handleClickRight(active) { handleClickRight(active) {
...@@ -371,7 +363,6 @@ ...@@ -371,7 +363,6 @@
this.takeStatus = true this.takeStatus = true
}, },
closeTake(img) { closeTake(img) {
console.log("image",img)
this.takeStatus = false this.takeStatus = false
// 获取返回的图片 ,如果返回的图片存在则直接异常签约,成功后跳转到去完工页面, // 获取返回的图片 ,如果返回的图片存在则直接异常签约,成功后跳转到去完工页面,
if(img){ // 拍照完成 if(img){ // 拍照完成
...@@ -444,7 +435,6 @@ ...@@ -444,7 +435,6 @@
}, },
weekChange(data){ weekChange(data){
// 点击下一周 // 点击下一周
console.log(data,'week-data')
if (data && data.time) { if (data && data.time) {
let num = data.num let num = data.num
let time = data.time let time = data.time
...@@ -486,7 +476,6 @@ ...@@ -486,7 +476,6 @@
}, },
dateChange(data){ dateChange(data){
// 点击日期选择 // 点击日期选择
console.log(data,'dateChange')
let self = this let self = this
self.appointmentDatetime = data.item.day self.appointmentDatetime = data.item.day
self.dateItem = data.item self.dateItem = data.item
...@@ -501,7 +490,6 @@ ...@@ -501,7 +490,6 @@
}, },
timeChange(data){ timeChange(data){
// 时间段选择变化 // 时间段选择变化
console.log(data,'timeChange')
this.appointmentDatetimeRange = data.item this.appointmentDatetimeRange = data.item
}, },
addressToCoordinate(){ addressToCoordinate(){
...@@ -756,7 +744,6 @@ ...@@ -756,7 +744,6 @@
if(!currentOverTime){ if(!currentOverTime){
return 0 return 0
} }
console.log('--------', Math.round(Math.abs(this.order.currentOverTime - new Date().getTime()) / 1000))
return Math.round(Math.abs(this.order.currentOverTime - new Date().getTime()) / 1000); return Math.round(Math.abs(this.order.currentOverTime - new Date().getTime()) / 1000);
}, },
timeOutChange(currentOverTime){ timeOutChange(currentOverTime){
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
rejectReason: '', rejectReason: '',
remark: '' remark: ''
}, },
count: 3, // 剩余次数 count: 0, // 剩余次数
}; };
}, },
computed: { computed: {
...@@ -62,16 +62,16 @@ ...@@ -62,16 +62,16 @@
PopView PopView
}, },
onLoad(e) { onLoad(e) {
if(e) { if(e && e.orderId) {
if(e.orderId) {
this.orderId = e.orderId this.orderId = e.orderId
} else if(e.count) { if(e.count) {
this.count = e.count this.count = e.count
} } else {
}
if(!this.count) {
this.getRejectCount() this.getRejectCount()
} }
} else {
this.$u.toast("本月无拒单机会,请联系客服")
}
}, },
methods: { methods: {
changeReason(reason) { changeReason(reason) {
...@@ -116,18 +116,9 @@ ...@@ -116,18 +116,9 @@
let res = await self.$u.api.rejectOrder(self.formData, self.orderId) let res = await self.$u.api.rejectOrder(self.formData, self.orderId)
self.submiting = false self.submiting = false
if(res && res.code == 200) { if(res && res.code == 200) {
let data = res.data
if(data.code == 200) {
uni.showToast({ uni.showToast({
title: "拒单成功", title: res.message || res.data || '拒单成功',
}) })
} else {
let message = '本月无拒单机会,请联系客服'
uni.showToast({
icon: 'none',
title: message,
})
}
} }
}, },
} }
......
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