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
69bc360a
Commit
69bc360a
authored
Jan 16, 2020
by
linxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add
parent
5dc11b64
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
53 additions
and
13 deletions
+53
-13
dev.env.js
config/dev.env.js
+1
-1
uat.env.js
config/uat.env.js
+1
-1
currencyInput.vue
src/components/currencyInput.vue
+2
-1
main.js
src/main.js
+1
-1
create-enclosure-info.vue
src/pages/contractCreate/create-enclosure-info.vue
+17
-3
add-car.vue
src/pages/contractStart/add-car.vue
+27
-2
first-pay.vue
src/pages/pay/marginPay/first-pay.vue
+3
-3
index.html
www/index.html
+1
-1
No files found.
config/dev.env.js
View file @
69bc360a
...
@@ -12,6 +12,6 @@ module.exports = merge(prodEnv, {
...
@@ -12,6 +12,6 @@ module.exports = merge(prodEnv, {
rootPath
:
'"http://180.104.121.66:8088/r/api"'
,
rootPath
:
'"http://180.104.121.66:8088/r/api"'
,
filePath
:
'"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"'
,
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"'
,
ocrPath
:
'"http://180.104.121.66:8088/r/api"'
,
appId
:
'"com.xcmg.app"'
,
appId
:
'"com.xcmg.app
.dev
"'
,
currentVersion
:
'"1.6.1"'
,
currentVersion
:
'"1.6.1"'
,
})
})
config/uat.env.js
View file @
69bc360a
...
@@ -11,5 +11,5 @@ module.exports = {
...
@@ -11,5 +11,5 @@ module.exports = {
ocrPath
:
'"http://180.104.121.66:8088/r/api"'
,
ocrPath
:
'"http://180.104.121.66:8088/r/api"'
,
fileUploadSvcPath
:
'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="'
,
fileUploadSvcPath
:
'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="'
,
appId
:
'"com.xcmg.app.dev"'
,
appId
:
'"com.xcmg.app.dev"'
,
currentVersion
:
'"1.2.
0
"'
currentVersion
:
'"1.2.
1
"'
}
}
src/components/currencyInput.vue
View file @
69bc360a
...
@@ -70,7 +70,8 @@ export default {
...
@@ -70,7 +70,8 @@ export default {
this
.
$emit
(
'input'
,
this
.
newVal
)
this
.
$emit
(
'input'
,
this
.
newVal
)
},
},
onDelete
()
{
onDelete
()
{
this
.
value
=
''
this
.
newVal
=
''
this
.
$emit
(
'input'
,
this
.
newVal
)
},
},
// onInput: function (value) {
// onInput: function (value) {
// if (this.disable) return
// if (this.disable) return
...
...
src/main.js
View file @
69bc360a
...
@@ -58,7 +58,7 @@ import Jpush from './scripts/jpushService'
...
@@ -58,7 +58,7 @@ import Jpush from './scripts/jpushService'
import
Jmessage
from
'./scripts/jmessageService'
import
Jmessage
from
'./scripts/jmessageService'
if
(
process
.
env
.
CONFIG_ENV
===
'
uat
'
)
{
if
(
process
.
env
.
CONFIG_ENV
===
'
dev
'
)
{
const
VConsole
=
require
(
'vconsole'
)
const
VConsole
=
require
(
'vconsole'
)
new
VConsole
()
// eslint-disable-line
new
VConsole
()
// eslint-disable-line
}
}
...
...
src/pages/contractCreate/create-enclosure-info.vue
View file @
69bc360a
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
</div>
</div>
</h-content>
</h-content>
<bottom-tab
class=
"add-box"
>
<bottom-tab
class=
"add-box"
>
<tab-button
v-if=
"!isReadOnly"
class=
"before"
@
click
.
native=
"handSave"
>
保存
</tab-button>
<tab-button
v-if=
"!isReadOnly"
class=
"before"
@
click
.
native=
"handSave"
>
同步电子签
</tab-button>
<tab-button
v-if=
"!isReadOnly"
class=
"next"
@
click
.
native=
"isSubmit"
>
提交
</tab-button>
<tab-button
v-if=
"!isReadOnly"
class=
"next"
@
click
.
native=
"isSubmit"
>
提交
</tab-button>
<tab-button
v-if=
"isReadOnly"
class=
"before"
@
click
.
native=
"$routeGo()"
>
上一步
</tab-button>
<tab-button
v-if=
"isReadOnly"
class=
"before"
@
click
.
native=
"$routeGo()"
>
上一步
</tab-button>
</bottom-tab>
</bottom-tab>
...
@@ -510,9 +510,23 @@ export default {
...
@@ -510,9 +510,23 @@ export default {
}
}
})
})
},
},
//
保存
//
同步电子签
handSave
()
{
handSave
()
{
hlsPopup
.
showLongCenter
(
'保存成功!'
)
// hlsPopup.showLongCenter('保存成功!')
let
vm
=
this
let
url
=
process
.
env
.
basePath
+
'syn_content_app'
let
param
=
{
project_id
:
window
.
localStorage
.
project_id
,
}
vm
.
hlsPopup
.
showLoading
(
'请稍候'
)
vm
.
hlsHttp
.
post
(
url
,
param
).
then
(
function
(
res
)
{
vm
.
hlsPopup
.
hideLoading
()
if
(
res
.
result
===
'S'
)
{
vm
.
hlsPopup
.
showSuccess
(
'同步成功'
)
}
else
{
vm
.
hlsPopup
.
showLongCenter
(
res
.
message
)
}
})
},
},
isSubmit
()
{
isSubmit
()
{
let
vm
=
this
let
vm
=
this
...
...
src/pages/contractStart/add-car.vue
View file @
69bc360a
...
@@ -177,6 +177,7 @@
...
@@ -177,6 +177,7 @@
</div>
</div>
</h-content>
</h-content>
<bottom-tab
v-if=
"!flag"
>
<bottom-tab
v-if=
"!flag"
>
<tab-button
class=
"save"
@
click
.
native=
"handSave"
>
同步电子签
</tab-button>
<tab-button
class=
"approve"
@
click
.
native=
"checkStatus"
>
发车申请
</tab-button>
<tab-button
class=
"approve"
@
click
.
native=
"checkStatus"
>
发车申请
</tab-button>
</bottom-tab>
</bottom-tab>
<div
class=
"bottom-pop"
>
<div
class=
"bottom-pop"
>
...
@@ -377,6 +378,25 @@ export default {
...
@@ -377,6 +378,25 @@ export default {
})
})
},
},
methods
:
{
methods
:
{
// 同步电子签
handSave
()
{
// hlsPopup.showLongCenter('保存成功!')
let
vm
=
this
let
url
=
process
.
env
.
basePath
+
'syn_content_app'
let
param
=
{
project_id
:
vm
.
$route
.
params
.
project_id
,
}
vm
.
hlsPopup
.
showLoading
(
'请稍候'
)
vm
.
hlsHttp
.
post
(
url
,
param
).
then
(
function
(
res
)
{
if
(
res
.
result
===
'S'
)
{
vm
.
hlsPopup
.
hideLoading
()
vm
.
hlsPopup
.
showSuccess
(
'同步成功'
)
}
else
{
vm
.
hlsPopup
.
hideLoading
()
vm
.
hlsPopup
.
showLongCenter
(
res
.
message
)
}
})
},
getImg
(
id
)
{
// 获取合格证
getImg
(
id
)
{
// 获取合格证
let
vm
=
this
let
vm
=
this
let
randomString
=
Math
.
floor
(
Math
.
random
()
*
21
)
let
randomString
=
Math
.
floor
(
Math
.
random
()
*
21
)
...
@@ -484,8 +504,8 @@ export default {
...
@@ -484,8 +504,8 @@ export default {
var
recordUploadInterval
=
setInterval
(
function
()
{
var
recordUploadInterval
=
setInterval
(
function
()
{
if
(
alreadyUploadNum
===
attLength
)
{
if
(
alreadyUploadNum
===
attLength
)
{
clearInterval
(
recordUploadInterval
)
clearInterval
(
recordUploadInterval
)
/*
hlsPopup.hideLoading()
hlsPopup
.
hideLoading
()
hlsPopup.showLongCenter('图片上传成功') */
// hlsPopup.showLongCenter('图片上传成功')
}
}
},
500
)
},
500
)
for
(
var
i
=
0
;
i
<
list
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
list
.
length
;
i
++
)
{
...
@@ -1032,6 +1052,11 @@ export default {
...
@@ -1032,6 +1052,11 @@ export default {
color: #fff;
color: #fff;
background-color: #0041c4;
background-color: #0041c4;
}
}
.save{
border: 1px solid #fdb62f;
border-radius: 4px;
color: #fdb62f;
}
.bottom-pop {
.bottom-pop {
width: 100%;
width: 100%;
height: 0;
height: 0;
...
...
src/pages/pay/marginPay/first-pay.vue
View file @
69bc360a
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
</div>
</div>
<div
class=
"pay-input"
>
<div
class=
"pay-input"
>
<span>
应还保证金
</span>
<span>
应还保证金
</span>
<CurrencyInput
v-model=
"money"
type=
"number"
placeholder=
"请输入支付金额"
/>
<CurrencyInput
v-model=
"money"
placeholder=
"请输入支付金额"
/>
<!--
<div
@
click=
"createOrder"
>
<!--
<div
@
click=
"createOrder"
>
<img
src=
"@/assets/payment/into.png"
>
<img
src=
"@/assets/payment/into.png"
>
</div>
-->
</div>
-->
...
@@ -80,7 +80,7 @@ export default {
...
@@ -80,7 +80,7 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
money
:
null
,
money
:
''
,
Paied
:
0
,
// 已缴纳金额
Paied
:
0
,
// 已缴纳金额
default
:
0
,
default
:
0
,
pay_note
:
''
,
// 备注
pay_note
:
''
,
// 备注
...
...
www/index.html
View file @
69bc360a
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
name=
viewport
content=
"initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"
><meta
name=
format-detection
content=
"telephone=no"
><meta
name=
format-detection
content=
"email=no"
><meta
name=
apple-mobile-web-app-capable
content=
yes
><meta
name=
apple-mobile-web-app-status-bar-style
content=
black
><script
type=
text/javascript
src=
./static/vuePlatform.js
></script><script
type=
text/javascript
src=
./static/prototype.js
></script><script
type=
text/javascript
src=
cordova.js
></script><script
type=
text/javascript
src=
"http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"
></script><title>
徐工金服
</title><link
href=
./static/css/app.7de5d0bc7dc2e8e250a6b1b9d6516fc8.css
rel=
stylesheet
></head><body><div
id=
app-box
></div><script
type=
text/javascript
src=
./static/js/manifest.6a178e8d77c32e3c385d.js
></script><script
type=
text/javascript
src=
./static/js/vendor.e1961bfdd043afa10023.js
></script><script
type=
text/javascript
src=
./static/js/app.db3863e3e96ed0787df8.js
></script></body></html>
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
name=
viewport
content=
"initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"
><meta
name=
format-detection
content=
"telephone=no"
><meta
name=
format-detection
content=
"email=no"
><meta
name=
apple-mobile-web-app-capable
content=
yes
><meta
name=
apple-mobile-web-app-status-bar-style
content=
black
><script
type=
text/javascript
src=
./static/vuePlatform.js
></script><script
type=
text/javascript
src=
./static/prototype.js
></script><script
type=
text/javascript
src=
cordova.js
></script><script
type=
text/javascript
src=
"http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"
></script><title>
徐工金服
</title><link
href=
./static/css/app.8aff99fa55fe4dc60e6d63d96f17b12c.css
rel=
stylesheet
></head><body><div
id=
app-box
></div><script
type=
text/javascript
src=
./static/js/manifest.6a178e8d77c32e3c385d.js
></script><script
type=
text/javascript
src=
./static/js/vendor.c6877d591112b6e9baa7.js
></script><script
type=
text/javascript
src=
./static/js/app.4851b531dabbea1f3606.js
></script></body></html>
\ No newline at end of file
\ No newline at end of file
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