Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李俊赕
self-support
Commits
8274b741
Commit
8274b741
authored
Apr 28, 2021
by
zhengzy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
# Conflicts: # src/pages/learn/index.vue
parent
2a29882f
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
493 additions
and
227 deletions
+493
-227
learn.js
src/common/api/learn.js
+1
-1
order.js
src/common/api/order.js
+39
-18
settled.js
src/common/api/settled.js
+1
-1
http.interceptor.js
src/common/http.interceptor.js
+2
-1
appoint-time.vue
src/components/appoint/appoint-time.vue
+15
-27
index.vue
src/components/order/index.vue
+18
-14
index.vue
src/components/popView/index.vue
+29
-8
pages.json
src/pages.json
+9
-3
index.vue
src/pages/index/index.vue
+13
-10
curriculum.vue
src/pages/learn/curriculum.vue
+55
-14
index.vue
src/pages/learn/index.vue
+21
-25
section.vue
src/pages/learn/section.vue
+35
-28
detail.vue
src/pages/order/detail.vue
+115
-48
feedback.vue
src/pages/order/feedback.vue
+83
-13
index.vue
src/pages/order/index.vue
+3
-3
refuse.vue
src/pages/order/refuse.vue
+53
-12
sign-contract.vue
src/pages/settle/sign-contract.vue
+1
-1
No files found.
src/common/api/learn.js
View file @
8274b741
...
@@ -7,7 +7,7 @@ let learnApiFun = function(vm){
...
@@ -7,7 +7,7 @@ let learnApiFun = function(vm){
let
getTrainingNoticeList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/notice/list'
,
params
);
let
getTrainingNoticeList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/notice/list'
,
params
);
/* 获取学习视频基本信息 */
/* 获取学习视频基本信息 */
let
CourseList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
collegeApiUrl
+
'/v1/course-details
?course_id=173
'
,
params
);
let
CourseList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
collegeApiUrl
+
'/v1/course-details'
,
params
);
/* 获取章节详情 */
/* 获取章节详情 */
let
ChapterDetails
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
collegeApiUrl
+
'/v1/chapter-sections'
,
params
);
let
ChapterDetails
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
collegeApiUrl
+
'/v1/chapter-sections'
,
params
);
/* 获取课程节信息*/
/* 获取课程节信息*/
...
...
src/common/api/order.js
View file @
8274b741
import
util
from
'@/utils/util.js'
import
util
from
'@/utils/util.js'
// 接口公共前缀
const
prefix
=
'/wxh-worker-rest/rest/'
let
orderApiFun
=
function
(
vm
){
let
orderApiFun
=
function
(
vm
){
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
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/wokerOrder/queryOrdersCount/V2'
,
params
);
let
listOrderCount
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/queryOrdersCount/V2'
,
params
);
/**
/**
* 工单列表接口
wxh-worker-rest/rest/order/revision/{token}/list
* 工单列表接口
*/
*/
let
listOrder
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/revision/'
+
vm
.
vuex_token
+
'/list'
,
params
);
let
listOrder
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/revision/'
+
vm
.
vuex_token
+
'/list'
,
params
);
/**
/**
* 获取师傅的预约日历
* 获取师傅的预约日历
*/
*/
let
workerCalendar
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/wokerOrder/appointment/calendar'
,
params
);
let
workerCalendar
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/appointment/calendar'
,
params
);
/**
/**
* 师傅预约
* 师傅预约
*/
*/
let
workerAppointment
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/traceOrder/'
+
vm
.
vuex_token
+
'/order/{orderId}'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
workerAppointment
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/traceOrder/'
+
vm
.
vuex_token
+
'/order/{orderId}'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
// 联系顾客时间更新接口,暂时没有
// 联系顾客时间更新接口,暂时没有
/**
/**
* 师傅签到接口
* 师傅签到接口
*/
*/
let
maintainWorkerCheckin
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintainWorkerCheckin'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
maintainWorkerCheckin
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintainWorkerCheckin'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
/**
/**
* 订单详情查询
* 订单详情查询
*/
*/
let
orderDetail
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/revision/'
+
vm
.
vuex_token
+
'/'
+
orderId
,
params
);
let
orderDetail
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/revision/'
+
vm
.
vuex_token
+
'/'
+
orderId
,
params
);
/* 过程反馈查询接口 */
/* 过程反馈查询接口 */
let
feedbackConfig
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rst/order/v2/getFeedBack/'
+
vm
.
vuex_token
,
params
)
let
feedbackConfig
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/r
e
st/order/v2/getFeedBack/'
+
vm
.
vuex_token
,
params
)
/* 预约+过程反馈 接口 */
/* 预约+过程反馈 接口 */
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
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/workerReject/V2'
,
params
)
let
rejectOrder
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
`/order/
${
orderId
}
/workerReject/V2`
,
params
)
/**
/**
* 查询工单操作记录列表接口
* 查询工单操作记录列表接口
*/
*/
let
listOrderRecord
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/record/'
+
vm
.
vuex_token
+
'/listOrderRecord/'
+
params
.
orderId
,
params
);
let
listOrderRecord
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/record/'
+
vm
.
vuex_token
+
'/listOrderRecord/'
+
params
.
orderId
,
params
);
/**
/**
* 接单
* 接单
*/
*/
let
orderAccept
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/accept'
,
params
);
let
orderAccept
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/accept'
,
params
);
/**
/**
* 抢单
* 抢单
*/
*/
let
orderGan
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/revision/applets/'
+
vm
.
vuex_token
+
'/order/acceptAppletsOrder'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
orderGan
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/revision/applets/'
+
vm
.
vuex_token
+
'/order/acceptAppletsOrder'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
/**
/**
* 获取拍照标准
* 获取拍照标准
*/
*/
let
orderStandard
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/photo/standard'
,
params
);
let
orderStandard
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/standard'
,
params
);
/**
/**
* 保存图片信息
* 保存图片信息
*/
*/
let
saveImage
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/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
(
'wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/photo/watermark'
,
params
);
let
getWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/watermark'
,
params
);
/**
* 获取师傅开放可选时间段
*/
let
openTimerange
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/appointment/timerange'
,
params
);
/**
* 联系时间接口
*/
let
contactTime
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/record/'
+
vm
.
vuex_token
+
'/contact/'
+
orderId
,
params
);
/**
* 检查是否可以拒单
*/
let
checkRejectable
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/order/'
+
vm
.
vuex_token
+
'/wokerOrder/checkRejectable'
,
params
);
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
...
@@ -90,7 +108,10 @@ let orderApiFun = function(vm){
...
@@ -90,7 +108,10 @@ let orderApiFun = function(vm){
rejectOrder
,
rejectOrder
,
orderStandard
,
orderStandard
,
saveImage
,
saveImage
,
getWatermark
getWatermark
,
openTimerange
,
contactTime
,
checkRejectable
}
}
return
orderApi
return
orderApi
}
}
...
...
src/common/api/settled.js
View file @
8274b741
...
@@ -39,7 +39,7 @@ let settledApiFun = function(vm){
...
@@ -39,7 +39,7 @@ let settledApiFun = function(vm){
let
saveCourseRate
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/save-course-rate'
,
params
);
let
saveCourseRate
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/save-course-rate'
,
params
);
/* 获取消息内容列表 */
/* 获取消息内容列表 */
let
listByNotice
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/notice/list'
,
params
);
let
listByNotice
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/notice/
home-
list'
,
params
);
const
settledApi
=
{
const
settledApi
=
{
getSettleBaseInfo
,
getSettleBaseInfo
,
...
...
src/common/http.interceptor.js
View file @
8274b741
...
@@ -12,6 +12,7 @@ const globalUrl = process.uniEnv || {}
...
@@ -12,6 +12,7 @@ const globalUrl = process.uniEnv || {}
const
install
=
(
Vue
,
vm
)
=>
{
const
install
=
(
Vue
,
vm
)
=>
{
let
systemApiUrl
=
globalUrl
.
systemUrl
.
apiUrl
let
systemApiUrl
=
globalUrl
.
systemUrl
.
apiUrl
let
ucenterApiUrl
=
globalUrl
.
ucenterUrl
.
apiUrl
let
ucenterApiUrl
=
globalUrl
.
ucenterUrl
.
apiUrl
let
xueApiUrl
=
globalUrl
.
ucenterUrl
.
xueUrl
function
toLoginPage
(){
function
toLoginPage
(){
const
app
=
getApp
()
const
app
=
getApp
()
...
@@ -48,7 +49,7 @@ const install = (Vue, vm) => {
...
@@ -48,7 +49,7 @@ const install = (Vue, vm) => {
config
.
url
+=
'?access-token='
+
token
config
.
url
+=
'?access-token='
+
token
}
}
}
}
if
(
config
.
url
.
indexOf
(
ucenterApiUrl
)
>-
1
){
if
(
config
.
url
.
indexOf
(
ucenterApiUrl
)
>-
1
||
config
.
url
.
indexOf
(
xueApiUrl
)
>-
1
){
// php端增加header Authorization
// php端增加header Authorization
config
.
header
[
'Authorization'
]
=
token
config
.
header
[
'Authorization'
]
=
token
}
}
...
...
src/components/appoint/appoint-time.vue
View file @
8274b741
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<view
class=
"appoint-box"
>
<view
class=
"appoint-box"
>
<view
class=
"select-date"
>
<view
class=
"select-date"
>
<view
class=
"u-flex u-row-between "
>
<view
class=
"u-flex u-row-between "
>
<view
class=
"txt"
>
选择日期
</view>
<view
class=
"txt"
>
选择日期
:
</view>
<view
class=
"txt active"
>
{{
dateList
[
currentDay
].
day
}}
</view>
<view
class=
"txt active"
>
{{
dateList
[
currentDay
].
day
}}
</view>
</view>
</view>
<view
class=
"u-m-t-30 u-flex u-row-between date-list"
>
<view
class=
"u-m-t-30 u-flex u-row-between date-list"
>
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<!-- weekChange -->
<!-- weekChange -->
<view
class=
"select-time u-p-t-50"
>
<view
class=
"select-time u-p-t-50"
>
<view
class=
"u-flex u-row-between"
>
<view
class=
"u-flex u-row-between"
>
<view
class=
"txt"
>
选择时间
</view>
<view
class=
"txt"
>
选择时间
:
</view>
<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"
>
...
@@ -47,33 +47,19 @@
...
@@ -47,33 +47,19 @@
type
:
Boolean
,
type
:
Boolean
,
default
:
true
default
:
true
},
},
dateList
:
{
type
:
Array
,
default
:
[]
},
timeList
:
{
type
:
Array
,
default
:
[]
},
},
},
data
()
{
data
()
{
return
{
return
{
currentDay
:
0
,
currentDay
:
0
,
currentTime
:
null
,
currentTime
:
null
,
dateList
:
[{
weekDay
:
'周三'
,
day
:
'21'
,
},
{
weekDay
:
'周四'
,
day
:
'22'
,
},
{
weekDay
:
'周五'
,
day
:
'23'
,
},
{
weekDay
:
'周六'
,
day
:
'24'
,
},
{
weekDay
:
'周日'
,
day
:
'25'
,
},
{
weekDay
:
'周一'
,
day
:
'26'
,
},
],
timeList
:
[
'06:00-08:00'
,
'08:00-10:00'
,
'10:00-12:00'
,
'12:00-14:00'
,
'14:00-16:00'
,
'16:00-18:00'
,
'18:00-20:00'
,
'20:00-22:00'
,
'22:00-24:00'
],
}
}
},
},
computed
:
{
computed
:
{
...
@@ -88,13 +74,15 @@
...
@@ -88,13 +74,15 @@
getDateList
()
{
getDateList
()
{
// 获取日期
// 获取日期
},
},
dateChange
(
item
,
index
,
list
)
{
async
dateChange
(
item
,
index
,
list
)
{
let
data
=
{
let
data
=
{
item
,
item
,
index
,
index
,
list
,
list
,
}
}
this
.
currentDay
=
index
this
.
currentDay
=
index
let
res
=
await
this
.
$u
.
api
.
openTimerange
()
debugger
this
.
$emit
(
'date-change'
,
data
)
this
.
$emit
(
'date-change'
,
data
)
},
},
timeChange
(
item
,
index
,
list
)
{
timeChange
(
item
,
index
,
list
)
{
...
@@ -195,8 +183,8 @@
...
@@ -195,8 +183,8 @@
.time-item
{
.time-item
{
min-width
:
196rpx
;
min-width
:
196rpx
;
margin-right
:
2
1
rpx
;
margin-right
:
2
4
rpx
;
margin-bottom
:
2
4
rpx
;
margin-bottom
:
2
0
rpx
;
border-radius
:
12rpx
;
border-radius
:
12rpx
;
padding
:
26rpx
20rpx
24rpx
;
padding
:
26rpx
20rpx
24rpx
;
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
...
...
src/components/order/index.vue
View file @
8274b741
...
@@ -26,8 +26,8 @@
...
@@ -26,8 +26,8 @@
</view>
</view>
<view
class=
"line-view"
></view>
<view
class=
"line-view"
></view>
<view
class=
"reason-view"
v-if=
"showReason"
><text>
未通过原因:
</text>
<view
class=
"reason-view"
v-if=
"showReason"
><text
class=
"reason-text"
>
未通过原因:
</text>
<text
class=
"reason-text"
>
{{
orderData
.
auditResults
.
remark
}}
</text>
<text>
{{
orderData
.
auditResults
.
remark
}}
</text>
</view>
</view>
<view
class=
"bottom-view"
>
<view
class=
"bottom-view"
>
<view>
<view>
...
@@ -78,13 +78,15 @@
...
@@ -78,13 +78,15 @@
}
}
}
}
},
},
// waitAccept:待接单、
/* 订单类型
// waitAppointment:待预约、
waitAccept:待接单、
// waitCheckIn:待签到、
waitAppointment:待预约、
// waitFinish:待完工、
waitCheckIn:待签到、
// review: 审核中、
waitFinish:待完工、
// exception:异常单、
audit: 审核中、
// finish:已完工
exception:异常单、
finish:已完工
*/
type
:
String
,
type
:
String
,
location
:
{
// 当前坐标
location
:
{
// 当前坐标
type
:
Array
,
type
:
Array
,
...
@@ -156,7 +158,7 @@
...
@@ -156,7 +158,7 @@
.
orderBusinessType
!=
'R'
)
.
orderBusinessType
!=
'R'
)
},
},
showTime
()
{
showTime
()
{
return
[
4
,
6
].
indexOf
(
this
.
orderType
)
!=
-
1
return
[
4
,
5
,
6
].
indexOf
(
this
.
orderType
)
!=
-
1
},
},
infoTexts
()
{
infoTexts
()
{
return
{
return
{
...
@@ -222,7 +224,7 @@
...
@@ -222,7 +224,7 @@
'waitAppointment'
:
1
,
// 待预约、
'waitAppointment'
:
1
,
// 待预约、
'waitCheckIn'
:
2
,
// 待签到、
'waitCheckIn'
:
2
,
// 待签到、
'waitFinish'
:
3
,
// 待完工、
'waitFinish'
:
3
,
// 待完工、
'
review
'
:
4
,
// 审核中、
'
audit
'
:
4
,
// 审核中、
'exception'
:
5
,
// 异常单、
'exception'
:
5
,
// 异常单、
'finish'
:
6
,
//已完工
'finish'
:
6
,
//已完工
}
}
...
@@ -367,10 +369,12 @@
...
@@ -367,10 +369,12 @@
text-align
:
left
;
text-align
:
left
;
margin-top
:
30rpx
;
margin-top
:
30rpx
;
font-size
:
26rpx
;
font-size
:
26rpx
;
color
:
#666666
;
color
:
#FA5A49
;
display
:
flex
;
align-items
:
flex-start
;
.reason-text
{
.reason-text
{
color
:
#FA5A49
;
flex-shrink
:
0
;
color
:
#666666
;
}
}
}
}
...
...
src/components/popView/index.vue
View file @
8274b741
...
@@ -6,7 +6,12 @@
...
@@ -6,7 +6,12 @@
<view
class=
"order-pop-title"
>
<view
class=
"order-pop-title"
>
<text>
{{
title
}}
</text>
<text>
{{
title
}}
</text>
</view>
</view>
<view
class=
"line-view"
/>
<view
class=
"line-view"
/>
<view
class=
"order-content"
>
<view
v-if=
"count"
>
你本月还有
<text
class=
"order-content-count"
>
{{
count
}}
</text>
次拒单机会
</view>
</view>
<view
class=
"order-pop-text"
>
<view
class=
"order-pop-text"
>
<text>
{{
message
}}
</text>
<text>
{{
message
}}
</text>
</view>
</view>
...
@@ -16,7 +21,7 @@
...
@@ -16,7 +21,7 @@
取消
取消
</u-button>
</u-button>
<u-button
:custom-style=
"customStyleSave"
shape=
"circle"
type=
"primary"
@
click=
"handleClickSure"
>
<u-button
:custom-style=
"customStyleSave"
shape=
"circle"
type=
"primary"
@
click=
"handleClickSure"
>
查看
{{
buttonText
}}
</u-button>
</u-button>
</view>
</view>
</view>
</view>
...
@@ -29,7 +34,12 @@
...
@@ -29,7 +34,12 @@
props
:
{
props
:
{
visible
:
Boolean
,
visible
:
Boolean
,
title
:
String
,
title
:
String
,
message
:
String
,
message
:
String
,
count
:
Number
,
// 剩余次数
buttonText
:
{
// 确定按钮
type
:
String
,
default
:
'查看'
},
},
},
data
()
{
data
()
{
return
{}
return
{}
...
@@ -76,21 +86,32 @@
...
@@ -76,21 +86,32 @@
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.order-pop-view
{
.order-pop-view
{
padding
:
30rpx
;
padding
:
30rpx
;
min-height
:
520rpx
;
.order-pop-title
{
.order-pop-title
{
font-size
:
40rpx
;
font-size
:
40rpx
;
margin-top
:
4
0rpx
;
margin-top
:
3
0rpx
;
margin-bottom
:
40
rpx
;
margin-bottom
:
34
rpx
;
text-align
:
center
;
text-align
:
center
;
color
:
#333333
;
color
:
#333333
;
}
.order-content
{
min-height
:
14rpx
;
text-align
:
center
;
color
:
#333333
;
font-size
:
32rpx
;
margin-top
:
26rpx
;
.order-content-count
{
color
:
#FA5A49
;
}
}
}
.order-pop-text
{
.order-pop-text
{
color
:
#999999
;
color
:
#999999
;
text-align
:
center
;
text-align
:
center
;
margin-top
:
4
0rpx
;
margin-top
:
3
0rpx
;
font-size
:
28rpx
;
font-size
:
28rpx
;
margin-bottom
:
26
0rpx
;
// margin-bottom: 18
0rpx;
}
}
.line-view
{
.line-view
{
...
...
src/pages.json
View file @
8274b741
...
@@ -324,9 +324,10 @@
...
@@ -324,9 +324,10 @@
"path"
:
"pages/photo/index"
,
//启动页面,必选
"path"
:
"pages/photo/index"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},
},
{
{
"name"
:
"工单搜索"
,
//
gaomingbo
"path"
:
"pages/order/search"
,
"name"
:
"工单-过程反馈"
,
"path"
:
"pages/order/feedback"
,
"query"
:
""
"query"
:
""
},
},
{
{
...
@@ -368,6 +369,11 @@
...
@@ -368,6 +369,11 @@
"name"
:
"订单 - 拒单"
,
//模式名称
"name"
:
"订单 - 拒单"
,
//模式名称
"path"
:
"pages/order/refuse"
,
//启动页面,必选
"path"
:
"pages/order/refuse"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},
{
"name"
:
"订单 - 过程反馈"
,
//模式名称
"path"
:
"pages/order/feedback"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
}
}
]
]
}
}
...
...
src/pages/index/index.vue
View file @
8274b741
...
@@ -13,12 +13,12 @@
...
@@ -13,12 +13,12 @@
</view>
</view>
<image
class=
"right-icon"
:src=
"shouyeyouImage"
></image>
<image
class=
"right-icon"
:src=
"shouyeyouImage"
></image>
</view>
</view>
<view
class=
"line-view"
v-if=
"index !=
2
"
></view>
<view
class=
"line-view"
v-if=
"index !=
1
"
></view>
</view>
</view>
</view>
</view>
</view>
</view>
<!-- 订单推荐吸顶 -->
<!-- 订单推荐吸顶 -->
<u-sticky>
<u-sticky
offset-top=
"60"
>
<view
class=
"sticky"
>
<view
class=
"sticky"
>
<text>
订单推荐
</text>
<text>
订单推荐
</text>
</view>
</view>
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
},
},
data
()
{
data
()
{
return
{
return
{
status
:
0
,
// 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',
5=>'已签约',6=>'未支付保证金
',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
status
:
0
,
// 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',
6=>'已签约
',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
location
:
[
116.3896
,
39.91917
],
// 经纬度
location
:
[
116.3896
,
39.91917
],
// 经纬度
title
:
false
,
title
:
false
,
title
:
"Hello"
,
title
:
"Hello"
,
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
search
:
{
search
:
{
token
:
""
,
token
:
""
,
pageNumber
:
0
,
pageNumber
:
0
,
pageSize
:
10
0
,
pageSize
:
10
,
},
},
bottomLoading
:
false
bottomLoading
:
false
};
};
...
@@ -179,8 +179,8 @@
...
@@ -179,8 +179,8 @@
self
.
$u
.
api
.
listByNotice
().
then
((
res
)
=>
{
self
.
$u
.
api
.
listByNotice
().
then
((
res
)
=>
{
uni
.
stopPullDownRefresh
()
// 结束下拉刷新
uni
.
stopPullDownRefresh
()
// 结束下拉刷新
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
&&
res
.
data
.
length
>
3
)
{
if
(
res
.
data
&&
res
.
data
.
length
>
2
)
{
self
.
messageList
=
res
.
data
.
slice
(
0
,
3
);
self
.
messageList
=
res
.
data
.
slice
(
0
,
2
);
}
else
{
}
else
{
self
.
messageList
=
res
.
data
||
[];
self
.
messageList
=
res
.
data
||
[];
}
}
...
@@ -197,8 +197,8 @@
...
@@ -197,8 +197,8 @@
self
.
$u
.
api
.
listByRecommendOrder
(
self
.
search
).
then
((
res
)
=>
{
self
.
$u
.
api
.
listByRecommendOrder
(
self
.
search
).
then
((
res
)
=>
{
uni
.
stopPullDownRefresh
()
// 结束下拉刷新
uni
.
stopPullDownRefresh
()
// 结束下拉刷新
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
&&
res
.
data
.
length
>
0
)
{
if
(
res
.
data
&&
res
.
data
.
l
ist
&&
res
.
data
.
list
.
l
ength
>
0
)
{
self
.
orderList
.
push
(...
res
.
data
);
self
.
orderList
.
push
(...
res
.
data
.
list
);
}
}
}
else
{
}
else
{
console
.
log
(
res
.
message
,
"初始化订单列表异常"
);
console
.
log
(
res
.
message
,
"初始化订单列表异常"
);
...
@@ -235,10 +235,12 @@
...
@@ -235,10 +235,12 @@
handleScroll
()
{
handleScroll
()
{
console
.
log
(
"-----scroll-------"
);
console
.
log
(
"-----scroll-------"
);
},
},
/* 立即入驻 */
immediatelyIn
()
{
immediatelyIn
()
{
if
(
this
.
vuex_token
)
{
if
(
this
.
vuex_token
)
{
//
0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
//
用户已登录
var
pageIndex
=
1
;
var
pageIndex
=
1
;
// 0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
switch
(
this
.
status
)
{
switch
(
this
.
status
)
{
case
1
:
case
1
:
case
2
:
case
2
:
...
@@ -266,6 +268,7 @@
...
@@ -266,6 +268,7 @@
"/pages/settle/prompt?pageIndex="
+
pageIndex
:
"/pages/settle/index"
,
"/pages/settle/prompt?pageIndex="
+
pageIndex
:
"/pages/settle/index"
,
});
});
}
else
{
}
else
{
// 用户未登录
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
"pages/login/index"
,
url
:
"pages/login/index"
,
});
});
...
@@ -294,7 +297,7 @@
...
@@ -294,7 +297,7 @@
border-radius
:
12rpx
;
border-radius
:
12rpx
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
padding
:
12rpx
30rpx
;
padding
:
12rpx
30rpx
;
height
:
252
rpx
;
height
:
174
rpx
;
}
}
.msg-content
{
.msg-content
{
...
...
src/pages/learn/curriculum.vue
View file @
8274b741
...
@@ -3,30 +3,34 @@
...
@@ -3,30 +3,34 @@
<view
class=
"title"
>
<view
class=
"title"
>
课程简介
课程简介
</view>
</view>
<view
class=
"u-content"
>
<u-parse
:html=
"courseInfo.intro"
></u-parse>
</view>
<view
class=
"lecturer"
>
<view
class=
"lecturer"
>
<view
class=
""
style=
"font-size: 40rpx;font-weight: bold;margin: 30rpx 0;"
>
<view
class=
""
v-if=
"courseInfo.isTeachers"
>
讲师
<view
class=
""
style=
"font-size: 40rpx;font-weight: bold;margin: 30rpx 0;"
>
</view>
讲师
<view
class=
""
style=
"display: flex;"
>
</view>
<image
src=
"../../static/logo.png"
mode=
""
></image>
<view
class=
""
style=
"display: flex;"
>
<view
style=
"font-size: 30rpx;font-weight:1000;margin: 19px 24px;"
>
扳手卢老师
</view>
<image
src=
"../../static/logo.png"
mode=
""
></image>
<view
style=
"font-size: 30rpx;font-weight:1000;margin: 19px 24px;"
>
{{
courseInfo
.
teacher
.
name
}}
</view>
</view>
</view>
</view>
<view
class=
""
style=
"margin: 36rpx 0;"
>
<view
class=
""
style=
"margin: 36rpx 0;"
>
<view
class=
""
style=
"font-size: 40rpx;font-weight:1000"
>
<view
class=
""
style=
"font-size: 40rpx;font-weight:1000"
>
目录
目录
</view>
</view>
<view
v-for=
"
item
in list"
>
<view
v-for=
"
(item,index)
in list"
>
<view
class=
"chapter"
>
<view
class=
"chapter"
>
{{
item
.
name
}}
{{
item
.
name
}}
</view>
</view>
<view
class=
"video"
v-for=
"
key
in item.section"
@
click=
details(key.id)
>
<view
class=
"video"
v-for=
"
(section,key)
in item.section"
@
click=
details(key.id)
>
<view
class=
"video_1"
>
<view
class=
"video_1"
>
<view
class=
"text"
v-text=
"wareType(key.ware)"
>
<view
class=
"text"
v-text=
"wareType(section.ware)"
>
</view>
</view>
<text
>
1-
{{
key
.
order
}}
</text>
<text
class=
"texts"
>
{{
index
+
1
}}
-
{{
key
+
1
}}
</text>
<text
class=
"text2"
>
{{
key
.
name
}}
</text>
<text
class=
"text2"
>
{{
section
.
name
}}
</text>
<text
class=
"text3"
v-text=
"
key
.isLearned==false?'未开始':'完成'"
></text>
<text
class=
"text3"
v-text=
"
section
.isLearned==false?'未开始':'完成'"
></text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -45,6 +49,11 @@
...
@@ -45,6 +49,11 @@
},
},
list
:[],
list
:[],
examId
:
1
,
examId
:
1
,
courseInfo
:
{
intro
:
''
,
isTeachers
:
false
,
teacher
:
{}
}
}
}
},
},
onLoad
(
a
){
onLoad
(
a
){
...
@@ -52,8 +61,31 @@
...
@@ -52,8 +61,31 @@
this
.
params
.
course_id
=
a
.
course_id
this
.
params
.
course_id
=
a
.
course_id
console
.
log
(
this
.
params
.
course_id
)
console
.
log
(
this
.
params
.
course_id
)
this
.
getCapterDetails
()
this
.
getCapterDetails
()
this
.
getCourseInfo
()
},
},
methods
:
{
methods
:
{
getCourseInfo
()
{
let
param
=
{
course_id
:
this
.
params
.
course_id
};
this
.
$u
.
api
.
CourseList
(
param
)
.
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
)
{
this
.
courseInfo
.
intro
=
res
.
data
.
course
.
intro
;
this
.
courseInfo
.
isTeachers
=
res
.
data
.
course
.
teachers
.
length
>
0
;
this
.
courseInfo
.
teacher
=
this
.
courseInfo
.
isTeachers
?
res
.
data
.
course
.
teachers
[
0
]
:
{};
}
}
})
.
catch
((
err
)
=>
{
uni
.
showToast
({
title
:
err
,
icon
:
"none"
,
});
});
},
//获取章节详情
//获取章节详情
getCapterDetails
()
{
getCapterDetails
()
{
console
.
log
(
'获取章节详情'
)
console
.
log
(
'获取章节详情'
)
...
@@ -133,7 +165,7 @@
...
@@ -133,7 +165,7 @@
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
.title
{
.title
{
height
:
1
64rpx
;
height
:
64rpx
;
font-size
:
40rpx
;
font-size
:
40rpx
;
font-weight
:
bold
;
font-weight
:
bold
;
margin
:
24rpx
34rpx
;
margin
:
24rpx
34rpx
;
...
@@ -158,6 +190,12 @@
...
@@ -158,6 +190,12 @@
margin
:
20rpx
0
;
margin
:
20rpx
0
;
position
:
relative
;
position
:
relative
;
width
:
100%
;
width
:
100%
;
.texts
{
border
:
1px
solid
#8F8F94
;
text-align
:
center
;
line-height
:
38rpx
;
margin-right
:
5rpx
;
}
.text
{
.text
{
width
:
100rpx
;
width
:
100rpx
;
height
:
38rpx
;
height
:
38rpx
;
...
@@ -179,4 +217,7 @@
...
@@ -179,4 +217,7 @@
right
:
0
;
right
:
0
;
}
}
}
}
.u-content
{
padding
:
0rpx
34rpx
;
}
</
style
>
</
style
>
src/pages/learn/index.vue
View file @
8274b741
...
@@ -40,57 +40,57 @@
...
@@ -40,57 +40,57 @@
<view
class=
"top"
>
<view
class=
"top"
>
<view
class=
"currency-class"
>
<view
class=
"currency-class"
>
<view
class=
"title"
>
通用课程
</view>
<view
class=
"title"
>
通用课程
</view>
<view
class=
"class1"
@
click=
ccc(
173
)
>
<view
class=
"class1"
@
click=
ccc(
courselist[0].id
)
>
<image
class=
"img"
:src=
courselist
.course.preview_
pic
mode=
""
></image>
<image
class=
"img"
:src=
courselist
[0].
pic
mode=
""
></image>
<view
class=
"right"
>
<view
class=
"right"
>
<view
class=
""
>
<view
class=
""
>
{{
courselist
[
0
].
title
}}
{{
courselist
.
course
.
name
}}
</view>
</view>
<view
class=
"intro"
v-html=
"courselist.course.intro"
>
<view
class=
"intro"
>
{{
courselist
.
course
.
intro
}}
{{
courselist
[
0
].
desc
}}
</view>
</view>
<view
class=
""
style=
"display:flex;justify-content: space-between;"
>
<view
class=
""
style=
"display:flex;justify-content: space-between;"
>
<u-line-progress
active-color=
"#2979ff"
<u-line-progress
active-color=
"#2979ff"
:percent=
courselist
.learnedInfo.learnP
ercent
style=
"width:54%;"
>
:percent=
courselist
[0].p
ercent
style=
"width:54%;"
>
</u-line-progress>
</u-line-progress>
<text
<text
v-text=
"courselist[0].status"
></text>
v-text=
"(courselist.learnedInfo.isLearned) ?(courselist.learnedInfo.learnPercent==1)?'已完成':'继续':'未观看' "
></text>
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"class1"
>
<view
class=
"class1"
@
click=
ccc(courselist[1].id)
>
<image
class=
"img"
src=
"../../static/logo.png"
mode=
""
></image>
<image
class=
"img"
:src=
courselist[1].pic
mode=
""
></image>
<view
class=
"right"
>
<view
class=
"right"
>
<view
class=
""
>
<view
class=
""
>
接单操作
{{
courselist
[
1
].
title
}}
</view>
</view>
<view
class=
""
>
<view
class=
""
>
快速学习,使用APP接单、抢单
{{
courselist
[
1
].
desc
}}
</view>
</view>
<view
class=
""
style=
"display:flex;justify-content: space-between;"
>
<view
class=
""
style=
"display:flex;justify-content: space-between;"
>
<u-line-progress
active-color=
"#2979ff"
:percent=
"30"
style=
"width:54%;"
>
<u-line-progress
active-color=
"#2979ff"
:percent=
"courselist[1].percent"
style=
"width:54%;"
>
</u-line-progress>
</u-line-progress>
<text
>
继续
</text>
<text
v-text=
"courselist[1].status"
>
</text>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"currency-class"
>
<view
class=
"currency-class"
>
<view
class=
"title"
>
技能课程
</view>
<view
class=
"title"
>
技能课程
</view>
<view
class=
"class1"
>
<view
class=
"class1"
@
click=
ccc(courselist[2].id)
>
<image
class=
"img"
src=
"../../static/logo.png"
mode=
""
></image>
<image
class=
"img"
:src=
courselist[2].pic
mode=
""
></image>
<view
class=
"right"
>
<view
class=
"right"
>
<view
class=
""
>
<view
class=
""
>
从0-1学习充电桩安装服务
{{
courselist
[
2
].
title
}}
</view>
</view>
<view
class=
""
>
<view
class=
""
>
让你全面了解充电桩市场及服务规范
{{
courselist
[
2
].
desc
}}
</view>
</view>
<view
class=
""
style=
"display:flex;justify-content: space-between;"
>
<view
class=
""
style=
"display:flex;justify-content: space-between;"
>
<u-line-progress
active-color=
"#2979ff"
:percent=
"100"
style=
"width:54%;"
>
<u-line-progress
active-color=
"#2979ff"
:percent=
"courselist[2].percent"
style=
"width:54%;"
>
</u-line-progress>
</u-line-progress>
<text
>
完成
</text>
<text
v-text=
"courselist[2].status"
>
</text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -483,10 +483,6 @@ export default {
...
@@ -483,10 +483,6 @@ export default {
text-align
:
center
;
text-align
:
center
;
margin
:
32
rpx
0
;
margin
:
32
rpx
0
;
}
}
.news
{
}
/* //在线学习 */
/* //在线学习 */
.currency-class
{
.currency-class
{
width
:
100%
;
width
:
100%
;
...
...
src/pages/learn/section.vue
View file @
8274b741
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
currentIndex
:
-
1
,
// 第几个视频
currentIndex
:
-
1
,
// 第几个视频
section_id
:
0
,
section_id
:
0
,
isShowVideo
:
false
,
isShowVideo
:
false
,
CourseSectionlist
:
{},
//节信息
CourseSectionlist
:
{
name
:
''
,
content
:
''
},
//节信息
playerOptions
:
{
playerOptions
:
{
playbackRates
:
[
0.7
,
1.0
,
1.5
,
2.0
],
//播放速度
playbackRates
:
[
0.7
,
1.0
,
1.5
,
2.0
],
//播放速度
autoplay
:
true
,
//如果true,浏览器准备好时开始回放。
autoplay
:
true
,
//如果true,浏览器准备好时开始回放。
...
@@ -145,33 +145,11 @@
...
@@ -145,33 +145,11 @@
if
(
this
.
courseStatus
&&
(
this
.
courseStatus
==
"1"
||
this
.
courseStatus
==
1
))
{
if
(
this
.
courseStatus
&&
(
this
.
courseStatus
==
"1"
||
this
.
courseStatus
==
1
))
{
return
return
}
}
this
.
changeCourseStatus
();
},
},
playerReadied
(
player
)
{
playerReadied
(
player
)
{
console
.
log
(
'i go to playerReadied gklog:'
+
this
.
gklog
)
console
.
log
(
'i go to playerReadied gklog:'
+
this
.
gklog
)
player
.
currentTime
(
this
.
gklog
)
player
.
currentTime
(
this
.
gklog
)
},
},
changeCourseStatus
()
{
let
that
=
this
;
if
(
that
.
courseId
)
{
that
.
$u
.
api
.
saveCourseRate
({
courseId
:
that
.
courseId
,
})
.
then
((
res
)
=>
{
if
(
res
.
code
!==
200
)
{
uni
.
showToast
({
icon
:
"none"
,
title
:
"更新课程状态失败"
,
});
}
});
}
else
{
uni
.
showToast
({
title
:
"课程ID为空,请重新选择课程"
,
});
}
},
getCourseSection
(
param
)
{
getCourseSection
(
param
)
{
this
.
$u
.
api
this
.
$u
.
api
.
CourseSection
(
param
)
.
CourseSection
(
param
)
...
@@ -183,15 +161,17 @@
...
@@ -183,15 +161,17 @@
console
.
log
(
this
.
CourseSectionlist
)
console
.
log
(
this
.
CourseSectionlist
)
let
wareVal
=
this
.
CourseSectionlist
.
ware
;
let
wareVal
=
this
.
CourseSectionlist
.
ware
;
this
.
isShowVideo
=
wareVal
==
"0"
;
this
.
isShowVideo
=
wareVal
==
"0"
;
this
.
courseTitle
=
res
.
data
.
name
;
this
.
courseDesc
=
res
.
data
.
content
;
this
.
section_id
=
res
.
data
.
id
;
this
.
section_content
=
res
.
data
.
content
;
if
(
this
.
isShowVideo
)
{
if
(
this
.
isShowVideo
)
{
let
coureWareList
=
res
.
data
.
courseware
;
let
coureWareList
=
res
.
data
.
courseware
;
this
.
courseSrc
=
coureWareList
[
0
].
src
;
this
.
courseSrc
=
coureWareList
[
0
].
src
;
this
.
videoTotalTime
=
parseInt
(
JSON
.
parse
(
coureWareList
[
0
].
info
).
time
);
this
.
videoTotalTime
=
parseInt
(
JSON
.
parse
(
coureWareList
[
0
].
info
).
time
);
console
.
log
(
'视频时长信息:'
+
this
.
videoTotalTime
);
console
.
log
(
'视频时长信息:'
+
this
.
videoTotalTime
);
this
.
courseTitle
=
res
.
data
.
name
;
}
else
{
this
.
courseDesc
=
res
.
data
.
content
;
this
.
updateLearnedStatusForText
();
this
.
section_id
=
res
.
data
.
id
;
this
.
section_content
=
res
.
data
.
content
;
}
}
}
}
}
}
...
@@ -205,6 +185,26 @@
...
@@ -205,6 +185,26 @@
});
});
});
});
},
},
updateLearnedStatusForText
()
{
if
(
this
.
isShowVideo
)
{
return
false
;
}
let
param
=
{
section_id
:
this
.
section_id
,
video_time
:
0
,
status
:
1
,
};
this
.
$u
.
api
.
updateLearnCourses
(
param
).
then
((
res
)
=>
{
console
.
log
(
'--'
+
this
.
howTimeToUpdateLearnedStatus
+
'更新一次观看状态--time:'
+
nowTime
);
}).
catch
((
err
)
=>
{
console
.
log
(
'--------updateLearnedStatusForText---------'
);
console
.
log
(
err
);
uni
.
showToast
({
title
:
err
,
icon
:
"none"
,
});
});
},
updateLearnedStatus
(
nowTime
)
{
updateLearnedStatus
(
nowTime
)
{
if
(
this
.
gklog
!=
nowTime
&&
nowTime
%
this
.
howTimeToUpdateLearnedStatus
==
0
)
{
if
(
this
.
gklog
!=
nowTime
&&
nowTime
%
this
.
howTimeToUpdateLearnedStatus
==
0
)
{
if
(
nowTime
<
this
.
howLongIsLearned
)
{
if
(
nowTime
<
this
.
howLongIsLearned
)
{
...
@@ -221,6 +221,13 @@
...
@@ -221,6 +221,13 @@
};
};
this
.
$u
.
api
.
updateLearnCourses
(
param
).
then
((
res
)
=>
{
this
.
$u
.
api
.
updateLearnCourses
(
param
).
then
((
res
)
=>
{
console
.
log
(
'--'
+
this
.
howTimeToUpdateLearnedStatus
+
'更新一次观看状态--time:'
+
nowTime
);
console
.
log
(
'--'
+
this
.
howTimeToUpdateLearnedStatus
+
'更新一次观看状态--time:'
+
nowTime
);
}).
catch
((
err
)
=>
{
console
.
log
(
'--------updateLearnedStatus---------'
);
console
.
log
(
err
);
uni
.
showToast
({
title
:
err
,
icon
:
"none"
,
});
});
});
}
}
}
}
...
@@ -345,7 +352,7 @@
...
@@ -345,7 +352,7 @@
}
}
}
}
}
}
.u-content
{
.u-content
{
// margin-top: 10rpx;
// margin-top: 10rpx;
padding
:
40rpx
30rpx
;
padding
:
40rpx
30rpx
;
...
...
src/pages/order/detail.vue
View file @
8274b741
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<text>
客户信息:
</text>
<text>
客户信息:
</text>
<text>
{{
order
.
contactName
}}
</text>
<text>
{{
order
.
contactName
}}
</text>
</view>
</view>
<u-image
width=
"60rpx"
height=
"60rpx"
:src=
"phoneIcon"
></u-image>
<u-image
width=
"60rpx"
height=
"60rpx"
:src=
"phoneIcon"
@
click=
"phoneToCustomer(order.contactPhone)"
></u-image>
</view>
</view>
<view
class=
"order-cell"
>
<view
class=
"order-cell"
>
<text>
联系方式:
</text>
<text>
联系方式:
</text>
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<u-icon
name=
"map"
size=
"28"
></u-icon>
<u-icon
name=
"map"
size=
"28"
></u-icon>
<text
class=
"address-txt"
>
{{
order
.
contactAddress
}}
</text>
<text
class=
"address-txt"
>
{{
order
.
contactAddress
}}
</text>
</view>
</view>
<u-image
width=
"60rpx"
height=
"60rpx"
:src=
"navigationIcon"
></u-image>
<u-image
width=
"60rpx"
height=
"60rpx"
:src=
"navigationIcon"
@
click=
"openLocation"
></u-image>
</view>
</view>
</view>
</view>
<view
class=
"card order-item"
>
<view
class=
"card order-item"
>
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
<!-- 过程反馈 -->
<!-- 过程反馈 -->
<view
class=
"left"
>
<view
class=
"left"
>
<view
v-show=
"allowFeedback"
@
click=
"clickFeedback"
class=
"button"
>
<view
v-show=
"allowFeedback"
@
click=
"clickFeedback"
class=
"button"
>
过程反馈
<text>
过程反馈
</text>
</view>
</view>
</view>
</view>
<!--接单,抢单,已被抢, 预约 ,签到 ,去完工 timestampDiff(order.currentOverTime)>0 -->
<!--接单,抢单,已被抢, 预约 ,签到 ,去完工 timestampDiff(order.currentOverTime)>0 -->
...
@@ -153,7 +153,10 @@
...
@@ -153,7 +153,10 @@
btnClass
:
'appoint-btn'
,
btnClass
:
'appoint-btn'
,
takeStatus
:
false
,
takeStatus
:
false
,
errorSignIn
:
false
,
errorSignIn
:
false
,
scenePhoto
:
true
scenePhoto
:
true
,
isErrorSign
:
false
,
errorSignUrl
:
''
,
isAllowDianhuaAndDaohang
:
false
}
}
},
},
onLoad
(
option
)
{
onLoad
(
option
)
{
...
@@ -170,10 +173,22 @@
...
@@ -170,10 +173,22 @@
},
},
computed
:
{
computed
:
{
phoneIcon
()
{
phoneIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/dianhua-1@2x.png'
//self-support/icon/dianhua-0@2x.png
if
(
this
.
isAllowDianhuaAndDaohang
){
return
process
.
uniEnv
.
qn_base_url
+
'icon/dianhua-1@2x.png'
}
else
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/dianhua-0@2x.png'
}
},
},
navigationIcon
()
{
navigationIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/daohang-1@2x.png'
//self-support/icon/daohang-0@2x.png
if
(
this
.
isAllowDianhuaAndDaohang
){
return
process
.
uniEnv
.
qn_base_url
+
'icon/daohang-1@2x.png'
}
else
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/daohang-0@2x.png'
}
},
},
centerButtonClass
()
{
centerButtonClass
()
{
let
btnClass
=
"appoint-btn"
let
btnClass
=
"appoint-btn"
...
@@ -181,6 +196,45 @@
...
@@ -181,6 +196,45 @@
}
}
},
},
methods
:
{
methods
:
{
openLocation
(){
if
(
this
.
isAllowDianhuaAndDaohang
){
uni
.
getLocation
({
type
:
'gcj02'
,
//返回可以用于uni.openLocation的经纬度
success
:
function
(
res
)
{
const
latitude
=
res
.
latitude
;
const
longitude
=
res
.
longitude
;
uni
.
openLocation
({
latitude
:
latitude
,
longitude
:
longitude
,
success
:
function
()
{
console
.
log
(
'success'
);
}
});
}
});
}
},
phoneToCustomer
(
phone
){
// 联系客户
if
(
this
.
isAllowDianhuaAndDaohang
){
uni
.
makePhoneCall
({
phoneNumber
:
phone
,
//仅为示例
complete
()
{
}
});
this
.
contactTime
()
}
},
contactTime
()
{
let
self
=
this
var
data
=
{}
self
.
$u
.
api
.
contactTime
(
data
,
this
.
order
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
console
.
log
(
"==="
,
res
.
data
)
}
else
{
console
.
log
(
res
.
message
);
}
})
},
scenePhotoClick
()
{
// 跳转拍照小程序
scenePhotoClick
()
{
// 跳转拍照小程序
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'pages/photo/list?orderId='
+
this
.
order
.
orderId
+
'&brandId='
+
this
.
order
.
lianbaoBrandId
+
'&brand='
+
this
.
order
.
brandName
url
:
'pages/photo/list?orderId='
+
this
.
order
.
orderId
+
'&brandId='
+
this
.
order
.
lianbaoBrandId
+
'&brand='
+
this
.
order
.
brandName
...
@@ -192,22 +246,16 @@
...
@@ -192,22 +246,16 @@
this
.
takeStatus
=
true
this
.
takeStatus
=
true
},
},
closeTake
(
img
)
{
closeTake
(
img
)
{
console
.
log
(
img
)
this
.
takeStatus
=
false
this
.
takeStatus
=
false
// 获取返回的图片 ,如果返回的图片存在则直接异常签约,成功后跳转到去完工页面,
// 获取返回的图片 ,如果返回的图片存在则直接异常签约,成功后跳转到去完工页面,
if
(
img
){
// 拍照完成
if
(
img
){
// 拍照完成
this
.
$refs
.
uToast
.
show
({
this
.
isErrorSign
=
true
title
:
'签到成功'
,
this
.
errorSignUrl
=
img
type
:
'success'
,
this
.
handleBtn
()
url
:
'pages/order/detail'
,
params
:
{
id
:
1
}
})
}
else
{
}
else
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
title
:
'异常签到失败,请先按要求拍照'
,
title
:
'异常签到失败,请先按要求拍照'
,
type
:
'waning'
type
:
'wa
r
ning'
})
})
}
}
},
},
...
@@ -222,14 +270,8 @@
...
@@ -222,14 +270,8 @@
console
.
log
(
"==="
,
res
.
data
)
console
.
log
(
"==="
,
res
.
data
)
self
.
order
=
res
.
data
self
.
order
=
res
.
data
this
.
getCurrentBtn
()
this
.
getCurrentBtn
()
this
.
visibale
=
true
if
(
self
.
order
.
isFirstOrder
){
// self.order.operationType = "accept"
}
// }else{
// self.order.operationType = "appointment"
// }
// self.method =self.operationDoing[self.order.operationType].action;
// // 根据工单的状态确定是否需要过程反馈
// self.allowFeedback = self.allowFeedbackStatus.indexOf(self.order.orderStatus)>0
}
else
{
}
else
{
console
.
log
(
res
.
message
,
"获取订单详情失败!"
);
console
.
log
(
res
.
message
,
"获取订单详情失败!"
);
}
}
...
@@ -238,7 +280,7 @@
...
@@ -238,7 +280,7 @@
loadOrderRecord
()
{
loadOrderRecord
()
{
let
self
=
this
let
self
=
this
var
param
=
{
var
param
=
{
'orderId'
:
self
.
orderId
orderId
:
self
.
orderId
};
};
self
.
$u
.
api
.
listOrderRecord
(
param
).
then
((
res
)
=>
{
self
.
$u
.
api
.
listOrderRecord
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
...
@@ -248,9 +290,6 @@
...
@@ -248,9 +290,6 @@
}
}
})
})
},
},
rejectOrder
()
{
// 拒单
console
.
log
(
"点击拒单"
)
},
/**
/**
* 点击下一周
* 点击下一周
* @param {Object} data
* @param {Object} data
...
@@ -297,6 +336,7 @@
...
@@ -297,6 +336,7 @@
this
.
allowFeedback
=
true
this
.
allowFeedback
=
true
this
.
showCenterBtn
=
true
this
.
showCenterBtn
=
true
this
.
showTimeSelect
=
true
this
.
showTimeSelect
=
true
this
.
isAllowDianhuaAndDaohang
=
true
this
.
submitType
=
"workerAppointment"
this
.
submitType
=
"workerAppointment"
}
else
if
(
orderStatus
===
31
&&
this
.
order
.
appointmentDatetime
)
{
}
else
if
(
orderStatus
===
31
&&
this
.
order
.
appointmentDatetime
)
{
// 签到
// 签到
...
@@ -310,36 +350,44 @@
...
@@ -310,36 +350,44 @@
// 完工
// 完工
this
.
centerButton
=
"filish"
this
.
centerButton
=
"filish"
this
.
centerButtonText
=
"去完工"
this
.
centerButtonText
=
"去完工"
this
.
submitType
=
"toFilish"
this
.
allowFeedback
=
true
this
.
allowFeedback
=
true
this
.
showCenterBtn
=
true
this
.
showCenterBtn
=
true
this
.
scenePhoto
=
true
this
.
scenePhoto
=
true
}
else
{}
}
else
{}
},
},
handleBtn
()
{
handleBtn
()
{
if
(
this
.
centerButton
===
"filish"
){
this
.
filish
()
return
}
if
(
!
this
.
submitType
){
if
(
!
this
.
submitType
){
return
;
return
;
}
}
const
data
=
{}
const
data
=
{}
// 不同请求类型传递不同数据
// 不同请求类型传递不同数据
if
(
this
.
submitType
===
'maintainWorkerCheckin'
)
{
// 签到
if
(
this
.
submitType
===
'orderAccept'
){
// 接单
// 检查见到距离是否符合
if
(
this
.
getDistance
(
this
.
order
.
contactAddressLatitud
,
this
.
order
.
contactAddressLongitud
)
>
3
){
this
.
$refs
.
uToast
.
show
({
title
:
'签到失败,请点击异常签到处理或联系客服'
,
type
:
'error'
})
return
}
data
.
remark
=
"123"
data
.
revert
=
true
}
else
if
(
this
.
submitType
===
'orderAccept'
){
// 接单
data
.
orderId
=
this
.
order
.
orderId
data
.
orderId
=
this
.
order
.
orderId
}
else
if
(
this
.
submitType
===
'orderGan'
){
// 抢单
}
else
if
(
this
.
submitType
===
'orderGan'
){
// 抢单
data
.
orderId
=
this
.
order
.
orderId
data
.
orderId
=
this
.
order
.
orderId
}
else
if
(
this
.
submitType
===
'workerAppointment'
){
// 预约
data
.
appointmentDatetime
=
''
data
.
appointmentDatetimeRange
=
''
if
(
!
data
.
appointmentDatetime
||
!
data
.
appointmentDatetimeRange
){
this
.
commonToast
(
'请选择预约时间和时间段'
,
'waring'
)
return
}
}
else
if
(
this
.
submitType
===
'maintainWorkerCheckin'
)
{
// 签到
// 检查见到距离是否符合
if
(
!
this
.
isErrorSign
){
if
(
this
.
getDistance
(
this
.
order
.
contactAddressLatitud
,
this
.
order
.
contactAddressLongitud
)
>
3
){
this
.
commonToast
(
'签到失败,请点击异常签到处理或联系客服'
,
'error'
)
return
}
}
data
.
exception
=
this
.
isErrorSign
data
.
coordinate
=
this
.
dataValue
?
this
.
dataValue
[
0
]
+
','
+
this
.
dataValue
[
1
]:
''
data
.
url
=
this
.
errorSignUrl
?
this
.
errorSignUrl
:
''
}
else
if
(
this
.
submitType
===
'toFilish'
){
// 去完工
this
.
filish
()
return
}
}
this
.
$u
.
api
[
this
.
submitType
](
data
,
this
.
order
.
orderId
).
then
(
res
=>
{
this
.
$u
.
api
[
this
.
submitType
](
data
,
this
.
order
.
orderId
).
then
(
res
=>
{
if
((
res
.
data
.
code
!==
undefined
&&
res
.
data
.
code
===
200
)
if
((
res
.
data
.
code
!==
undefined
&&
res
.
data
.
code
===
200
)
...
@@ -349,8 +397,7 @@
...
@@ -349,8 +397,7 @@
type
:
'success'
,
type
:
'success'
,
url
:
'pages/order/detail'
,
url
:
'pages/order/detail'
,
params
:
{
params
:
{
id
:
1
,
id
:
this
.
order
.
orderId
menu
:
2
}
}
})
})
}
else
{
}
else
{
...
@@ -363,6 +410,14 @@
...
@@ -363,6 +410,14 @@
}
}
})
})
},
},
commonToast
(
message
,
type
,
url
,
params
){
// 统一得toast
this
.
$refs
.
uToast
.
show
({
title
:
message
,
type
:
type
,
url
:
url
,
params
:
params
})
},
isGan
(){
isGan
(){
this
.
centerButtonText
=
"已被抢"
this
.
centerButtonText
=
"已被抢"
this
.
submitType
=
""
this
.
submitType
=
""
...
@@ -380,6 +435,17 @@
...
@@ -380,6 +435,17 @@
url
:
'pages/order/complete?orderId='
+
this
.
order
.
orderId
url
:
'pages/order/complete?orderId='
+
this
.
order
.
orderId
})
})
},
},
rejectOrder
()
{
// 拒单
// 检查是否可以拒单
var
data
=
{}
this
.
$u
.
api
.
checkRejectable
(
data
).
then
(
res
=>
{
if
(
res
.
data
.
code
===
200
&&
res
.
data
.
data
===
true
)
{
uni
.
navigateTo
({
url
:
'pages/order/refuse?orderId='
+
this
.
order
.
orderId
})
}
})
},
/**
/**
* 获取当前位置的经纬度
* 获取当前位置的经纬度
*/
*/
...
@@ -441,13 +507,14 @@
...
@@ -441,13 +507,14 @@
this
.
btnClass
=
'timeOut-btn'
this
.
btnClass
=
'timeOut-btn'
self
.
$refs
[
'uCountDown'
].
seconds
+=
2
self
.
$refs
[
'uCountDown'
].
seconds
+=
2
}
}
},
handleClick
(){
},
handleClick
(){
this
.
visibale
=
false
this
.
visibale
=
false
// 去完工
// 去完工
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'pages/photo/list'
url
:
'pages/photo/list'
})
})
}
}
}
}
};
};
</
script
>
</
script
>
...
...
src/pages/order/feedback.vue
View file @
8274b741
...
@@ -20,14 +20,15 @@
...
@@ -20,14 +20,15 @@
<u-tabs
<u-tabs
:list=
"tabList"
:list=
"tabList"
:current=
"curTab"
:current=
"curTab"
height=
"
8
0"
height=
"
6
0"
gutter=
"89"
gutter=
"89"
bar-height=
"4"
bar-height=
"4"
bar-width=
"44"
bar-width=
"44"
bg-color=
"none"
bg-color=
"none"
active-color=
"#FFFFFF"
active-color=
"#FFFFFF"
inactive-color=
"#
FFFFFF
"
inactive-color=
"#
DEDEDE
"
font-size=
"32"
font-size=
"32"
bold
@
change=
"changeTab"
@
change=
"changeTab"
></u-tabs>
></u-tabs>
</view>
</view>
...
@@ -35,6 +36,7 @@
...
@@ -35,6 +36,7 @@
<!--
<view
class=
"con-box"
>
<!--
<view
class=
"con-box"
>
</view>
-->
</view>
-->
<view
class=
"content-view"
>
<view
class=
"con-box"
>
<view
class=
"con-box"
>
<view
class=
"title"
>
{{
feedback
.
own
.
title
}}
</view>
<view
class=
"title"
>
{{
feedback
.
own
.
title
}}
</view>
<view
class=
"u-flex u-flex-wrap"
>
<view
class=
"u-flex u-flex-wrap"
>
...
@@ -43,7 +45,7 @@
...
@@ -43,7 +45,7 @@
:key=
"index"
:key=
"index"
@
click=
"changeOwn(index)"
@
click=
"changeOwn(index)"
:class=
"
{'txt-item':true,'active': (trace.reasonRelegation == index)}">
:class=
"
{'txt-item':true,'active': (trace.reasonRelegation == index)}">
<text
class=
"txt"
>
{{
i
ndex
}}
</text>
<text
class=
"txt"
>
{{
i
tem
}}
</text>
</view>
</view>
</view>
</view>
<u-gap
height=
"30"
></u-gap>
<u-gap
height=
"30"
></u-gap>
...
@@ -53,16 +55,21 @@
...
@@ -53,16 +55,21 @@
v-for=
"(txt, index) in options[curTab][trace.reasonRelegation]"
v-for=
"(txt, index) in options[curTab][trace.reasonRelegation]"
:key=
"index"
:key=
"index"
@
click=
"changeType(txt)"
@
click=
"changeType(txt)"
:class=
"
{'txt-item':true,'active': (trace.reason == txt)}">
:class=
"
{'txt-item':true,'active': (trace.reason == txt)}"
style="width: 306rpx;margin-right: 18rpx"
>
<text
class=
"txt"
>
{{
txt
}}
</text>
<text
class=
"txt"
>
{{
txt
}}
</text>
</view>
</view>
</view>
</view>
<u-input
v-show=
"showRemark"
v-model=
"trace.remark"
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
></u-input>
<view
class=
"input-view"
v-show=
"showRemark"
>
<u-input
v-model=
"trace.remark"
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
></u-input>
</view>
</view>
</view>
<view
class=
"time-view"
>
<appoint-time
@
dateChange=
"dateChange"
@
timeChange=
"timeChange"
@
weekChange=
"weekChange"
></appoint-time>
<appoint-time
@
dateChange=
"dateChange"
@
timeChange=
"timeChange"
@
weekChange=
"weekChange"
></appoint-time>
</view>
</view>
</view>
</view>
<view
class=
"
u-m-60
"
>
<view
class=
"
bottom-view
"
>
<button
class=
"btn
"
@
click=
"submitForm"
:loading=
"submiting"
:disabled=
"disabledSubmit"
>
确定
</button>
<button
class=
"btn
, bottom-btn"
@
click=
"submitForm"
:loading=
"submiting"
:disabled=
"disabledSubmit"
><text
class=
"button-text"
>
确定
</text>
</button>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -134,6 +141,7 @@
...
@@ -134,6 +141,7 @@
},
},
},
},
async
onLoad
(
e
)
{
async
onLoad
(
e
)
{
this
.
$u
.
vuex
(
'vuex_token'
,
'RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5'
);
this
.
orderId
=
1
this
.
orderId
=
1
this
.
categoryId
=
88
this
.
categoryId
=
88
if
(
e
)
{
if
(
e
)
{
...
@@ -144,9 +152,11 @@
...
@@ -144,9 +152,11 @@
title
:
"数据加载中"
,
title
:
"数据加载中"
,
mask
:
true
mask
:
true
})
})
this
.
loadCalendar
()
await
this
.
initPageData
()
await
this
.
initPageData
()
},
},
methods
:
{
methods
:
{
/* 初始化页面数据 */
async
initPageData
()
{
async
initPageData
()
{
let
self
=
this
let
self
=
this
let
params
=
{
categoryId
:
self
.
categoryId
}
let
params
=
{
categoryId
:
self
.
categoryId
}
...
@@ -158,6 +168,7 @@
...
@@ -158,6 +168,7 @@
}
}
uni
.
hideLoading
()
uni
.
hideLoading
()
},
},
/* 组装参数 */
buildConfig
()
{
buildConfig
()
{
let
self
=
this
let
self
=
this
if
(
self
.
config
)
{
if
(
self
.
config
)
{
...
@@ -169,6 +180,7 @@
...
@@ -169,6 +180,7 @@
})
})
}
}
},
},
/* 初始化参数 */
initParams
()
{
initParams
()
{
let
self
=
this
let
self
=
this
if
(
self
.
config
)
{
if
(
self
.
config
)
{
...
@@ -188,6 +200,17 @@
...
@@ -188,6 +200,17 @@
}
}
}
}
},
},
/* 加载日历数据 */
async
loadCalendar
()
{
let
self
=
this
let
res
=
await
this
.
$u
.
api
.
workerCalendar
()
if
(
res
&&
res
.
code
==
200
)
{
}
debugger
},
/**
/**
* 切换tab项
* 切换tab项
*/
*/
...
@@ -257,11 +280,13 @@
...
@@ -257,11 +280,13 @@
height
:
100vh
;
height
:
100vh
;
overflow
:
auto
;
overflow
:
auto
;
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
background-image
:
linear-gradient
(
to
top
,
#F4F5F7
0%
,
#2272FF
10
0%
);
background-image
:
linear-gradient
(
to
top
,
#F4F5F7
0%
,
#2272FF
5
0%
);
background-size
:
750rpx
600rpx
;
background-size
:
750rpx
600rpx
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
}
}
.feedback-box
{
.feedback-box
{
display
:
flex
;
flex-direction
:
column
;
.header
{
.header
{
padding
:
12rpx
30rpx
40rpx
30rpx
;
padding
:
12rpx
30rpx
40rpx
30rpx
;
display
:
flex
;
display
:
flex
;
...
@@ -280,9 +305,43 @@
...
@@ -280,9 +305,43 @@
.top-tab
{
.top-tab
{
text-align
:
center
;
text-align
:
center
;
}
}
.content
{
display
:
flex
;
flex-direction
:
column
;
overflow
:
hidden
;
margin-bottom
:
188rpx
;
.content-view
{
height
:
100%
;
border-radius
:
12rpx
;
overflow
:
auto
;
margin-top
:
30rpx
;
.time-view
{
border-radius
:
12rpx
;
background-color
:
#FFFFFF
;
padding-bottom
:
20rpx
;
}
}
}
.bottom-view
{
position
:
fixed
;
bottom
:
44rpx
;
width
:
100%
;
}
.bottom-btn
{
height
:
104rpx
;
width
:
600rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
.button-text
{
font-size
:
32rpx
;
font-weight
:
bold
;
}
}
.con-box
{
.con-box
{
margin-top
:
30rpx
;
padding
:
30rpx
30rpx
8rpx
30rpx
;
padding
:
30rpx
30rpx
28rpx
30rpx
;
border-radius
:
12rpx
;
border-radius
:
12rpx
;
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
.title
{
.title
{
...
@@ -293,28 +352,39 @@
...
@@ -293,28 +352,39 @@
}
}
&
>
.u-flex
{
&
>
.u-flex
{
margin-top
:
40rpx
;
margin-top
:
40rpx
;
margin-right
:
-2
0
rpx
;
margin-right
:
-2
4
rpx
;
.txt-item
{
.txt-item
{
border-radius
:
12rpx
;
border-radius
:
12rpx
;
padding
:
24rpx
38rpx
;
padding
:
24rpx
38rpx
;
min-width
:
196rpx
;
width
:
196rpx
;
height
:
72rpx
;
text-align
:
center
;
text-align
:
center
;
margin-right
:
2
0
rpx
;
margin-right
:
2
2
rpx
;
margin-bottom
:
20rpx
;
margin-bottom
:
20rpx
;
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
&
.active
{
&
.active
{
background-color
:
#2272FF
;
background-color
:
#2272FF
;
.txt
{
.txt
{
color
:
#fff
;
color
:
#fff
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
white-space
:
nowrap
;
}
}
}
}
}
}
}
}
.txt
{
.txt
{
display
:block
;
display
:block
;
font-size
:
26rpx
;
font-size
:
26rpx
;
line-height
:
26rpx
;
line-height
:
26rpx
;
color
:
#333
;
color
:
#333
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
white-space
:
nowrap
;
}
.input-view
{
margin-bottom
:
30rpx
;
}
}
.textarea
{
.textarea
{
...
...
src/pages/order/index.vue
View file @
8274b741
...
@@ -107,7 +107,7 @@
...
@@ -107,7 +107,7 @@
'waitAppointment'
:
0
,
// 待预约、
'waitAppointment'
:
0
,
// 待预约、
'waitCheckIn'
:
1
,
// 待签到、
'waitCheckIn'
:
1
,
// 待签到、
'waitFinish'
:
2
,
// 待完工、
'waitFinish'
:
2
,
// 待完工、
'
review
'
:
3
,
// 审核中、
'
audit
'
:
3
,
// 审核中、
'exception'
:
4
,
// 异常单、
'exception'
:
4
,
// 异常单、
'finish'
:
5
,
//已完工
'finish'
:
5
,
//已完工
}
}
...
@@ -118,7 +118,7 @@
...
@@ -118,7 +118,7 @@
0
:
'waitAppointment'
,
0
:
'waitAppointment'
,
1
:
'waitCheckIn'
,
1
:
'waitCheckIn'
,
2
:
'waitFinish'
,
2
:
'waitFinish'
,
3
:
'
review
'
,
3
:
'
audit
'
,
4
:
'exception'
,
4
:
'exception'
,
5
:
'finish'
5
:
'finish'
}
}
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
this
.
pageNumber
=
0
this
.
pageNumber
=
0
this
.
orderList
=
[]
this
.
orderList
=
[]
this
.
loadStatus
=
'loading'
this
.
loadStatus
=
'loading'
this
.
getOrderList
(
index
===
0
?
0
:
5
)
this
.
getOrderList
(
index
===
0
?
this
.
currentIndex
:
5
)
},
},
// tab栏切换
// tab栏切换
change
(
index
)
{
change
(
index
)
{
...
...
src/pages/order/refuse.vue
View file @
8274b741
<!-- 过程反馈 -->
<!-- 过程反馈 -->
<
template
>
<
template
>
<view
class=
"refuse-box bg"
>
<view
class=
"refuse-box bg"
>
<u-navbar
back-icon-color=
"#FFFFFF"
:background=
"background"
title
=
"拒单"
title
-color=
"#fff"
:border-bottom=
"false"
></u-navbar>
<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=
"content"
>
<view
class=
"content"
>
<view
class=
"con-box"
>
<view
class=
"con-box"
>
...
@@ -17,22 +17,26 @@
...
@@ -17,22 +17,26 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"con-box"
>
<view
class=
"con-box"
style=
"padding-top: 10rpx;"
>
<view
class=
"tit u-m-b-
4
0"
>
补充说明
</view>
<view
class=
"tit u-m-b-
2
0"
>
补充说明
</view>
<u-input
v-model=
"formData.remark"
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
></u-input>
<u-input
v-model=
"formData.remark"
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
:clearable=
"false"
></u-input>
</view>
</view>
</view>
</view>
<view
class=
"
u-m-60
"
>
<view
class=
"
bottom-btn-view
"
>
<button
:loading=
"submiting"
:disabled=
"disabledSubmit"
class=
"btn
"
@
click=
"submitForm"
>
确定
</button>
<button
:loading=
"submiting"
:disabled=
"disabledSubmit"
class=
"btn
bottom-btn"
@
click=
"handleClickSubmit"
><text
class=
"button-text"
>
提交
</text>
</button>
</view>
</view>
<PopView
title=
"拒单提示"
message=
"确定“拒单”操作,将影响对您的派单频率,\n甚至进入黑名单,请谨慎操作"
:visible
.
sync=
"visibale"
:count=
"count"
@
click=
"handleClick"
buttonText=
"确定"
/>
</view>
</view>
</
template
>
</
template
>
<
script
>
<
script
>
import
PopView
from
"@/components/popView/index.vue"
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
visibale
:
false
,
orderId
:
''
,
orderId
:
''
,
submiting
:
false
,
submiting
:
false
,
background
:
{
background
:
{
...
@@ -46,6 +50,7 @@
...
@@ -46,6 +50,7 @@
rejectReason
:
''
,
rejectReason
:
''
,
remark
:
''
remark
:
''
},
},
count
:
0
,
// 剩余次数
};
};
},
},
computed
:
{
computed
:
{
...
@@ -53,7 +58,9 @@
...
@@ -53,7 +58,9 @@
return
!
this
.
formData
.
rejectReason
return
!
this
.
formData
.
rejectReason
}
}
},
},
components
:{},
components
:{
PopView
},
onLoad
(
e
)
{
onLoad
(
e
)
{
this
.
orderId
=
111
this
.
orderId
=
111
if
(
e
&&
e
.
orderId
)
{
if
(
e
&&
e
.
orderId
)
{
...
@@ -64,6 +71,21 @@
...
@@ -64,6 +71,21 @@
changeReason
(
reason
)
{
changeReason
(
reason
)
{
this
.
formData
.
rejectReason
=
reason
this
.
formData
.
rejectReason
=
reason
},
},
handleClickSubmit
()
{
if
(
this
.
count
>
0
)
{
this
.
visibale
=
true
}
else
{
uni
.
showToast
({
icon
:
'none'
,
title
:
'本月无拒单机会,请联系客服'
,
})
}
},
handleClick
()
{
this
.
visibale
=
false
this
.
submitForm
()
},
async
submitForm
()
{
async
submitForm
()
{
let
self
=
this
let
self
=
this
self
.
submiting
=
true
self
.
submiting
=
true
...
@@ -88,13 +110,13 @@
...
@@ -88,13 +110,13 @@
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
scoped
>
.bg
{
.bg
{
width
:
750rpx
;
width
:
750rpx
;
height
:
100vh
;
height
:
100vh
;
overflow
:
auto
;
overflow
:
auto
;
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
background-image
:
linear-gradient
(
to
top
,
#F4F5F7
0%
,
#2272FF
10
0%
);
background-image
:
linear-gradient
(
to
top
,
#F4F5F7
0%
,
#2272FF
5
0%
);
background-size
:
750rpx
600rpx
;
background-size
:
750rpx
600rpx
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
}
}
...
@@ -107,6 +129,7 @@
...
@@ -107,6 +129,7 @@
border-radius
:
12rpx
;
border-radius
:
12rpx
;
padding-bottom
:
60rpx
;
padding-bottom
:
60rpx
;
background-color
:
#fff
;
background-color
:
#fff
;
min-height
:
800rpx
;
}
}
.con-box
{
.con-box
{
padding
:
30rpx
;
padding
:
30rpx
;
...
@@ -123,10 +146,11 @@
...
@@ -123,10 +146,11 @@
margin-right
:
-20rpx
;
margin-right
:
-20rpx
;
.txt-item
{
.txt-item
{
border-radius
:
12rpx
;
border-radius
:
12rpx
;
padding
:
24rpx
38rpx
;
padding-top
:
24rpx
;
min-width
:
196rpx
;
padding-bottom
:
24rpx
;
width
:
196rpx
;
text-align
:
center
;
text-align
:
center
;
margin-right
:
2
0
rpx
;
margin-right
:
2
2
rpx
;
margin-bottom
:
20rpx
;
margin-bottom
:
20rpx
;
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
&
.active
{
&
.active
{
...
@@ -193,4 +217,21 @@
...
@@ -193,4 +217,21 @@
margin-right
:
10rpx
;
margin-right
:
10rpx
;
color
:
#FA5A49
color
:
#FA5A49
}
}
.bottom-btn-view
{
width
:
100%
;
padding
:
0
80rpx
;
position
:
absolute
;
bottom
:
44rpx
;
.bottom-btn
{
height
:
104rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
.button-text
{
font-size
:
32rpx
;
font-weight
:
bold
;
}
}
}
</
style
>
</
style
>
src/pages/settle/sign-contract.vue
View file @
8274b741
...
@@ -470,7 +470,7 @@
...
@@ -470,7 +470,7 @@
}
}
.item
{
.item
{
display
:
flex
;
display
:
flex
;
padding
:
28rpx
3
0rpx
;
padding
:
28rpx
0rpx
;
width
:
100%
;
width
:
100%
;
font-size
:
32rpx
;
font-size
:
32rpx
;
color
:
#333
;
color
:
#333
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment