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
c8ecc865
Commit
c8ecc865
authored
May 11, 2021
by
李超鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:update
scope:self-support body:修改拍照页面问题、完工问题
parent
9cb25c04
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
2398 additions
and
1852 deletions
+2398
-1852
cert.js
src/common/api/cert.js
+13
-0
order.js
src/common/api/order.js
+5
-0
XhFiles.vue
src/components/createCom/XhFiles.vue
+110
-59
setting.vue
src/components/photo/setting.vue
+449
-449
index.vue
src/components/take/index.vue
+637
-637
order.vue
src/pages/index/order.vue
+3
-3
detail.vue
src/pages/mine/cert/detail.vue
+65
-0
index.vue
src/pages/mine/cert/index.vue
+148
-0
index.vue
src/pages/mine/customer/index.vue
+77
-0
index.vue
src/pages/mine/wallet/index.vue
+169
-0
complete.vue
src/pages/order/complete.vue
+146
-130
detail.vue
src/pages/order/detail.vue
+42
-41
list.vue
src/pages/photo/list.vue
+505
-504
setting.vue
src/pages/photo/setting.vue
+29
-29
No files found.
src/common/api/cert.js
0 → 100644
View file @
c8ecc865
const
globalUrl
=
process
.
uniEnv
||
{}
const
ucenterApiUrl
=
globalUrl
.
ucenterUrl
.
apiUrl
let
certApiFun
=
function
(
vm
){
let
getCertList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/get-cert-list'
,
params
);
const
certApi
=
{
getCertList
}
return
certApi
}
module
.
exports
=
{
certApiFun
}
\ No newline at end of file
src/common/api/order.js
View file @
c8ecc865
...
@@ -64,6 +64,10 @@ let orderApiFun = function(vm){
...
@@ -64,6 +64,10 @@ let orderApiFun = function(vm){
* 获取拍照标准
* 获取拍照标准
*/
*/
let
orderStandard
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/standard'
,
params
);
let
orderStandard
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/standard'
,
params
);
/**
* 获取拍照标准单独项目
*/
let
orderStandardItem
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/standard/only'
,
params
);
/**
/**
* 保存图片信息
* 保存图片信息
...
@@ -147,6 +151,7 @@ let orderApiFun = function(vm){
...
@@ -147,6 +151,7 @@ let orderApiFun = function(vm){
traceAndAppointment
,
traceAndAppointment
,
rejectOrder
,
rejectOrder
,
orderStandard
,
orderStandard
,
orderStandardItem
,
saveImage
,
saveImage
,
getWatermark
,
getWatermark
,
saveWatermark
,
saveWatermark
,
...
...
src/components/createCom/XhFiles.vue
View file @
c8ecc865
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
</view>
</view>
<u-action-sheet
:list=
"list"
v-model=
"maskShow"
:cancel-btn=
"true"
@
click=
"uploadSelect"
></u-action-sheet>
<u-action-sheet
:list=
"list"
v-model=
"maskShow"
:cancel-btn=
"true"
@
click=
"uploadSelect"
></u-action-sheet>
</view>
</view>
<take-photo
v-else
@
close=
"closeTake"
></take-photo>
<take-photo
v-else
@
close=
"closeTake"
:currentItem=
"currentItemDate"
></take-photo>
</view>
</view>
</
template
>
</
template
>
...
@@ -38,7 +38,11 @@
...
@@ -38,7 +38,11 @@
props
:
{
props
:
{
files
:
{
files
:
{
type
:
Array
,
type
:
Array
,
}
},
partnerCompanyId
:
{
type
:
String
,
default
:
'{}'
},
},
},
filters
:{},
filters
:{},
data
()
{
data
()
{
...
@@ -53,6 +57,7 @@
...
@@ -53,6 +57,7 @@
}
}
],
],
takeStatus
:
false
,
takeStatus
:
false
,
currentItemDate
:{},
}
}
},
},
computed
:
{
computed
:
{
...
@@ -106,6 +111,8 @@
...
@@ -106,6 +111,8 @@
}
}
// 使用拍照工具拍摄
// 使用拍照工具拍摄
this
.
takeStatus
=
true
this
.
takeStatus
=
true
this
.
getWatermark
()
this
.
getPhotoStander
()
},
},
setValue
()
{
setValue
()
{
const
dataValue
=
[]
const
dataValue
=
[]
...
@@ -133,6 +140,50 @@
...
@@ -133,6 +140,50 @@
delFile
(
index
)
{
delFile
(
index
)
{
this
.
imgList
.
splice
(
index
,
1
)
this
.
imgList
.
splice
(
index
,
1
)
this
.
setValue
()
this
.
setValue
()
},
getPhotoStander
(){
// 获取拍照规范接口
let
self
=
this
// this.$u.api.orderStandardItem({}).then((res)=>{
// if (res.code == 200 && res.data.length>0) {
// self.currentItemDate = res.data[0]
// }else{
// console.log("获取完工项的拍照标准异常",res.data.message)
// }
// })
self
.
currentItemDate
=
{
"id"
:
154
,
"partnerCompanyId"
:
10331001475
,
"categoryId"
:
1100000216
,
"brandId"
:
null
,
"type"
:
"勘测部分"
,
"name"
:
"勘测单"
,
"fieldName"
:
"06"
,
"images"
:
[
"https://cloud-bak.banshouhui.com/2-勘测单.jpg"
],
"mainPoint"
:
[
"表格清晰,文字可辨"
,
"表格居中,不倾斜"
,
"全部填写完整,不能填写的部分划横杠。"
,
"涉及到用户签字部分,不允许我方人员代签,由用户或用户指定人进行签字确认。"
,
"涉及到物业的由现场物业人员签字确认。"
],
"note"
:
"正面拍摄,完整看到单据 4 条边"
,
"orderImages"
:
null
}
},
getWatermark
(){
if
(
getApp
().
globalData
.
photo
.
waterSetting
){
return
}
var
data
=
{
partnerCompanyId
:
this
.
partnerCompanyId
}
this
.
$u
.
api
.
getWatermark
(
data
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
getApp
().
globalData
.
photo
.
waterSetting
=
res
.
data
}
else
{
console
.
log
(
"获取水印备注异常"
,
res
.
data
.
message
)
}
});
}
}
}
}
}
}
...
...
src/components/photo/setting.vue
View file @
c8ecc865
src/components/take/index.vue
View file @
c8ecc865
src/pages/index/order.vue
View file @
c8ecc865
...
@@ -335,7 +335,7 @@
...
@@ -335,7 +335,7 @@
+
"&categoryId="
+
item
.
categoryId
+
"&categoryId="
+
item
.
categoryId
+
"&orderServiceType="
+
item
.
orderServiceType
+
"&orderServiceType="
+
item
.
orderServiceType
+
"&inGuaranteePeriod="
+
item
.
inGuaranteePeriod
+
"&inGuaranteePeriod="
+
item
.
inGuaranteePeriod
+
"&auditResultsId="
+
Object
.
keys
(
item
.
auditResults
)[
0
]
+
"&auditResultsId="
+
(
item
.
auditResults
?
Object
.
keys
(
item
.
auditResults
)[
0
]:
''
)
})
})
},
},
handleAction
(
item
)
{
handleAction
(
item
)
{
...
...
src/pages/mine/cert/detail.vue
0 → 100644
View file @
c8ecc865
<
template
>
<view
class=
"cert-page"
>
<u-navbar
back-icon-color=
"#000000"
:background=
"background"
title-color=
"#000"
:border-bottom=
"false"
title=
"我的证件"
title-bold=
"true"
></u-navbar>
<view
class=
"content-cody"
>
<view
class=
"title"
>
{{
info
.
type
}}
</view>
<view
class=
"content"
v-for=
"item in info.url"
><image
:src=
"item"
mode=
""
></image></view>
</view>
</view>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
info
:
{
type
:
""
,
url
:
null
}
}
},
onLoad
()
{
var
that
=
this
;
const
eventChannel
=
this
.
getOpenerEventChannel
()
eventChannel
.
on
(
'acceptDataFromCert'
,
function
(
data
)
{
try
{
let
urlArr
=
data
.
url
.
split
(
','
);
that
.
info
.
type
=
data
.
type
;
that
.
info
.
url
=
urlArr
;
console
.
log
(
urlArr
);
}
catch
(
e
){}
console
.
log
(
that
.
info
);
})
},
}
</
script
>
<
style
>
.cert-page
{
font-size
:
28
rpx
;
margin
:
30
rpx
;
}
.content-cody
{
padding-left
:
30
rpx
;
padding-right
:
30
rpx
;
background-color
:
#F4F5F7
;
border-radius
:
12
rpx
;
}
.title
{
font-size
:
32
rpx
;
font-weight
:
bold
;
}
.content
{
padding-top
:
30
rpx
;
}
</
style
>
src/pages/mine/cert/index.vue
0 → 100644
View file @
c8ecc865
<
template
>
<view
class=
"cert-page"
>
<u-navbar
class=
"navbarHeigth"
back-icon-color=
"#000000"
:background=
"background"
title-color=
"#000"
:border-bottom=
"false"
title=
"我的证件"
title-bold=
"true"
></u-navbar>
<view
class=
"content-cody"
>
<u-cell-group
:border=
"false"
>
<u-cell-item
v-for=
"item in list"
:title=
"item.name"
:value=
"item.isUploadName"
:arrow=
"true"
:value-style=
"
{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}">
<u-icon
slot=
"icon"
size=
"32"
name=
"checkmark-circle"
:color=
"item.iconColor"
></u-icon>
</u-cell-item>
</u-cell-group>
</view>
</view>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
list
:
{
id_card
:
{
name
:
"身份证"
,
isUpload
:
false
,
isUploadName
:
""
,
keyName
:
"id_card"
,
color
:
"#999999"
},
electrician_certificate
:
{
name
:
"电工证"
,
isUpload
:
false
,
isUploadName
:
""
,
keyName
:
"electrician_certificate"
,
color
:
"#999999"
},
driver_license
:
{
name
:
"驾驶证"
,
isUpload
:
false
,
isUploadName
:
""
,
keyName
:
"driver_license"
,
color
:
"#999999"
},
driving_license
:
{
name
:
"行驶证"
,
isUpload
:
false
,
isUploadName
:
""
,
keyName
:
"driving_license"
,
color
:
"#999999"
},
vehicle
:
{
name
:
"车辆照"
,
isUpload
:
false
,
isUploadName
:
""
,
keyName
:
"vehicle"
,
color
:
"#999999"
},
high_sky_license
:
{
name
:
"高空证"
,
isUpload
:
false
,
isUploadName
:
""
,
keyName
:
"high_sky_license"
,
color
:
"#999999"
},
refrigeration_license
:
{
name
:
"制冷证"
,
isUpload
:
false
,
isUploadName
:
""
,
keyName
:
"refrigeration_license"
,
color
:
"#999999"
},
business_license
:
{
name
:
"营业执照"
,
isUpload
:
false
,
isUploadName
:
""
,
keyName
:
"business_license"
,
color
:
"#999999"
},
}
}
},
onLoad
()
{
let
that
=
this
;
this
.
$u
.
api
.
getCertList
()
.
then
((
res
)
=>
{
if
(
res
.
code
!=
200
){
return
}
for
(
let
key
in
this
.
list
){
let
getData
=
res
.
data
[
key
];
this
.
list
[
key
].
isUpload
=
getData
.
status
;
this
.
list
[
key
].
isUploadName
=
getData
.
status
==
1
?
'已上传'
:
'未上传'
;
this
.
list
[
key
].
color
=
getData
.
status
==
1
?
"#999999"
:
"#2272FF"
;
this
.
list
[
key
].
iconColor
=
getData
.
status
==
1
?
"#2272FF"
:
"#999999"
;
this
.
list
[
key
].
data
=
getData
;
}
console
.
log
(
this
.
list
);
console
.
log
(
res
);
}).
catch
((
err
)
=>
{
console
.
log
(
err
);
});
},
methods
:
{
isUpload
(
typeBool
)
{
return
typeBool
?
'已上传'
:
'未上传'
},
toDetail
(
key
)
{
let
data
=
this
.
list
[
key
].
data
;
if
(
data
.
status
!=
1
){
return
;
}
wx
.
navigateTo
({
url
:
'/pages/mine/cert/detail'
,
success
:
function
(
res
)
{
res
.
eventChannel
.
emit
(
'acceptDataFromCert'
,
data
)
}
});
}
}
}
</
script
>
<
style
>
.cert-page
{
font-size
:
28
rpx
;
margin
:
30
rpx
;
height
:
100vh
;
display
:
flex
;
flex-direction
:
column
;
}
.content-cody
{
padding
:
30
rpx
;
background-color
:
#ffffff
;
border-radius
:
12
rpx
;
height
:
82vh
;
}
.rightBlue
{
color
:
#007AFF
;
}
</
style
>
src/pages/mine/customer/index.vue
0 → 100644
View file @
c8ecc865
<
template
>
<view
class=
"cus-wrap"
>
<w-navbar
title=
"联系客服"
></w-navbar>
<view
class=
"content"
>
<u-image
class=
"qrcode"
:src=
"cusQrcode"
width=
"400"
mode=
"widthFix"
@
longtap=
"download"
>
<u-loading
slot=
"loading"
></u-loading>
<view
slot=
"error"
style=
"font-size: 24rpx;"
>
加载失败
</view>
</u-image>
<text
class=
"desc"
>
长按二维码保存图片添加官方客服微信
</text>
</view>
</view>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
};
},
computed
:
{
cusQrcode
()
{
return
process
.
uniEnv
.
qn_base_url
+
'erweima-bg.png'
},
},
methods
:
{
download
()
{
let
that
=
this
;
uni
.
downloadFile
({
//获得二维码的临时地址
url
:
that
.
erweimaImage
,
success
:(
res
)
=>
{
if
(
res
.
statusCode
==
200
){
uni
.
saveImageToPhotosAlbum
({
filePath
:
res
.
tempFilePath
,
//传入临时地址
success
()
{
that
.
$u
.
toast
(
'保存成功!'
);
},
fail
()
{
that
.
$u
.
toast
(
'保存失败!'
);
}
})
}
}
})
}
}
}
</
script
>
<
style
lang=
"scss"
>
.cus-wrap
{
background-color
:
#F4F5F7
;
padding
:
30rpx
;
.content
{
width
:
690rpx
;
height
:
800rpx
;
background
:
#FFFFFF
;
border-radius
:
12rpx
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
.qrcode
{
margin-top
:
160rpx
;
}
.desc
{
margin-top
:
40rpx
;
font-size
:
24rpx
;
font-weight
:
400
;
color
:
#666666
;
line-height
:
24rpx
;
}
}
}
</
style
>
src/pages/mine/wallet/index.vue
0 → 100644
View file @
c8ecc865
<
template
>
<view
class=
"wallet-view"
>
<u-navbar
back-icon-color=
"#333333"
background=
"#F4F5F7"
title=
"我的钱包"
titleColor=
"#333333"
:border-bottom=
"false"
></u-navbar>
<image
class=
"header-image"
mode=
"widthFix"
:src=
"qianbaobeijing"
></image>
<view
class=
"survey-view"
>
<view
class=
"survey-top-view"
>
<view
class=
"survey-top-left"
>
<view>
账户总资产(元)
</view>
<view>
{{
info
.
totalPayAmount
}}
</view>
</view>
<view
class=
"survey-top-right"
>
<u-button>
提现
</u-button>
</view>
</view>
<view
class=
"survey-bottom-view"
>
<view
v-for=
"(value, key) in items"
:key=
"key"
>
<view>
{{
value
}}
</view>
<view>
{{
info
[
key
]
}}
</view>
</view>
</view>
</view>
<view
class=
"content-view"
>
<view
v-for=
"(item, index) in lists"
:class=
"['content-list',
{'first': index==0}]" :key="index">
<view
class=
"content-list-left"
>
<image
class=
"content-list-image"
:src=
"item.icon"
></image>
<view
class=
"content-list-text"
>
<view
class=
"content-list-text-title"
>
{{
item
.
title
}}
</view>
<view>
{{
item
.
content
}}
</view>
</view>
</view>
<view
class=
"content-list-right"
>
<text
class=
"content-list-right-text"
>
点击查看
</text>
<u-icon
name=
"arrow-right"
></u-icon>
</view>
</view>
</view>
<view
class=
"list-view"
>
</view>
</view>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
info
:
{
canApplyAmount
:
0
,
// 可提现金额
saveApplyCount
:
0
,
// 已申请提现的支付单数
canApplyCount
:
0
,
// 可申请提现的支付单数
saveAndApplyAmount
:
0
,
// 已申请提现金额
totalPayAmount
:
0
,
// 总共收入
/* 还没对字段名 */
dairuzhang
:
0
,
// 预计待入账
}
}
},
computed
:
{
lists
()
{
return
[{
title
:
'结算账单'
,
content
:
'展示您已提现的账单信息'
,
icon
:
this
.
imageUrl
+
'jiesuan.png'
},{
title
:
'收入流水'
,
content
:
'当前展示最近5条,点击查看全部'
,
icon
:
this
.
imageUrl
+
'liushui.png'
}]
},
items
()
{
return
{
canApplyAmount
:
'可提现(元)'
,
dairuzhang
:
'预计待入账(元)'
}
},
imageUrl
()
{
return
process
.
uniEnv
.
qn_base_url
},
qianbaobeijing
()
{
return
this
.
imageUrl
+
'qianbaobeijing.png'
},
},
methods
:
{
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.wallet-view
{
position
:
relative
;
height
:
100vh
;
overflow
:
auto
;
background-color
:
#F4F5F7
;
.header-image
{
position
:
absolute
;
width
:
100%
;
margin-left
:
4rpx
;
margin-top
:
10rpx
;
}
.survey-view
{
position
:
relative
;
height
:
400rpx
;
margin
:
30rpx
30rpx
10rpx
30rpx
;
color
:
#FFFFFF
;
padding
:
30rpx
;
.survey-top-view
{
display
:
flex
;
justify-content
:
space-between
;
align-items
:
flex-end
;
.survey-top-left
{
}
.survey-top-right
{
}
}
.survey-bottom-view
{
display
:
flex
;
justify-content
:
space-between
;
}
}
.content-view
{
position
:
relative
;
padding
:
0
30rpx
;
.content-list
{
height
:
140rpx
;
border-radius
:
12rpx
;
display
:
flex
;
justify-content
:
space-between
;
padding
:
30rpx
;
background-color
:
#FFFFFF
;
&
.first
{
margin-bottom
:
20rpx
;
}
.content-list-left
{
display
:
flex
;
.content-list-image
{
width
:
56rpx
;
height
:
56rpx
;
margin-top
:
2rpx
;
}
.content-list-text
{
font-size
:
24rpx
;
color
:
#666666
;
margin-left
:
20rpx
;
.content-list-text-title
{
font-size
:
32rpx
;
color
:
#333333
;
}
}
}
.content-list-right
{
color
:
#2272FF
;
font-size
:
26rpx
;
.content-list-right-text
{
margin-right
:
4rpx
;
}
}
}
}
.list-view
{
position
:
relative
;
}
}
</
style
>
src/pages/order/complete.vue
View file @
c8ecc865
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-select>
</xh-select>
<xh-files
v-else-if=
"typeToComponentType(item.fieldsType)==='file'"
<xh-files
v-else-if=
"typeToComponentType(item.fieldsType)==='file'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:
value=
'form[item.fieldsName] || []'
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:
partnerCompanyId=
"partnerCompanyId"
:value=
'form[item.fieldsName] || []'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-files>
</xh-files>
<xh-location
v-else-if=
"typeToComponentType(item.fieldsType)==='location'"
<xh-location
v-else-if=
"typeToComponentType(item.fieldsType)==='location'"
...
@@ -122,6 +122,7 @@
...
@@ -122,6 +122,7 @@
categoryId
:
0
,
categoryId
:
0
,
orderServiceType
:
''
,
orderServiceType
:
''
,
inGuaranteePeriod
:
''
,
inGuaranteePeriod
:
''
,
partnerCompanyId
:
''
,
auditResultsId
:
''
,
auditResultsId
:
''
,
list
:
[],
list
:
[],
tabIndex
:
0
,
tabIndex
:
0
,
...
@@ -196,6 +197,7 @@
...
@@ -196,6 +197,7 @@
this
.
categoryId
=
option
.
categoryId
this
.
categoryId
=
option
.
categoryId
this
.
orderServiceType
=
decodeURIComponent
(
option
.
orderServiceType
)
this
.
orderServiceType
=
decodeURIComponent
(
option
.
orderServiceType
)
this
.
inGuaranteePeriod
=
option
.
inGuaranteePeriod
this
.
inGuaranteePeriod
=
option
.
inGuaranteePeriod
this
.
partnerCompanyId
=
option
.
partnerCompanyId
this
.
auditResultsId
=
option
.
auditResultsId
this
.
auditResultsId
=
option
.
auditResultsId
}
else
{
}
else
{
this
.
orderId
=
11880091
this
.
orderId
=
11880091
...
@@ -275,26 +277,29 @@
...
@@ -275,26 +277,29 @@
})
})
this
.
locationCompleteItem
(
self
.
waitHandlerPanelIndex
,
self
.
waitHandlerGroupIndex
,
self
.
waitHandlerEleIndex
)
this
.
locationCompleteItem
(
self
.
waitHandlerPanelIndex
,
self
.
waitHandlerGroupIndex
,
self
.
waitHandlerEleIndex
)
},
},
saveComplete
(){
// 保存完工信息
let
self
=
this
let
param
=
{}
self
.
list
.
forEach
((
panel
)
=>
{
handleSaveData
(){
let
param
=
{}
this
.
list
.
forEach
((
panel
)
=>
{
param
[
panel
.
panelFieldsName
]
=
[]
param
[
panel
.
panelFieldsName
]
=
[]
panel
.
items
.
forEach
((
group
)
=>
{
panel
.
items
.
forEach
((
group
)
=>
{
group
.
items
.
forEach
((
ele
)
=>
{
group
.
items
.
forEach
((
ele
)
=>
{
if
(
self
.
form
[
ele
.
fieldsName
]){
if
(
this
.
form
[
ele
.
fieldsName
]){
param
[
panel
.
panelFieldsName
].
push
({
param
[
panel
.
panelFieldsName
].
push
({
"fieldsName"
:
ele
.
fieldsName
,
"fieldsName"
:
ele
.
fieldsName
,
"fieldsType"
:
ele
.
fieldsType
,
"fieldsType"
:
ele
.
fieldsType
,
"fieldsValue"
:
self
.
form
[
ele
.
fieldsName
],
"fieldsValue"
:
this
.
form
[
ele
.
fieldsName
],
"required"
:
ele
.
required
,
"required"
:
ele
.
required
,
})
})
}
}
})
})
})
})
})
})
return
param
},
saveComplete
(){
// 保存完工信息
let
self
=
this
let
param
=
self
.
handleSaveData
()
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
...
@@ -303,7 +308,7 @@
...
@@ -303,7 +308,7 @@
})
})
}
else
{
}
else
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
title
:
res
.
data
,
title
:
res
.
message
,
type
:
'error'
,
type
:
'error'
,
})
})
}
}
...
@@ -368,7 +373,10 @@
...
@@ -368,7 +373,10 @@
let
pass
=
this
.
checkCompleteItem
()
let
pass
=
this
.
checkCompleteItem
()
if
(
!
pass
){
if
(
!
pass
){
self
.
completeCheckStatus
=
true
self
.
completeCheckStatus
=
true
}
else
{
}
else
{
// 先保存完工项
let
param
=
self
.
handleSaveData
()
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
//完工项信息保存成功再次完工工单
console
.
log
(
"完工"
);
console
.
log
(
"完工"
);
this
.
pass
=
pass
this
.
pass
=
pass
if
(
self
.
inGuaranteePeriod
===
'Y'
){
if
(
self
.
inGuaranteePeriod
===
'Y'
){
...
@@ -382,6 +390,13 @@
...
@@ -382,6 +390,13 @@
self
.
completeCheckStatus
=
true
self
.
completeCheckStatus
=
true
})
})
}
}
}
else
{
this
.
$refs
.
uToast
.
show
({
title
:
res
.
message
,
type
:
'error'
,
})
}
})
}
}
},
},
tabsChange
(
index
){
tabsChange
(
index
){
...
@@ -467,6 +482,7 @@
...
@@ -467,6 +482,7 @@
formType
=
'location'
formType
=
'location'
break
break
case
'scan'
:
case
'scan'
:
case
'machine_code'
:
formType
=
'scan'
formType
=
'scan'
break
break
case
'picker'
:
case
'picker'
:
...
...
src/pages/order/detail.vue
View file @
c8ecc865
...
@@ -651,6 +651,7 @@
...
@@ -651,6 +651,7 @@
+
"&categoryId="
+
this
.
order
.
categoryId
+
"&categoryId="
+
this
.
order
.
categoryId
+
"&orderServiceType="
+
this
.
order
.
orderServiceType
+
"&orderServiceType="
+
this
.
order
.
orderServiceType
+
"&inGuaranteePeriod="
+
this
.
order
.
inGuaranteePeriod
+
"&inGuaranteePeriod="
+
this
.
order
.
inGuaranteePeriod
+
"&partnerCompanyId="
+
this
.
order
.
partnerCompanyId
})
})
},
},
rejectOrder
()
{
// 拒单
rejectOrder
()
{
// 拒单
...
...
src/pages/photo/list.vue
View file @
c8ecc865
...
@@ -303,6 +303,7 @@
...
@@ -303,6 +303,7 @@
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
console
.
log
(
"==="
,
res
.
data
)
console
.
log
(
"==="
,
res
.
data
)
this
.
userWatermark
=
res
.
data
this
.
userWatermark
=
res
.
data
getApp
().
globalData
.
photo
.
waterSetting
=
this
.
userWatermark
}
else
{
}
else
{
console
.
log
(
"获取水印备注异常"
,
res
.
data
.
message
)
console
.
log
(
"获取水印备注异常"
,
res
.
data
.
message
)
}
}
...
...
src/pages/photo/setting.vue
View file @
c8ecc865
...
@@ -8,20 +8,20 @@
...
@@ -8,20 +8,20 @@
<text
class=
"itemTitle"
>
保存原图
</text>
<text
class=
"itemTitle"
>
保存原图
</text>
<text
class=
"itemNotice"
>
拍照后另保存一张无水印的图片
</text>
<text
class=
"itemNotice"
>
拍照后另保存一张无水印的图片
</text>
</view>
</view>
<switch
class=
"itemSwitch"
:checked=
"result['has
_o
rigin']"
@
change=
"handleOrigineChange"
color=
"#007AFF"
/>
<switch
class=
"itemSwitch"
:checked=
"result['has
O
rigin']"
@
change=
"handleOrigineChange"
color=
"#007AFF"
/>
</view>
</view>
<view
class=
"itemView"
v-if=
"showTitleSwitch"
>
<view
class=
"itemView"
v-if=
"showTitleSwitch"
>
<view
class=
"itemTitleView"
@
click=
"itemClick(
{},-1)">
<view
class=
"itemTitleView"
@
click=
"itemClick(
{},-1)">
<text
class=
"itemTitle"
>
水印标题
</text>
<text
class=
"itemTitle"
>
水印标题
</text>
<text
class=
"itemNotice"
>
{{
result
[
'lower
_right'
][
'title_text
'
]
||
'点击可编辑更改'
}}
</text>
<text
class=
"itemNotice"
>
{{
result
[
'lower
Left'
][
'title
'
]
||
'点击可编辑更改'
}}
</text>
</view>
</view>
<switch
class=
"itemSwitch"
disabled
:checked=
"result['lower
_right']['title_text
'] != ''"
<switch
class=
"itemSwitch"
disabled
:checked=
"result['lower
Left']['title
'] != ''"
@
click=
"handleClickTitleSwitch"
color=
"#007AFF"
/>
@
click=
"handleClickTitleSwitch"
color=
"#007AFF"
/>
</view>
</view>
<view
class=
"itemView"
v-for=
"(item,ikey) in itemList"
:key=
"ikey"
>
<view
class=
"itemView"
v-for=
"(item,ikey) in itemList"
:key=
"ikey"
>
<view
class=
"itemTitleView"
@
click=
"itemClick(item,ikey)"
>
<view
class=
"itemTitleView"
@
click=
"itemClick(item,ikey)"
>
<text
class=
"itemTitle"
>
{{
item
[
'watemark
_t
ext'
]
||
'自定义'
+
(
ikey
+
1
)
}}
</text>
<text
class=
"itemTitle"
>
{{
item
[
'watemark
T
ext'
]
||
'自定义'
+
(
ikey
+
1
)
}}
</text>
<text
class=
"itemNotice"
>
{{
item
[
'watemark
_v
alue'
]
||
'点击可编辑更改'
}}
</text>
<text
class=
"itemNotice"
>
{{
item
[
'watemark
V
alue'
]
||
'点击可编辑更改'
}}
</text>
</view>
</view>
<switch
class=
"itemSwitch"
:checked=
"item['enable']"
@
change=
"itemChange(item, ikey)"
color=
"#007AFF"
/>
<switch
class=
"itemSwitch"
:checked=
"item['enable']"
@
change=
"itemChange(item, ikey)"
color=
"#007AFF"
/>
</view>
</view>
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<view
class=
"inputBackView"
>
<view
class=
"inputBackView"
>
<view
class=
"ph-pop-left-view"
>
<view
class=
"ph-pop-left-view"
>
<view
class=
"leftInputView"
>
<view
class=
"leftInputView"
>
<input
class=
"leftInput"
type=
"text"
v-model=
"currenItem['watemark
_t
ext']"
<input
class=
"leftInput"
type=
"text"
v-model=
"currenItem['watemark
T
ext']"
@
input=
"leftInput()"
:disabled=
"currenItem.type === 'title_text'"
placeholder=
"请输入"
@
input=
"leftInput()"
:disabled=
"currenItem.type === 'title_text'"
placeholder=
"请输入"
maxlength=
"10"
/>
maxlength=
"10"
/>
</view>
</view>
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
<view
class=
"ph-pop-mid-view"
>
:
</view>
<view
class=
"ph-pop-mid-view"
>
:
</view>
<view>
<view>
<view
class=
"rightInputView"
>
<view
class=
"rightInputView"
>
<input
class=
"rightInput"
type=
"text"
v-model=
"currenItem['watemark
_v
alue']"
<input
class=
"rightInput"
type=
"text"
v-model=
"currenItem['watemark
V
alue']"
@
input=
"rightInput()"
placeholder=
"请输入内容"
maxlength=
"30"
/>
@
input=
"rightInput()"
placeholder=
"请输入内容"
maxlength=
"30"
/>
</view>
</view>
<view
class=
"ph-pop-tip-view"
v-if=
"showTipRight"
>
*必填项
</view>
<view
class=
"ph-pop-tip-view"
v-if=
"showTipRight"
>
*必填项
</view>
...
@@ -71,14 +71,14 @@
...
@@ -71,14 +71,14 @@
isPopShow
:
false
,
isPopShow
:
false
,
icon_close_new
:
''
,
icon_close_new
:
''
,
result
:
{
result
:
{
has
_o
rigin
:
true
,
has
O
rigin
:
true
,
lower
_righ
t
:
{
lower
Lef
t
:
{
body
:
[]
body
:
[]
}
}
},
},
currenItem
:
{
currenItem
:
{
'watemark
_t
ext'
:
''
,
'watemark
T
ext'
:
''
,
'watemark
_v
alue'
:
''
'watemark
V
alue'
:
''
},
},
editingItem
:
{},
editingItem
:
{},
showTipLeft
:
false
,
showTipLeft
:
false
,
...
@@ -88,8 +88,8 @@
...
@@ -88,8 +88,8 @@
},
},
computed
:
{
computed
:
{
itemList
()
{
itemList
()
{
if
(
this
.
result
[
'lower
_righ
t'
])
{
if
(
this
.
result
[
'lower
Lef
t'
])
{
var
arr
=
this
.
result
[
'lower
_righ
t'
][
'body'
]
var
arr
=
this
.
result
[
'lower
Lef
t'
][
'body'
]
return
arr
.
filter
((
item
)
=>
{
return
arr
.
filter
((
item
)
=>
{
return
item
.
watemark_type
===
'备注'
return
item
.
watemark_type
===
'备注'
})
})
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
},
},
showTitleSwitch
()
{
showTitleSwitch
()
{
return
this
.
result
[
'lower
_right'
].
hasOwnProperty
(
'title_text
'
)
return
this
.
result
[
'lower
Left'
].
hasOwnProperty
(
'title
'
)
},
},
customStyleCancel
()
{
customStyleCancel
()
{
return
{
return
{
...
@@ -164,12 +164,12 @@
...
@@ -164,12 +164,12 @@
//保存原图 开关
//保存原图 开关
handleOrigineChange
:
function
(
e
)
{
handleOrigineChange
:
function
(
e
)
{
this
.
result
[
'has
_origin'
]
=
!
this
.
result
[
'has_o
rigin'
]
this
.
result
[
'has
Origin'
]
=
!
this
.
result
[
'hasO
rigin'
]
this
.
saveUserWatermark
()
this
.
saveUserWatermark
()
},
},
handleClickTitleSwitch
:
function
(
e
)
{
handleClickTitleSwitch
:
function
(
e
)
{
var
string
=
this
.
result
[
'lower
_right'
][
'title_text
'
]
?
'水印标题不可关闭'
:
'请先编辑该自定义项'
var
string
=
this
.
result
[
'lower
Left'
][
'title
'
]
?
'水印标题不可关闭'
:
'请先编辑该自定义项'
uni
.
showToast
({
uni
.
showToast
({
icon
:
'none'
,
icon
:
'none'
,
title
:
string
title
:
string
...
@@ -178,7 +178,7 @@
...
@@ -178,7 +178,7 @@
//自定义 开关
//自定义 开关
itemChange
:
function
(
item
,
ikey
)
{
itemChange
:
function
(
item
,
ikey
)
{
if
(
item
[
'watemark
_v
alue'
])
{
if
(
item
[
'watemark
V
alue'
])
{
// 修改
// 修改
item
[
'enable'
]
=
!
item
[
'enable'
]
item
[
'enable'
]
=
!
item
[
'enable'
]
this
.
saveUserWatermark
()
this
.
saveUserWatermark
()
...
@@ -194,8 +194,8 @@
...
@@ -194,8 +194,8 @@
itemClick
:
function
(
item
,
ikey
)
{
itemClick
:
function
(
item
,
ikey
)
{
if
(
ikey
===
-
1
)
{
if
(
ikey
===
-
1
)
{
this
.
currenItem
=
{
this
.
currenItem
=
{
'watemark
_t
ext'
:
'水印标题'
,
'watemark
T
ext'
:
'水印标题'
,
'watemark
_value'
:
this
.
result
[
'lower_right'
][
'title_text
'
],
'watemark
Value'
:
this
.
result
[
'lowerLeft'
][
'title
'
],
'type'
:
'title_text'
'type'
:
'title_text'
}
}
}
else
{
}
else
{
...
@@ -210,7 +210,7 @@
...
@@ -210,7 +210,7 @@
//左侧输入框
//左侧输入框
leftInput
:
function
(
e
)
{
leftInput
:
function
(
e
)
{
if
(
this
.
currenItem
[
'watemark
_t
ext'
])
{
if
(
this
.
currenItem
[
'watemark
T
ext'
])
{
this
.
showTipLeft
=
false
this
.
showTipLeft
=
false
}
}
...
@@ -218,7 +218,7 @@
...
@@ -218,7 +218,7 @@
//右侧输入框
//右侧输入框
rightInput
:
function
(
e
)
{
rightInput
:
function
(
e
)
{
if
(
this
.
currenItem
[
'watemark
_v
alue'
])
{
if
(
this
.
currenItem
[
'watemark
V
alue'
])
{
this
.
showTipRight
=
false
this
.
showTipRight
=
false
}
}
},
},
...
@@ -227,8 +227,8 @@
...
@@ -227,8 +227,8 @@
popCancelClick
:
function
()
{
popCancelClick
:
function
()
{
this
.
isPopShow
=
false
this
.
isPopShow
=
false
this
.
currenItem
=
{
this
.
currenItem
=
{
'watemark
_t
ext'
:
''
,
'watemark
T
ext'
:
''
,
'watemark
_v
alue'
:
''
'watemark
V
alue'
:
''
}
}
},
},
...
@@ -239,22 +239,22 @@
...
@@ -239,22 +239,22 @@
//自定义弹窗 保存
//自定义弹窗 保存
popSaveClick
:
function
()
{
popSaveClick
:
function
()
{
if
(
this
.
currenItem
[
'watemark
_text'
]
&&
this
.
currenItem
[
'watemark_v
alue'
])
{
if
(
this
.
currenItem
[
'watemark
Text'
]
&&
this
.
currenItem
[
'watemarkV
alue'
])
{
this
.
isPopShow
=
false
this
.
isPopShow
=
false
if
(
this
.
currenItem
.
type
===
'title_text'
)
{
if
(
this
.
currenItem
.
type
===
'title_text'
)
{
this
.
result
[
'lower
_right'
][
'title_text'
]
=
this
.
currenItem
[
'watemark_v
alue'
]
this
.
result
[
'lower
Left'
][
'title'
]
=
this
.
currenItem
[
'watemarkV
alue'
]
}
else
{
}
else
{
this
.
editingItem
[
'watemark
_text'
]
=
this
.
currenItem
[
'watemark_t
ext'
]
this
.
editingItem
[
'watemark
Text'
]
=
this
.
currenItem
[
'watemarkT
ext'
]
this
.
editingItem
[
'watemark
_value'
]
=
this
.
currenItem
[
'watemark_v
alue'
]
this
.
editingItem
[
'watemark
Value'
]
=
this
.
currenItem
[
'watemarkV
alue'
]
this
.
editingItem
[
'enable'
]
=
true
this
.
editingItem
[
'enable'
]
=
true
}
}
this
.
saveUserWatermark
()
this
.
saveUserWatermark
()
}
else
{
}
else
{
// 提示
// 提示
if
(
!
this
.
currenItem
[
'watemark
_t
ext'
])
{
if
(
!
this
.
currenItem
[
'watemark
T
ext'
])
{
this
.
showTipLeft
=
true
this
.
showTipLeft
=
true
}
}
if
(
!
this
.
currenItem
[
'watemark
_v
alue'
])
{
if
(
!
this
.
currenItem
[
'watemark
V
alue'
])
{
this
.
showTipRight
=
true
this
.
showTipRight
=
true
}
}
}
}
...
...
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