Skip to content

S
self-support
Commit ab1f0f76 authored by 郭晓清's avatar 郭晓清
Browse files
Options

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

parents 3a6f7124 2989d9b4
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 41 deletions
src/components/appoint/appoint-time.vue
View file @ ab1f0f76
<!-- 预约时间 --> <!-- 预约时间 -->
<template> <template>
<view :class="{'con-box':titleShow}"> <view :class="{'con-box':titleShow}">
<view class="title" v-if="titleShow">{{ '预约时间' }}</view> <view class="title" v-if="titleShow">{{ title }}</view>
<view class="u-m-t-40"> <view class="u-m-t-40">
<view class="appoint-box"> <view class="appoint-box">
<view class="select-date"> <view class="select-date">
...@@ -32,10 +32,14 @@ ...@@ -32,10 +32,14 @@
<view class="txt active">{{ currentTimeTxt }}</view> <view class="txt active">{{ currentTimeTxt }}</view>
</view> </view>
<view class="u-p-t-30 u-flex u-flex-wrap time-list"> <view class="u-p-t-30 u-flex u-flex-wrap time-list">
<view @click="timeChange(item,index,timeList)" <view
:class="{'time-item':true,'active': index===currentTime}" v-for="(item,index) in timeList" :class="{'time-item':true,'active': index===currentTime}" v-for="(item,index) in timeList"
:key="item.pkey"> :key="item.pkey">
<text class="time">{{item.name}}</text> <button class="time" :plain="true"
:disabled="item.disabled" :hair-line="false"
@click="timeChange(item,index,timeList)">
{{item.name}}
</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -53,6 +57,12 @@ ...@@ -53,6 +57,12 @@
type: Boolean, type: Boolean,
default: true default: true
}, },
title: {
type: String,
default(){
return "预约时间"
}
},
dateList: { dateList: {
type: Array, type: Array,
default(){ default(){
...@@ -71,15 +81,15 @@ ...@@ -71,15 +81,15 @@
type: Array, type: Array,
default(){ default(){
return [ return [
{"name":"06:00-08:00","pkey":"appointment_range_8"}, {"name":"06:00-08:00","pkey":"appointment_range_8","disabled":false},
{"name":"08:00-10:00","pkey":"appointment_range_10"}, {"name":"08:00-10:00","pkey":"appointment_range_10","disabled":false},
{"name":"10:00-12:00","pkey":"appointment_range_12"}, {"name":"10:00-12:00","pkey":"appointment_range_12","disabled":false},
{"name":"12:00-14:00","pkey":"appointment_range_14"}, {"name":"12:00-14:00","pkey":"appointment_range_14","disabled":false},
{"name":"14:00-16:00","pkey":"appointment_range_16"}, {"name":"14:00-16:00","pkey":"appointment_range_16","disabled":false},
{"name":"16:00-18:00","pkey":"appointment_range_18"}, {"name":"16:00-18:00","pkey":"appointment_range_18","disabled":false},
{"name":"18:00-20:00","pkey":"appointment_range_20"}, {"name":"18:00-20:00","pkey":"appointment_range_20","disabled":false},
{"name":"20:00-22:00","pkey":"appointment_range_22"}, {"name":"20:00-22:00","pkey":"appointment_range_22","disabled":false},
{"name":"22:00-24:00","pkey":"appointment_range_24"} {"name":"22:00-24:00","pkey":"appointment_range_24","disabled":false}
] ]
} }
}, },
...@@ -94,6 +104,14 @@ ...@@ -94,6 +104,14 @@
hasLast: false hasLast: false
} }
}, },
watch: {
title() {
this.currentDay = 0
this.appointTime = Date.now()
this.currentTime = null
this.appointRange = ""
}
},
computed: { computed: {
currentTimeTxt() { currentTimeTxt() {
if(this.currentTime != null) { if(this.currentTime != null) {
...@@ -260,7 +278,6 @@ ...@@ -260,7 +278,6 @@
// margin-right: 24rpx; // margin-right: 24rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
border-radius: 12rpx; border-radius: 12rpx;
padding: 26rpx 20rpx 24rpx;
background-color: #F4F5F7; background-color: #F4F5F7;
&:nth-child(3n) { &:nth-child(3n) {
...@@ -274,9 +291,17 @@ ...@@ -274,9 +291,17 @@
} }
.time { .time {
font-size: 26rpx; font-size: 26rpx;
line-height: 26rpx; line-height: 76rpx;
color: #999; color: #999;
} }
/deep/ button {
padding: 0;
height: 76rpx;
}
/deep/ button[plain] {
border: none;
}
} }
} }
</style> </style>
src/pages/order/feedback.vue
View file @ ab1f0f76
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</view> </view>
</view> </view>
<view class="time-view"> <view class="time-view">
<appoint-time :dateList="dateList" :timeList="timeList" @dateChange="dateChange" @timeChange="timeChange" @weekChange="weekChange"></appoint-time> <appoint-time :dateList="dateList" :title="appointTitle" :timeList="timeList" @dateChange="dateChange" @timeChange="timeChange" @weekChange="weekChange"></appoint-time>
</view> </view>
</view> </view>
</view> </view>
...@@ -94,15 +94,15 @@ ...@@ -94,15 +94,15 @@
{day: now + (6*86400000), timeRange: []}, {day: now + (6*86400000), timeRange: []},
], ],
timeList: [ timeList: [
{"name":"06:00-08:00","pkey":"appointment_range_8"}, {"name":"06:00-08:00","pkey":"appointment_range_8","disabled":false},
{"name":"08:00-10:00","pkey":"appointment_range_10"}, {"name":"08:00-10:00","pkey":"appointment_range_10","disabled":false},
{"name":"10:00-12:00","pkey":"appointment_range_12"}, {"name":"10:00-12:00","pkey":"appointment_range_12","disabled":false},
{"name":"12:00-14:00","pkey":"appointment_range_14"}, {"name":"12:00-14:00","pkey":"appointment_range_14","disabled":false},
{"name":"14:00-16:00","pkey":"appointment_range_16"}, {"name":"14:00-16:00","pkey":"appointment_range_16","disabled":false},
{"name":"16:00-18:00","pkey":"appointment_range_18"}, {"name":"16:00-18:00","pkey":"appointment_range_18","disabled":false},
{"name":"18:00-20:00","pkey":"appointment_range_20"}, {"name":"18:00-20:00","pkey":"appointment_range_20","disabled":false},
{"name":"20:00-22:00","pkey":"appointment_range_22"}, {"name":"20:00-22:00","pkey":"appointment_range_22","disabled":false},
{"name":"22:00-24:00","pkey":"appointment_range_24"} {"name":"22:00-24:00","pkey":"appointment_range_24","disabled":false}
], ],
background: { background: {
backgroundColor: 'none', backgroundColor: 'none',
...@@ -116,15 +116,15 @@ ...@@ -116,15 +116,15 @@
type:{ type:{
title:'问题类型', title:'问题类型',
}, },
appoint:{ },
'报单': '下次联系时间', appoint:{
'改约': '预约时间', '报单': '下次联系时间',
} '改约': '预约时间',
}, },
config: null, config: null,
options: [], options: [],
trace: { trace: {
reasonType: '', // 反馈类型 reasonType: '报单', // 反馈类型
reasonRelegation: '', // 反馈归属 reasonRelegation: '', // 反馈归属
reason: '', // 反馈原因 reason: '', // 反馈原因
appointmentDatetime: null, // 预约时间 appointmentDatetime: null, // 预约时间
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
nextTraceDatetime: '', // 下次跟踪时间 nextTraceDatetime: '', // 下次跟踪时间
remark: '', // 备注 remark: '', // 备注
}, },
appointTitle: "预约时间"
}; };
}, },
components:{ components:{
...@@ -143,7 +144,6 @@ ...@@ -143,7 +144,6 @@
} }
}, },
computed: { computed: {
disabledSubmit() { disabledSubmit() {
let self = this let self = this
if(self.trace.reasonType && self.trace.reasonType == '报备'){ if(self.trace.reasonType && self.trace.reasonType == '报备'){
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
}, },
}, },
async onLoad(e) { async onLoad(e) {
this.$u.vuex('vuex_token', 'RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5'); // this.$u.vuex('vuex_token', 'RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5');
this.orderId = 1 this.orderId = 1
this.categoryId = 88 this.categoryId = 88
if(e) { if(e) {
...@@ -216,9 +216,23 @@ ...@@ -216,9 +216,23 @@
if(self.trace.reasonType == '改约') { if(self.trace.reasonType == '改约') {
self.showRemark = true self.showRemark = true
self.appointTitle = '预约时间'
if(self.dateList && self.timeList) {
self.timeList.map((item, index) => {
if(data.item.timeRange.indexOf(item.pkey) > -1) {
item.disabled = true
} else {
item.disabled = false
}
})
}
} else { } else {
self.showRemark = false self.showRemark = false
self.trace.remark = '' self.trace.remark = ''
self.appointTitle = '下次联系时间'
self.timeList.map((item, index) => {
item.disabled = false
})
} }
} }
}, },
...@@ -231,7 +245,7 @@ ...@@ -231,7 +245,7 @@
} }
let res = await this.$u.api.workerCalendar(params) let res = await this.$u.api.workerCalendar(params)
if(res && res.code == 200) { if(res && res.code == 200) {
self.dateList = res.data
} }
}, },
...@@ -240,7 +254,11 @@ ...@@ -240,7 +254,11 @@
let self = this let self = this
let res = await this.$u.api.openTimerange() let res = await this.$u.api.openTimerange()
if(res && res.code == 200) { if(res && res.code == 200) {
self.timeList = res.data let list = res.data
list.map((item, index) => {
item.disabled = false
})
self.timeList = list
} }
}, },
...@@ -259,12 +277,6 @@ ...@@ -259,12 +277,6 @@
changeType(key) { changeType(key) {
this.trace.reason = key this.trace.reason = key
}, },
/**
* 拒单
*/
// rejectOrder() {
// console.log("点击拒单")
// },
weekChange(data){ weekChange(data){
// 点击下一周 // 点击下一周
console.log(data,'week-data') console.log(data,'week-data')
...@@ -302,10 +314,19 @@ ...@@ -302,10 +314,19 @@
if(self.trace.reasonType == '报备') { if(self.trace.reasonType == '报备') {
self.trace.appointmentDatetime = null self.trace.appointmentDatetime = null
self.trace.nextTraceDatetime = data.item.day self.trace.nextTraceDatetime = data.item.day
self.timeList.map((item, index) => {
item.disabled = false
})
} else if(self.trace.reasonType == '改约') { } else if(self.trace.reasonType == '改约') {
self.trace.appointmentDatetime = data.item.day self.trace.appointmentDatetime = data.item.day
self.trace.nextTraceDatetime = null self.trace.nextTraceDatetime = null
self.timeList.map((item, index) => {
if(data.item.timeRange.indexOf(item.pkey) > -1) {
item.disabled = true
} else {
item.disabled = false
}
})
} }
}, },
......
src/pages/photo/preview.vue
View file @ ab1f0f76
...@@ -197,7 +197,6 @@ ...@@ -197,7 +197,6 @@
} }
}, },
fail(e) { fail(e) {
debugger
} }
}) })
} }
......
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