Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
JT-WXXCX-SF
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
郑帆
JT-WXXCX-SF
Commits
5a32d449
提交
5a32d449
authored
3月 09, 2022
作者:
正反
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加缴纳信息费按钮
上级
6a54e8a4
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
172 行增加
和
135 行删除
+172
-135
api.js
api/api.js
+107
-105
apis.js
api/apis.js
+1
-2
request.js
api/request.js
+1
-2
order.vue
components/order.vue
+2
-0
orderCard.vue
components/orderCard.vue
+20
-11
index.vue
pages/index/index.vue
+1
-1
orderDetails.vue
pages/orderDetails/orderDetails.vue
+40
-14
没有找到文件。
api/api.js
浏览文件 @
5a32d449
import
{
http
,
apiBaseUrl
}
from
'./request'
//引入上面封装好的请求方法
import
{
http
,
apiBaseUrl
}
from
'./request'
//引入上面封装好的请求方法
import
store
from
'../store/store.js'
//微信登录获取code
export
function
wxLogin
(){
return
new
Promise
((
resolve
,
reject
)
=>
{
export
function
wxLogin
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
wx
.
login
({
success
:
resolve
,
fail
:
reject
success
:
resolve
,
fail
:
reject
})
})
}
//获取用户信息
export
function
getUserInfo
(
code
){
export
function
getUserInfo
(
code
)
{
return
http
({
url
:
'/api/Validation'
,
method
:
'POST'
,
data
:{
appid
:
store
.
state
.
addid
,
code
:
code
url
:
'/api/Validation'
,
method
:
'POST'
,
data
:
{
appid
:
store
.
state
.
addid
,
code
:
code
}
})
}
//获取订单数据(师傅)
export
function
getOrderInfo
(
status
){
export
function
getOrderInfo
(
status
)
{
return
http
({
url
:
'/api/Order/SFView'
,
data
:{
status
:
status
url
:
'/api/Order/SFView'
,
data
:
{
status
:
status
}
})
}
//获取各个订单的数量
export
function
getOrderCount
(){
export
function
getOrderCount
()
{
return
http
({
url
:
'/api/Order/SFView'
url
:
'/api/Order/SFView'
})
}
//获取文件下载地址
export
function
getFileUrl
(
fileid
){
export
function
getFileUrl
(
fileid
)
{
return
http
({
url
:
'/api/UploadAttachments/GetUrl'
,
data
:{
fileid
:
fileid
url
:
'/api/UploadAttachments/GetUrl'
,
data
:
{
fileid
:
fileid
}
})
}
//修改信息
export
function
editInfo
(
params
){
export
function
editInfo
(
params
)
{
return
http
({
url
:
'/api/Worker/Edit'
,
method
:
'POST'
,
data
:
params
url
:
'/api/Worker/Edit'
,
method
:
'POST'
,
data
:
params
})
}
//上传附件
export
function
uploadpic
(
file
){
export
function
uploadpic
(
file
)
{
return
http
({
url
:
'/api/UploadAttachments'
,
method
:
'POST'
,
header
:{
test
:
11
url
:
'/api/UploadAttachments'
,
method
:
'POST'
,
header
:
{
test
:
11
},
data
:{
file
:
file
data
:
{
file
:
file
}
})
}
//缴纳保证金
export
function
payDeposit
(
amount
){
export
function
payDeposit
(
amount
)
{
return
http
({
url
:
'/api/payment'
,
method
:
'POST'
,
data
:{
amount
:
amount
,
paytype
:
"保证金"
url
:
'/api/payment'
,
method
:
'POST'
,
data
:
{
amount
:
amount
,
paytype
:
"保证金"
}
})
}
//提现
export
function
cashOut
(
amount
){
export
function
cashOut
(
amount
)
{
return
http
({
url
:
'/api/CashOut/SF'
,
method
:
'POST'
,
data
:{
amount
:
amount
url
:
'/api/CashOut/SF'
,
method
:
'POST'
,
data
:
{
amount
:
amount
}
})
}
//获取帮助链接
export
function
getHelpUrl
(){
return
http
({
url
:
'/api/HelpCenter/GetSFHelpUrl'
})
export
function
getHelpUrl
()
{
return
http
({
url
:
'/api/HelpCenter/GetSFHelpUrl'
})
}
//获取结算费用清单
export
function
getCost
(){
export
function
getCost
()
{
return
http
({
url
:
'/api/Order/GetCostSettlement'
url
:
'/api/Order/GetCostSettlement'
})
}
//获取服务类目
export
function
getServiceItem
(){
export
function
getServiceItem
()
{
return
http
({
url
:
'/api/BaseData/ServiceItem'
url
:
'/api/BaseData/ServiceItem'
})
}
//获取手机验证码
export
function
getCode
(
phone
){
export
function
getCode
(
phone
)
{
return
http
({
url
:
'/api/VerificationCode'
,
data
:{
phone
:
phone
url
:
'/api/VerificationCode'
,
data
:
{
phone
:
phone
}
})
}
//验证验证码
export
function
verificationCode
(
phone
,
code
)
{
export
function
verificationCode
(
phone
,
code
)
{
return
http
({
url
:
'/api/VerificationCode'
,
method
:
'POST'
,
data
:{
Phone
:
phone
,
VerificationCode
:
code
url
:
'/api/VerificationCode'
,
method
:
'POST'
,
data
:
{
Phone
:
phone
,
VerificationCode
:
code
}
})
}
//注册
export
function
register
(
params
){
export
function
register
(
params
)
{
return
http
({
url
:
'/api/Worker/Register'
,
method
:
'POST'
,
data
:
params
url
:
'/api/Worker/Register'
,
method
:
'POST'
,
data
:
params
})
}
//意见反馈 params:{FContent:"",FSScore}
export
function
feedback
(
params
){
export
function
feedback
(
params
)
{
return
http
({
url
:
'/api/Feedback/SF'
,
method
:
'POST'
,
data
:
{
Model
:
params
}
url
:
'/api/Feedback/SF'
,
method
:
'POST'
,
data
:
{
Model
:
params
}
})
}
//获取客服二维码
export
function
getKFQRcode
(){
return
http
({
url
:
'/api/BaseData/KFQRCode'
})
export
function
getKFQRcode
()
{
return
http
({
url
:
'/api/BaseData/KFQRCode'
})
}
//获取车辆信息
export
function
getCarList
(){
export
function
getCarList
()
{
return
http
({
url
:
'/api/BaseData/Carsinfo'
url
:
'/api/BaseData/Carsinfo'
})
}
//获取技能证书信息
export
function
getCertificate
(){
export
function
getCertificate
()
{
return
http
({
url
:
'/api/BaseData/Certificate'
url
:
'/api/BaseData/Certificate'
})
}
//获取省市区
export
function
getAddress
(){
export
function
getAddress
()
{
return
http
({
url
:
'/api/Worker/GetAllCity'
url
:
'/api/Worker/GetAllCity'
})
}
//上传头像
export
function
postAvatar
(
filePath
){
let
name
=
filePath
.
replace
(
'http://tmp/'
,
''
)
export
function
postAvatar
(
filePath
)
{
let
name
=
filePath
.
replace
(
'http://tmp/'
,
''
)
let
url
=
apiBaseUrl
return
new
Promise
((
resolve
,
reject
)
=>
{
wx
.
uploadFile
({
filePath
:
filePath
,
name
:
name
,
header
:
{
test
:
11
},
url
:
url
+
'/api/UploadAttachments'
,
success
:
resolve
,
fail
:
reject
})
return
new
Promise
((
resolve
,
reject
)
=>
{
wx
.
uploadFile
({
filePath
:
filePath
,
name
:
name
,
header
:
{
test
:
11
},
url
:
url
+
'/api/UploadAttachments'
,
success
:
resolve
,
fail
:
reject
})
})
}
//更新用户信息(token等...)
export
function
init
(){
export
function
init
()
{
let
that
=
this
uni
.
showLoading
({
title
:
'加载中...'
title
:
'加载中...'
})
wx
.
login
({
success
(
res
)
{
store
.
state
.
code
=
res
.
code
getUserInfo
(
res
.
code
).
then
((
re
)
=>
{
if
(
re
.
data
.
code
==
0
)
{
console
.
log
(
"更新用户信息:"
,
JSON
.
parse
(
re
.
data
.
result
.
result
))
getUserInfo
(
res
.
code
).
then
((
re
)
=>
{
if
(
re
.
data
.
code
==
0
)
{
console
.
log
(
"更新用户信息:"
,
JSON
.
parse
(
re
.
data
.
result
.
result
))
store
.
state
.
login
=
true
store
.
state
.
token
=
re
.
data
.
result
.
token
store
.
state
.
userInfo
=
JSON
.
parse
(
re
.
data
.
result
.
result
)
uni
.
hideLoading
()
}
else
{
}
else
{
uni
.
hideLoading
()
console
.
log
(
"错误信息:"
,
re
)
console
.
log
(
"错误信息:"
,
re
)
}
}).
catch
((
res
)
=>
{
console
.
log
(
"错误信息:"
,
res
)
console
.
log
(
"错误信息:"
,
res
)
uni
.
hideLoading
()
})
},
fail
(
res
)
{
uni
.
hideLoading
()
console
.
log
(
"错误信息:"
,
res
)
console
.
log
(
"错误信息:"
,
res
)
}
})
}
\ No newline at end of file
}
api/apis.js
浏览文件 @
5a32d449
...
...
@@ -329,4 +329,4 @@ export function sendAppointment(params){
method
:
'POST'
,
data
:
params
})
}
\ No newline at end of file
}
api/request.js
浏览文件 @
5a32d449
...
...
@@ -23,4 +23,4 @@ const http = (options) => {
export
default
http
export
{
http
,
apiBaseUrl
}
\ No newline at end of file
export
{
http
,
apiBaseUrl
}
components/order.vue
浏览文件 @
5a32d449
...
...
@@ -70,6 +70,8 @@
return
'完工结算上报'
case
'待验收'
:
return
'待业主验收'
case
'待结算'
:
return
'缴纳信息费'
}
},
},
...
...
components/orderCard.vue
浏览文件 @
5a32d449
...
...
@@ -4,11 +4,11 @@
<view
slot=
"head"
class=
"head"
>
<view
class=
"title"
>
{{
item
.
ProNAme
}}
</view>
<view
class=
"sub-title"
>
{{
subTitle
(
item
)
}}
</view>
<view
class=
"tags"
v-if=
"item.ProSize"
>
<
!--
<
view
class=
"tags"
v-if=
"item.ProSize"
>
<view
class=
"tag"
v-for=
"(items,indexs) in JSON.parse(item.ProSize)"
:key=
"indexs"
>
<u-tag
:text=
"items"
type=
"warning"
mode=
"dark"
></u-tag>
</view>
</view>
</view>
-->
</view>
<view
slot=
"body"
class=
"body"
>
<view
class=
"order-info"
>
...
...
@@ -32,9 +32,7 @@
</view>
<view
slot=
"foot"
class=
"foot"
v-if=
"subTitle(item)=='待报价' || subTitle(item)=='待预约'"
>
<!--
<view
class=
"btn"
>
<u-button
v-if=
"btnText == '立即报价'"
size=
"mini"
shape=
"circle"
type=
"warning"
@
click=
"grap(item.FID)"
>
立即抢单
</u-button>
</view>
-->
<view
class=
"btn"
v-show=
"subTitle(item) != '已完成'"
>
<u-button
size=
"mini"
shape=
"circle"
type=
"warning"
@
click=
"handleDetails(index)"
>
{{
btnText
}}
</u-button>
...
...
@@ -42,18 +40,21 @@
</view>
<view
slot=
"foot"
class=
"foot"
v-else-if=
"subTitle(item)=='待服务' || subTitle(item)=='待验收'"
>
<!--
<view
class=
"btn"
>
<u-button
v-if=
"btnText == '立即报价'"
size=
"mini"
shape=
"circle"
type=
"warning"
@
click=
"grap(item.FID)"
>
立即抢单
</u-button>
</view>
-->
<view
class=
"btn"
v-show=
"subTitle(item) != '已完成'"
>
<u-button
size=
"mini"
shape=
"circle"
type=
"warning"
@
click=
"handleDetails(index)"
>
{{
btnText
}}
</u-button>
</view>
</view>
<view
slot=
"foot"
class=
"foot"
v-else-if=
"item.HasQuoted==0 && subTitle(item)=='待雇佣'"
>
<!--
<view
class=
"btn"
>
<u-button
v-if=
"btnText == '立即报价'"
size=
"mini"
shape=
"circle"
type=
"warning"
@
click=
"grap(item.FID)"
>
立即抢单
</u-button>
</view>
-->
<view
class=
"btn"
v-show=
"subTitle(item) != '已完成'"
>
<u-button
size=
"mini"
shape=
"circle"
type=
"warning"
@
click=
"handleDetails(index)"
>
{{
btnText
}}
</u-button>
</view>
</view>
<view
slot=
"foot"
class=
"foot"
v-else-if=
"item.FPayWay==3 && subTitle(item)=='待结算'"
>
<view
class=
"btn"
v-show=
"subTitle(item) != '已完成'"
>
<u-button
size=
"mini"
shape=
"circle"
type=
"warning"
@
click=
"handleDetails(index)"
>
{{
btnText
}}
</u-button>
...
...
@@ -119,6 +120,14 @@
.sub-title
{
color
:
#ff9900
;
/* display: inline-block;
height: 50rpx;
width: 120rpx;
border-radius: 25px;
border:1px solid #ff9900;
background-color: #ff9900;
text-align: center;
vertical-align: middle; */
}
.tags
{
...
...
pages/index/index.vue
浏览文件 @
5a32d449
...
...
@@ -427,7 +427,7 @@
console
.
log
(
"查询订单信息结果:"
,
res
)
if
(
res
.
data
.
code
==
0
)
{
console
.
log
(
that
.
$store
.
state
.
state
+
'信息'
)
if
(
Object
.
values
(
res
.
data
.
result
)[
0
]
!=
=
null
)
{
if
(
Object
.
values
(
res
.
data
.
result
)[
0
]
!=
null
)
{
console
.
log
(
Object
.
values
(
res
.
data
.
result
)[
0
])
that
.
orderData
=
Object
.
values
(
res
.
data
.
result
)[
0
]
that
.
subTabs
[
that
.
subCurrent
].
count
=
0
...
...
pages/orderDetails/orderDetails.vue
浏览文件 @
5a32d449
...
...
@@ -20,6 +20,10 @@
<text
class=
"label"
>
{{
orderDetails
.
Maindata
[
0
].
FPROVINCE
+
orderDetails
.
Maindata
[
0
].
FCITY
+
orderDetails
.
Maindata
[
0
].
FCOUNTY
+
orderDetails
.
Maindata
[
0
].
FAdress
}}
</text>
</view>
<view
class=
"item"
v-show=
"orderDetails.Maindata[0].caption != '待预约' && orderDetails.Maindata[0].HasQuoted!=0"
>
<u-icon
size=
"36"
name=
'phone'
></u-icon>
<text
class=
"label"
>
{{
orderDetails
.
Maindata
[
0
].
FCustomerPhone
}}
</text>
</view>
<view
class=
"item"
>
<u-icon
size=
"36"
name=
'clock'
></u-icon>
<text
class=
"label"
>
{{
orderDetails
.
Maindata
[
0
].
FHopeServiceTime
}}
</text>
...
...
@@ -39,18 +43,18 @@
<view
slot=
"body"
>
<view
v-for=
"(item,index) in orderDetails.SPdata"
:key=
"index"
>
<view
class=
"item"
>
<u-icon
:label=
"'商品名称:'+item.CPGG"
></u-icon>
<u-icon
:label=
"'商品名称:'+item.CPGG"
v-show=
"item.CPGG.length>1"
></u-icon>
</view>
<view
class=
"item"
>
<u-icon
:label=
"'商品规格:'+item.CPMC"
></u-icon>
<u-icon
:label=
"'商品规格:'+item.CPMC"
v-show=
"item.CPGG.length>1"
></u-icon>
</view>
<view
class=
"item"
>
<u-icon
:label=
"'商品数量:'+item.FGOODSQTY"
></u-icon>
<u-icon
:label=
"'商品数量:'+item.FGOODSQTY"
v-show=
"item.CPGG.length>1"
></u-icon>
</view>
<view
class=
"item"
v-
if
=
"item.FTOOLS.length>1"
>
<view
class=
"item"
v-
show
=
"item.FTOOLS.length>1"
>
<u-icon
:label=
"'商品备注:'+item.FTOOLS"
></u-icon>
</view>
<view
class=
"item"
v-
if
=
"picUrl[index].length>1&&picUrl[index]!=undefined"
>
<view
class=
"item"
v-
show
=
"picUrl[index].length>1&&picUrl[index]!=undefined"
>
<u-image
mode=
"heightFix"
width=
"250"
height=
"250"
:src=
"picUrl[index]"
></u-image>
</view>
</view>
...
...
@@ -85,7 +89,7 @@
<u-icon
:label=
"'现场应收费用:'+orderDetails.Maindata[0].FSHAmount"
></u-icon>
</view>
<view
class=
"item"
v-show=
"orderDetails.Maindata[0].FPayWay == '3'"
>
<u-icon
:label=
"'现场实收费用:'+orderDetails.Maindata[0].FSH
Amount
"
></u-icon>
<u-icon
:label=
"'现场实收费用:'+orderDetails.Maindata[0].FSH
SAMOUNT
"
></u-icon>
</view>
<view
class=
"item"
v-if=
"orderDetails.Maindata[0].caption !== '待报价' && orderDetails.Maindata[0].FPayWay == '2'"
>
...
...
@@ -113,8 +117,8 @@
<!--
<view
slot=
"body"
v-if=
"orderDetails.Maindata[0].HasQuoted == 0 && orderDetails.Maindata[0].caption == '待报价'"
>
<u-empty
src=
"/static/images/detail/pay.png"
text=
"等待师傅报价"
></u-empty>
</view>
-->
<view
slot=
"body"
>
<view
v-for=
"(item,index) in orderDetails.SPdata"
:key=
"index"
>
<view
slot=
"body"
>
<view
v-for=
"(item,index) in orderDetails.SPdata"
:key=
"index"
>
{{
item
.
CPMC
}}
x
{{
item
.
FGOODSQTY
}}
</view>
<view
class=
"toright"
>
...
...
@@ -161,6 +165,17 @@
</u-button>
</view>
</view>
<view
v-else-if=
"orderDetails.Maindata[0].caption == '待结算'&&orderDetails.Maindata[0].FPayWay==3"
>
<view
class=
"btn"
:style=
"'width:'+width*0.3+'px'"
>
<u-button
open-type=
"contact"
:hair-line=
"false"
>
联系客服
</u-button>
</view>
<view
class=
"btn"
:style=
"'width:'+width*0.7+'px'"
>
<u-button
:hair-line=
"false"
hover-class=
"none"
:custom-style=
"btnStyle"
@
click=
"bottomBtn"
>
{{
btnText
}}
</u-button>
</view>
</view>
<view
v-else
>
<view
class=
"btn"
:style=
"'width:'+width+'px'"
>
<u-button
open-type=
"contact"
:hair-line=
"false"
:custom-style=
"btnStyle"
>
联系客服
</u-button>
...
...
@@ -250,12 +265,15 @@
<u-form
label-width=
"150"
label-align=
"center"
ref=
"Iform"
:model=
"form"
>
<u-form-item
label=
"上传图片"
prop=
"ufile"
:required=
"true"
>
<u-upload
:header=
"header"
ref=
"uUpload"
:action=
"action"
max-count=
"9"
v-model=
"form.ufile"
@
on-success=
"uploadSuccess1"
>
max-size=
"5242880"
@
on-success=
"uploadSuccess1"
>
</u-upload>
</u-form-item>
</u-form>
<u-button
hover-class=
"none"
:custom-style=
"btnStyle"
@
click=
"WanGongConfirm"
>
确定
</u-button>
</view>
<view
v-show=
"orderDetails.Maindata[0].caption == '待结算'&&orderDetails.Maindata[0].FPayWay==3"
>
zzzzzzz
</view>
</u-popup>
...
...
@@ -577,10 +595,12 @@
if
(
that
.
orderDetails
.
Maindata
[
0
].
caption
==
'待预约'
)
{
this
.
yyShow
=
true
}
if
(
that
.
orderDetails
.
Maindata
[
0
].
FSFQUOTEDPRICEAMOUNTSF
){
that
.
orderDetails
.
Maindata
[
0
].
FSFQUOTEDPRICEAMOUNTSF
=
that
.
orderDetails
.
Maindata
[
0
].
FSFQUOTEDPRICEAMOUNTSF
.
toFixed
(
2
)
if
(
that
.
orderDetails
.
Maindata
[
0
].
FSFQUOTEDPRICEAMOUNTSF
)
{
that
.
orderDetails
.
Maindata
[
0
].
FSFQUOTEDPRICEAMOUNTSF
=
that
.
orderDetails
.
Maindata
[
0
]
.
FSFQUOTEDPRICEAMOUNTSF
.
toFixed
(
2
)
}
that
.
orderDetails
.
Maindata
[
0
].
FAPPOINTMENTDATE
=
that
.
$u
.
timeFormat
(
that
.
orderDetails
.
Maindata
[
0
].
FAPPOINTMENTDATE
,
'yyyy-mm-dd hh:MM:ss'
)
that
.
orderDetails
.
Maindata
[
0
].
FAPPOINTMENTDATE
=
that
.
$u
.
timeFormat
(
that
.
orderDetails
.
Maindata
[
0
].
FAPPOINTMENTDATE
,
'yyyy-mm-dd hh:MM:ss'
)
}
else
{
toast
(
res
.
data
.
message
)
console
.
log
(
"查询订单详情信息失败:"
,
res
)
...
...
@@ -770,6 +790,7 @@
}
params
.
FID
=
that
.
orderDetails
.
Maindata
[
0
].
FID
params
.
Amount
=
that
.
form
.
BaoJiaValue
console
.
log
(
'信息'
+
params
.
FID
+
' '
+
that
.
form
.
BaoJiaValue
)
postOffer
(
params
).
then
((
res
)
=>
{
console
.
log
(
'报价请求返回信息:'
,
res
)
if
(
res
.
data
.
code
==
0
)
{
...
...
@@ -947,6 +968,9 @@
case
'待验收'
:
this
.
btnText
=
'待业主验收'
break
case
'待结算'
:
this
.
btnText
=
'缴纳信息费'
break
}
}
}
...
...
@@ -1047,10 +1071,12 @@
.sub-title
{
color
:
#ff9900
;
}
.SFcount
{
.SFcount
{
color
:
red
;
}
.toright
{
.toright
{
text-align
:
end
;
margin-top
:
5
rpx
;
margin-bottom
:
10
prx
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论