Commit 113c4343 authored by Facius's avatar Facius

Merge branch 'dev' into test

parents bbbb5319 bf1bfd6e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<complete-check :show="completeCheck.status" :list-data="completeCheck.result" :pass="pass" @close="closeCheckResult" @confirm="confirm" :confirm-button-text="completeCheck.confirmText" :cancel-button-text="completeCheck.cancelText"></complete-check> <complete-check :show="completeCheck.status" :list-data="completeCheck.result" :pass="pass" @close="closeCheckResult" @confirm="confirm" :confirm-button-text="completeCheck.confirmText" :cancel-button-text="completeCheck.cancelText"></complete-check>
<view class="com-content"> <view class="com-content">
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" :title="list[tabIndex].panelName" title-bold></u-navbar> <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" :title="list[tabIndex].panelName" title-bold></u-navbar>
<u-tabs class="order-tabs" ref="tabs" :current="current" name="panelName" :list="tabList" @change="swichMenu" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs> <u-tabs-swiper class="order-tabs" ref="tabs" :current="current" :showBar="showBar" name="panelName" :list="tabList" @change="swichMenu" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs-swiper>
<view class="u-menu-wrap"> <view class="u-menu-wrap">
<scroll-view :scroll-top="scrollRightTop" style="height: 100%;" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll" :scroll-into-view="itemId"> <scroll-view :scroll-top="scrollRightTop" style="height: 100%;" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll" :scroll-into-view="itemId">
<u-form :model="form" ref="uForm"> <u-form :model="form" ref="uForm">
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
export default { export default {
data() { data() {
return { return {
showBar: false,
orderId:0, orderId:0,
categoryId:0, categoryId:0,
orderServiceType:'', orderServiceType:'',
...@@ -218,7 +219,7 @@ ...@@ -218,7 +219,7 @@
tabIndex: 0, tabIndex: 0,
scrollTop: 0, //tab标题的滚动条位置 scrollTop: 0, //tab标题的滚动条位置
oldScrollTop: 0, oldScrollTop: 0,
current: null, // 预设当前项的值 current: 0, // 预设当前项的值
menuHeight: 0, // 左边菜单的高度 menuHeight: 0, // 左边菜单的高度
menuItemHeight: 0, // 左边菜单item的高度 menuItemHeight: 0, // 左边菜单item的高度
itemId: '', // 栏目右边scroll-view用于滚动的id itemId: '', // 栏目右边scroll-view用于滚动的id
...@@ -381,7 +382,10 @@ ...@@ -381,7 +382,10 @@
this.list = list this.list = list
// this.showTab = this.list.length > 1 // this.showTab = this.list.length > 1
this.current = 0 setTimeout(() => {
this.showBar = true
this.current = 0
}, 1000)
// 异常单处理 // 异常单处理
if (this.auditResultsId) this.checkCompleteError() if (this.auditResultsId) this.checkCompleteError()
uni.hideLoading() uni.hideLoading()
...@@ -505,12 +509,12 @@ ...@@ -505,12 +509,12 @@
this.tabIndex++ this.tabIndex++
this.arr = [] this.arr = []
this.scrollRightTop = 0 this.scrollRightTop = 0
this.current = 0 this.current = null
const itemId = this.list[this.tabIndex].items[0].items[0].fieldsId this.itemId = ''
this.oldItemId = `item${itemId}` //const itemId = this.list[this.tabIndex].items[0].items[0].fieldsId
//this.oldItemId = `item${itemId}`
this.$nextTick(async () => { this.$nextTick(async () => {
if (this.oldItemId) this.itemId = this.oldItemId await this.swichMenu(0)
this.oldItemId = ''
}) })
} }
}, },
...@@ -536,7 +540,11 @@ ...@@ -536,7 +540,11 @@
currentStep: this.list[this.tabIndex].panelFieldsName, currentStep: this.list[this.tabIndex].panelFieldsName,
nextStep: this.list[this.tabIndex + 1].panelFieldsName, nextStep: this.list[this.tabIndex + 1].panelFieldsName,
} }
uni.showLoading({
title: '加载中'
})
return this.$u.api.completeNextStep(params, this.orderId).then((res)=>{ return this.$u.api.completeNextStep(params, this.orderId).then((res)=>{
uni.hideLoading()
if (res.code == 200) { if (res.code == 200) {
return Promise.resolve(true) return Promise.resolve(true)
} else { } else {
...@@ -548,16 +556,6 @@ ...@@ -548,16 +556,6 @@
} }
}) })
}, },
tabsChange(index){
this.tabIndex = index
this.arr = []
this.scrollRightTop = 0;
this.current = 0;
this.$nextTick(function() {
if (this.oldItemId)this.itemId = this.oldItemId
this.getMenuItemTop()
})
},
locationCompleteItem(panelIndex,groupIndex,eleIndex){ // 页面定位到某一项 locationCompleteItem(panelIndex,groupIndex,eleIndex){ // 页面定位到某一项
this.tabIndex = panelIndex this.tabIndex = panelIndex
this.current = groupIndex; this.current = groupIndex;
......
...@@ -283,9 +283,9 @@ ...@@ -283,9 +283,9 @@
if(this.getDistance(res.latitude,res.longitude)>this.signDistance){ if(this.getDistance(res.latitude,res.longitude)>this.signDistance){
// 计算签到距离 // 计算签到距离
this.centerBtnDisabled = false
}else{
this.centerBtnDisabled = true this.centerBtnDisabled = true
}else{
this.centerBtnDisabled = false
} }
}, },
openLocationChange(){ openLocationChange(){
...@@ -616,10 +616,9 @@ ...@@ -616,10 +616,9 @@
} }
data.appointmentDatetimeRange = this.appointmentDatetimeRange.pkey data.appointmentDatetimeRange = this.appointmentDatetimeRange.pkey
}else if (this.submitType === 'maintainWorkerCheckin') { // 签到 }else if (this.submitType === 'maintainWorkerCheckin') { // 签到
// 检查见到距离是否符合 // 检查见到距离是否符合
if(!this.isErrorSign){ if(!this.isErrorSign){
if(!this.centerBtnDisabled){ if(this.centerBtnDisabled){
return return
}else{ }else{
this.closeLocationChange() this.closeLocationChange()
...@@ -633,7 +632,7 @@ ...@@ -633,7 +632,7 @@
data.exception = this.isErrorSign data.exception = this.isErrorSign
data.coordinate = this.dataValue ? this.dataValue[0]+','+this.dataValue[1]:'' data.coordinate = this.dataValue ? this.dataValue[0]+','+this.dataValue[1]:''
data.url = this.errorSignUrl?this.errorSignUrl:'' data.url = this.errorSignUrl?this.errorSignUrl:''
}else if(this.submitType === 'toFilish'){ // 去完工 } else if(this.submitType === 'toFilish'){ // 去完工
if (this.order.categoryName != '充电桩') { if (this.order.categoryName != '充电桩') {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
...@@ -653,8 +652,7 @@ ...@@ -653,8 +652,7 @@
this.$u.api[this.submitType](data, this.order.orderId).then(res => { this.$u.api[this.submitType](data, this.order.orderId).then(res => {
let self = this let self = this
if ((res.data.code!==undefined && res.data.code === 200) if (res.code === 200) {
|| (res.code!==undefined && res.code === 200) ) {
this.trackOrder() this.trackOrder()
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.bottomButtonText + '操作成功', title: this.bottomButtonText + '操作成功',
......
...@@ -38,7 +38,10 @@ ...@@ -38,7 +38,10 @@
}, },
computed:{ computed:{
titles() { titles() {
return ['合作商', '品牌'] return {
'1': '合作商',
'2': '品牌'
}
} }
}, },
methods: { methods: {
......
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