Commit d895716c authored by Morson's avatar Morson

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

# Conflicts:
#	src/pages/order/detail.vue
parents 91a91a75 c353356a
<!-- 预约时间 -->
<template>
<view :class="{'con-box':titleShow}">
<view class="title" v-if="titleShow">{{'预约时间'}}</view>
<view class="u-m-t-40">
<view class="appoint-box">
<view class="select-date">
<view class="u-flex u-row-between ">
<view class="txt">选择日期</view>
<view class="txt active">2021.04.21</view>
</view>
<view class="u-m-t-30 u-flex u-row-between date-list">
<view :class="{'date-item':true,'active':index===currentDay}"
@click="dateChange(item,index,dateList)" v-for="(item,index) in dateList" :key="index">
<text class="day">{{item.weekDay}}</text>
<text class="day day1">{{item.day}}</text>
</view>
<view class="next" @click="weekChange">
<u-icon name="arrow-right" color="#2979ff" size="28"></u-icon>
</view>
</view>
</view>
<!-- weekChange -->
<view class="select-time u-p-t-50">
<view class="u-flex u-row-between">
<view class="txt">选择时间</view>
<view class="txt active">14:00-16:00</view>
</view>
<view class="u-p-t-30 u-flex u-flex-wrap time-list">
<view @click="timeChange(item,index,timeList)"
:class="{'time-item':true,'active':index===currentTime}" v-for="(item,index) in timeList"
:key="index">
<text class="time">{{item}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
props: {
titleShow: {
type: Boolean,
default: true
},
},
data() {
return {
currentDay: 0,
currentTime: 0,
dateList: [{
weekDay: '周三',
day: '21'
}, {
weekDay: '周三',
day: '21'
}, {
weekDay: '周三',
day: '21'
}, {
weekDay: '周三',
day: '21'
}, {
weekDay: '周三',
day: '21'
}, {
weekDay: '周三',
day: '21'
}, ],
timeList: ['06:00-08:00', '06:00-08:00', '06:00-08:00', '06:00-08:00', '06:00-08:00', '06:00-08:00',
'06:00-08:00', '06:00-08:00', '06:00-08:00'
]
}
},
methods: {
getDateList() {
// 获取日期
},
dateChange(item, index, list) {
let data = {
item,
index,
list,
}
this.currentDay = index
this.$emit('date-change', data)
},
timeChange(item, index, list) {
let data = {
item,
index,
list,
}
this.currentTime = index
this.$emit('time-change', data)
},
weekChange(item, index, list) {
let data = {
item,
index,
list,
}
this.$emit('week-change', data)
},
}
}
</script>
<style lang="scss" scoped>
.con-box {
margin-top: 30rpx;
padding: 30rpx 30rpx 30rpx 20rpx;
border-radius: 12rpx;
background-color: #FFFFFF;
.title {
font-weight: bold;
font-size: 32rpx;
line-height: 32rpx;
color: #333;
}
}
.txt {
font-size: 26rpx;
line-height: 26rpx;
color: #333;
&.active {
color: #2272FF
}
}
.date-list {
background-color: #F4F5F7;
.next{
width: 60rpx;
height: 120rpx;
line-height: 120rpx;
text-align: center;
border-left: 2rpx solid #fff;
}
.date-item {
padding: 20rpx 20rpx 16rpx;
border-radius: 12rpx;
.day {
display: block;
font-size: 24rpx;
line-height: 26rpx;
color: #999;
&.day1 {
width: 48rpx;
height: 48rpx;
margin-top: 10rpx;
border-radius: 50%;
font-size: 28rpx;
text-align: center;
line-height: 48rpx;
}
}
&.active {
// background-color: #2272FF;
.day {
color: #2272FF;
&.day1 {
background-color: #2272FF;
color: #fff !important;
}
}
}
}
}
.time-list {
margin-bottom: -30rpx;
.time-item {
min-width: 196rpx;
margin-right: 26rpx;
margin-bottom: 24rpx;
border-radius: 12rpx;
padding: 26rpx 20rpx 24rpx;
background-color: #F4F5F7;
&:nth-child(3n) {
margin-right: 0;
}
&.active{
background-color: #2272FF;
.time{
color:#fff;
}
}
.time {
font-size: 26rpx;
line-height: 26rpx;
color: #999;
}
}
}
</style>
<template>
<view class="order-view">
<text>订单</text>
</view>
</template>
<script>
export default {
props: {
orderData: {
type: Object,
default: {}
}
},
data() {
return {
};
}
}
</script>
<style lang="scss" scoped>
.order-view {
width: 100%;
height: 200rpx;
}
<template>
<view class="order-view" @click="handleClickCell">
<view class="order-top-view">
<view class="left-view">
<view :class="['tag-view', {'active': orderData.orderServiceType == '安装'}]">
{{ orderData.orderServiceType }}</view>
<view class="store-view">{{ orderData.categoryName }}</view>
</view>
<view class="right-view">{{ orderData.orderBusinessTypeText }}</view>
</view>
<view class="content-view">
<view class="info-view" v-for="(item, key) in infoTexts" :key="key">
<text>{{item}}:</text>
<text>{{orderData[key]}}</text>
</view>
<view class="address-view">
<view class="address-left-view">
<image class="address-image" :src="dizhiImage"></image>
<text>{{orderData.contactAddress }}</text>
</view class="address-right-view">
<view>{{getDistance(orderData.contactAddressLatitud,orderData.contactAddressLongitud)}}km</view>
</view>
</view>
<u-divider margin-top="16" half-width="630" border-color="#F4F5F7" :use-slot="false">
</u-divider>
<view class="bottom">
<view class="left">
<view class="tag">剩</view>
<u-count-down :timestamp="timestamp" font-size="44" color="#FF930D"></u-count-down>
</view>
<u-button class="right-btn" @click.stop="handleClick" :custom-style="buttonStyle">
{{orderText}}
</u-button>
</view>
</view>
</template>
<script>
export default {
props: {
orderData: {
type: Object,
default: {
orderServiceType: '安装', // 服务类型:安装、维修
categoryName: '充电桩', // 品类:充电桩
orderBusinessTypeText: '分配单', // 业务类型:分配单、订单池
orderNumber: 'OR2021041809827', // 工单编号
contactName: '郭小清', // 客户信息
contactPhone: '13631612077', // 联系方式
contactAddress: '湾街道荔枝花园D座125号', // 详细地址
contactAddressLatitud: '116.3896', // 联系人地址经度
contactAddressLongitud: '39.91917', // 联系人地址纬度
orderStatus: '0', // 工单状态
appointmentDatetime: '' // 预约时间
}
},
orderType: Number // 0:待接单 1:'去预约', 2:'去签到', 3:'去完工', 4:'审核中', 5:'去处理', 6'已完工'
},
data() {
return {
};
},
computed: {
/*
orderStatus:
待接单 orderStatus<31 工单状态小于31
待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空
待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空
待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80
审核中 orderStatus ==85 or orderStatus == 87 工单状态 等于85 或者 等于有87
异常 orderStatus ==86 or orderStatus == 88 工单状态 等于86 或者 等于有88
已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110
*/
orderText() { // 按钮文字
if (!this.orderType) {
if (this.orderData.orderStatus < 31) {
this.orderType = 0
} else if (this.orderData.orderStatus == 31) {
if (this.orderData.appointmentDatetime) {
return this.orderType = 2
} else {
this.orderType = 1
}
} else if (this.orderData.orderStatus > 31 && this.orderData.orderStatus < 80) {
this.orderType = 3
} else if (this.orderData.orderStatus == 85 && this.orderData.orderStatus == 87) {
this.orderType = 4
} else if (this.orderData.orderStatus == 86 && this.orderData.orderStatus == 88) {
this.orderType = 5
} else if ([80, 81, 89, 110].indexOf(this.orderData.orderStatus) != -1) {
this.orderType = 6
} else {
this.orderType = 0
}
}
return this.typeTexts[this.orderType]
},
buttonStyle() { // 按钮样式
switch (this.status) {
case 0:
if (this.orderData.currentWillOverTime) {
return this.buttonStyle[0]
} else {
return this.buttonStyle[1]
}
case 1:
case 2:
case 3:
case 5:
return this.buttonStyle[0]
case 4:
case 6:
return this.buttonStyle[2]
}
},
infoTexts() {
return {
'orderNumber': '工单编号',
'contactName': '客户信息',
'contactPhone': '联系方式'
}
},
typeTexts() {
return [this.type0Text, '去预约', '去签到', '去完工', '审核中', '去处理', '已完工']
},
type0Text() {
return this.orderData.currentWillOverTime ? '接单' : '抢单'
},
buttonStyles() {
return [{
'background-color': '#2272FF',
'color': '#FFFFFF'
}, {
'background-color': '#FF930D',
'color': '#FFFFFF'
}, {
'background-color': 'transparent',
'color': '#2272FF'
}]
},
buttonDisabled() {
return this.orderData.orderStatus == 4 || this.orderData.orderStatus == 6
},
dizhiImage() {
return process.uniEnv.qn_base_url + 'dizhi.png'
},
},
methods: {
handleClick() {
if (buttonDisabled) return
this.$emit('action')
},
actionClick() {
this.$emit('click')
},
getDistance(Latitud, Longitud) {
return this.distance(Latitud, Longitud, this.dataValue[0], this.dataValue[1])
},
/**
* echo distance(116.3896,39.91917,116.3940,39.91726);
* 计算两点之间直线距离
* @param float $lon1 经度
* @param float $lat1 维度
* @param float $lon2 经度
* @param float $lat2 维度
* @return float 浮点数
*/
distance(la1, lo1, la2, lo2) {
var La1 = la1 * Math.PI / 180.0;
var La2 = la2 * Math.PI / 180.0;
var La3 = La1 - La2;
var Lb3 = lo1 * Math.PI / 180.0 - lo2 * Math.PI / 180.0;
var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(La3 / 2), 2), Math.cos(La1) * Math.cos(La2) * Math.pow(
Math.sin(Lb3 / 2), 2)));
s = s * 6378.137; //地球半径
s = Math.round(s * 10000) / 10000;
// console.log("计算结果",s,'KM');
return s ? s.toFixed(2) : 0;
},
}
}
</script>
<style lang="scss" scoped>
.order-view {
width: 100%;
background-color: #FFFFFF;
border-radius: 12rpx;
padding: 30rpx;
.order-top-view {
display: flex;
align-items: center;
justify-content: space-between;
.left-view {
display: flex;
align-items: center;
.tag-view {
width: 84rpx;
height: 40rpx;
color: #FFFFFF;
border-radius: 8rpx;
background-image: linear-gradient(to right, #FF930D, #FFC174);
&.active {
background-image: linear-gradient(to right, #2272FF, #47ABFF);
}
}
.store-view {
color: #333333;
font-size: 36rpx;
font-weight: bold;
margin-left: 20rpx;
}
}
.right-view {
width: 100rpx;
height: 40rpx;
background-color: #F4F5F7;
border-radius: 20rpx;
color: #333333;
font-size: 22rpx;
line-height: 40rpx;
}
}
.content-view {
.info-view {
text-align: left;
margin-top: 20rpx;
color: #333333;
font-size: 26rpx;
}
.address-view {
display: flex;
align-items: center;
justify-content: space-between;
color: #333333;
font-size: 24rpx;
.address-left-view {
display: flex;
align-items: center;
.address-image {
width: 24rpx;
height: 24rpx;
margin-right: 8rpx;
}
}
.address-right-view {}
}
}
}
</style>
......@@ -21,8 +21,11 @@ Vue.use(httpInterceptor, app)
Vue.use(router)
// http接口API抽离,免于写url或者一些固定的参数
import httpApi from '@/common/http.api.js'
Vue.use(httpApi, app)
Vue.use(httpApi, app)
// 分享
let mpShare = require('@/uview-ui/libs/mixin/mpShare.js')
Vue.mixin(mpShare)
//v1.3.5起 H5端 你应该去除原有的app.$mount();使用路由自带的渲染方式
// #ifdef H5
RouterMount(app,router,'#app')
......
......@@ -15,12 +15,20 @@
"style": {
"navigationBarTitleText": "订单"
}
},
},
{
"path": "pages/order/complete",
"style": {
"navigationBarTitleText": "订单-完工配置"
}
},{
"path": "pages/order/feedback",
"style": {
"navigationBarTitleText": "订单-过程反馈",
"enablePullDownRefresh": false,
"navigationStyle": "custom", // 隐藏系统导航栏
"disableScroll": true
}
},
{
"path": "pages/mine/index",
......@@ -167,15 +175,15 @@
"enablePullDownRefresh": false
}
}
,{
// 订单详情页
"path" : "pages/order/detail",
"style" :
{
"navigationStyle": "custom"// 隐藏系统导航栏
}
}
,{
// 订单详情页
"path" : "pages/order/detail",
"style" :
{
"navigationStyle": "custom"// 隐藏系统导航栏
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
......@@ -253,10 +261,10 @@
"path": "pages/settle/file", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
},
{
"name": "缴纳保证金", //模式名称
"path": "pages/settle/pay-ensure", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
{
"name": "缴纳保证金", //模式名称
"path": "pages/settle/pay-ensure", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
},
{
"name": "签约页面", //模式名称
......@@ -264,8 +272,8 @@
"query": "" //启动参数,在页面的onLoad函数里面得到
},
{
"name": "订单 - 完工配置", //模式名称
"path": "pages/order/complete", //启动页面,必选
"name": "订单 - 过程反馈", //模式名称
"path": "pages/order/feedback", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
}
]
......
......@@ -198,7 +198,8 @@ export default {
};
},
onLoad() {
this.getList();
this.getList();
this.$u.mpShare.path = ''
},
methods: {
......
......@@ -23,7 +23,10 @@
},
methods: {
}
},
onLoad() {
this.$u.mpShare.path = ''
},
}
</script>
......
<!-- 过程反馈 -->
<template>
<view class="feedback-box bg">
<u-navbar back-icon-color="#FFFFFF" :background="background" title="过程反馈" title-color="#fff" :border-bottom="false"></u-navbar>
<view class="content u-p-l-30 u-p-r-30">
<view class="width-320 u-m-t-20">
<u-subsection
:bold="false"
:current="curNow"
:list="list"
active-color="white"
bg-color="white"
height="72"
inactive-color="#666"
button-color="#2272FF"
border-radius="36"
></u-subsection>
</view>
<view class="con-box">
<view class="title">{{feedback.own.title}}</view>
<view class="u-flex u-flex-wrap">
<view :class="{'txt-item':true,'active':true}" v-for="(txt,index) in feedback.own.list" :key="index">
<text class="txt">{{txt}}</text>
</view>
</view>
</view>
<view class="con-box">
<view class="title">{{feedback.type.title}}</view>
<view class="u-flex u-flex-wrap">
<view :class="{'txt-item':true,'active':false}" v-for="(txt,index) in feedback.type.list" :key="index">
<text class="txt">{{txt}}</text>
</view>
</view>
<u-input class="textarea" height="156" type="textarea" placeholder="请补充详细说明,以便于记录您的接单信用分"></u-input>
</view>
<appoint-time @dateChange="dateChange" @timeChange="timeChange" @weekChange="weekChange"></appoint-time>
</view>
<view class="u-m-60">
<button class="btn">确定</button>
</view>
</view>
</template>
<script>
import appointTime from '@/components/appoint/appoint-time.vue'
export default {
data() {
return {
background: {
backgroundColor: 'none',
},
// questionList: ['个人', '客户', '现场/客户'],
feedback: {
own:{
title:'问题归属',
list:['个人', '客户', '现场/客户'],
},
type:{
title:'问题类型',
list:['有事耽搁', '未带齐工具', '个人改约','其他']
},
appoint:{
title:'预约时间',
}
},
list:['报备','预约'],
curNow: 1
};
},
components:{
appointTime
},
methods: {
/**
* 拒单
*/
rejectOrder() {
console.log("点击拒单")
},
sectionChange(index) {
this.curNow = index;
},
weekChange(data){
// 点击下一周
console.log(data,'week-data')
},
dateChange(data){
// 点击日期选择
console.log(data,'week-data')
},
timeChange(data){
// 时间段选择变化
console.log(data,'week-data')
},
}
}
</script>
<style lang="scss">
.bg {
width: 750rpx;
height: 100vh;
overflow: auto;
background-color: #F4F5F7;
background-image: linear-gradient(to top, #F4F5F7 0%, #2272FF 100%);
background-size: 750rpx 600rpx;
background-repeat: no-repeat;
}
/deep/ .u-subsection{
padding:4rpx!important;
}
.con-box{
margin-top:30rpx;
padding:30rpx 30rpx 30rpx 20rpx;
border-radius: 12rpx;
background-color: #FFFFFF;
.title{
font-weight: bold;
font-size: 32rpx;
line-height: 32rpx;
color: #333;
}
&>.u-flex{
margin-top:40rpx;
margin-right:-20rpx;
.txt-item{
border-radius: 12rpx;
padding:24rpx 38rpx;
min-width: 196rpx;
text-align: center;
margin-right: 20rpx;
margin-bottom: 20rpx;
background-color: #F4F5F7;
&.active{
background-color: #2272FF;
.txt{
color: #fff;
}
}
}
}
.txt{
display:block;
font-size: 26rpx;
line-height: 26rpx;
color: #333;
}
.textarea{
/deep/ .u-input{
textarea{
margin-top:20rpx;
border: 2rpx solid #ECECEC;
padding:18rpx 30rpx;
}
}
}
}
.btn{
padding:30rpx;
border-radius: 52rpx;
line-height: 44rpx;
font-size:32rpx;
text-align: center;
background-color: #2272FF;
color:#fff;
&::after{
content:'';
height:0;
}
}
.width-320{
width:320rpx;
}
</style>
......@@ -2,8 +2,8 @@ module.exports = {
onLoad() {
// 设置默认的转发参数
this.$u.mpShare = {
title: '', // 默认为小程序名称
path: '', // 默认为当前页面路径
title: '充电桩安装火爆进行中...就等你', // 默认为小程序名称
path: '/pages/index/index', // 默认为当前页面路径
imageUrl: '' // 默认为当前页面的截图
}
},
......
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