Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hls-xcmg-vue-app
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
xugong
hls-xcmg-vue-app
Commits
ca7ef787
Commit
ca7ef787
authored
Dec 18, 2019
by
李晓兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'发车申请'
parent
2ae51281
Pipeline
#4214
canceled with stages
Changes
6
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
802 additions
and
801 deletions
+802
-801
uat.env.js
config/uat.env.js
+1
-1
contract-records.vue
src/pages/contractInquire/contract-records.vue
+787
-787
contract-signing.vue
src/pages/contractSigning/contract-signing.vue
+1
-1
add-car.vue
src/pages/contractStart/add-car.vue
+5
-4
contract-list.vue
src/pages/distributorSign/contract-list.vue
+5
-5
baseInfo.vue
src/pages/userBindNew/org/baseInfo.vue
+3
-3
No files found.
config/uat.env.js
View file @
ca7ef787
...
...
@@ -10,5 +10,5 @@ module.exports = {
filePath
:
'"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"'
,
ocrPath
:
'"http://180.104.121.66:8088/r/api"'
,
appId
:
'"com.xcmg.app"'
,
currentVersion
:
'"1.1.
4
"'
currentVersion
:
'"1.1.
5
"'
}
src/pages/contractInquire/contract-records.vue
View file @
ca7ef787
...
...
@@ -765,7 +765,7 @@ export default {
.platform-ios {
#contract-records {
.scrollContent {
padding-top: 3.
8rem;
padding-top: 3.
4rem;
}
.search {
input {
...
...
src/pages/contractSigning/contract-signing.vue
View file @
ca7ef787
...
...
@@ -529,7 +529,7 @@ export default {
.platform-ios {
#contract-signing {
.scrollContent {
padding-top:
4.2
rem;
padding-top:
3.8
rem;
}
.search {
input {
...
...
src/pages/contractStart/add-car.vue
View file @
ca7ef787
...
...
@@ -423,11 +423,12 @@ export default {
let
url
=
process
.
env
.
ocrPath
+
'/baidu/ocr/vehicle_certificate'
hlsUtil
.
baiduOcr
(
fileUrl
,
url
,
function
(
res
)
{
hlsPopup
.
hideLoading
()
console
.
log
(
'$$$$$$$$$$$$$$$'
+
JSON
.
stringify
(
res
))
let
result
=
res
.
result
.
words_result
vm
.
frame_number
=
result
.
VinNo
// 车架号
vm
.
engine
=
result
.
EngineNo
// 发动机号
vm
.
info
.
frame_number
=
result
.
VinNo
// 车架号
vm
.
info
.
engine
=
result
.
EngineNo
// 发动机号
// vm.vehicle_model = result.VinNo // 车辆型号
vm
.
certificate_number
=
result
.
CertificationNo
// 合格证编号
vm
.
info
.
certificate_number
=
result
.
CertificationNo
// 合格证编号
})
},
showTime
(
format
)
{
...
...
@@ -819,7 +820,7 @@ export default {
height: 40px;
position: absolute;
color: #fff;
bottom: 16px;
//
bottom: 16px;
left: 30.5px;
background-color: #0041c4;
border-radius: 4px;
...
...
src/pages/distributorSign/contract-list.vue
View file @
ca7ef787
...
...
@@ -485,7 +485,7 @@ export default {
}
}
.platform-ios {
#
contract-signing
{
#
distribute-sign
{
.scrollContent {
padding-top: 3.28rem;
}
...
...
@@ -494,9 +494,9 @@ export default {
// iPhoneX适配
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#
contract-signing
{
#
distribute-sign
{
.scrollContent {
padding-top: 3.
4
8rem;
padding-top: 3.
6
8rem;
}
}
}
...
...
@@ -504,9 +504,9 @@ export default {
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#
contract-signing
{
#
distribute-sign
{
.scrollContent {
padding-top:
4.0
8rem;
padding-top:
3.6
8rem;
}
.search {
input {
...
...
src/pages/userBindNew/org/baseInfo.vue
View file @
ca7ef787
...
...
@@ -381,16 +381,16 @@
</item>
</list-item>
<div
v-if=
"!flag"
class=
"upload-id-card"
>
<div
v-if=
"!flag"
class=
"upload-id-card"
style=
"margin-bottom: 30px;"
>
<span>
授权书证件上传
</span>
<div
class=
"upload-box1"
>
<div
v-if=
"!laImg"
@
click=
"LaUpload()"
>
<img
src=
"@/assets/userBind/camera.png"
>
</div>
<div
v-if=
"laImg && !isApproved"
style=
"width: 100%;height: 100%
"
@
click=
"LaUpload('')"
>
<div
v-if=
"laImg && !isApproved"
class=
"licenseBox
"
@
click=
"LaUpload('')"
>
<img
:src=
"laImg"
style=
"width: 100%;height: 100%;margin: 0"
>
</div>
<div
v-if=
"isApproved"
>
<!--v-if="licenseImg && isApproved"-->
<div
v-if=
"isApproved"
class=
"licenseBox"
>
<!--v-if="licenseImg && isApproved"-->
<img
v-if=
"laImg"
:src=
"laImg"
style=
"width: 100%;height: 100%;margin: 0"
@
click=
"showBigPicture(laImg)"
>
</div>
</div>
...
...
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