Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
voucher-h5
Project
Overview
Details
Activity
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
潘琦
voucher-h5
Commits
6cdabcc7
Commit
6cdabcc7
authored
Oct 23, 2019
by
潘琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生育全程签约接口命名变更;
parent
a49d0ddf
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
9 deletions
+33
-9
webpack.prod.conf.js
build/webpack.prod.conf.js
+17
-2
signing.js
src/api/signing/signing.js
+12
-3
index.vue
src/views/signing/index.vue
+2
-2
index.vue
src/views/signingWD/index.vue
+2
-2
No files found.
build/webpack.prod.conf.js
View file @
6cdabcc7
...
...
@@ -15,6 +15,21 @@ const env = process.env.NODE_ENV === 'testing'
?
require
(
'../config/test.env'
)
:
require
(
'../config/prod.env'
)
let
timeStamp
,
date
,
year
,
month
,
day
date
=
new
Date
()
year
=
date
.
getFullYear
().
toString
()
if
(
date
.
getMonth
()
+
1
<
10
)
{
month
=
(
date
.
getMonth
()
+
1
)
}
else
{
month
=
(
date
.
getMonth
()
+
1
).
toString
()
}
if
(
date
.
getDate
()
<
10
)
{
day
=
'0'
+
date
.
getDate
()
}
else
{
day
=
date
.
getDate
().
toString
()
}
timeStamp
=
year
+
month
+
day
const
webpackConfig
=
merge
(
baseWebpackConfig
,
{
module
:
{
rules
:
utils
.
styleLoaders
({
...
...
@@ -26,8 +41,8 @@ const webpackConfig = merge(baseWebpackConfig, {
devtool
:
config
.
build
.
productionSourceMap
?
config
.
build
.
devtool
:
false
,
output
:
{
path
:
config
.
build
.
assetsRoot
,
filename
:
utils
.
assetsPath
(
'js/[name].[chunkhash].js
'
),
chunkFilename
:
utils
.
assetsPath
(
'js/[id].[chunkhash].js
'
)
filename
:
utils
.
assetsPath
(
'js/[name].[chunkhash].js
?v='
+
timeStamp
),
chunkFilename
:
utils
.
assetsPath
(
'js/[id].[chunkhash].js
?v='
+
timeStamp
)
},
plugins
:
[
// http://vuejs.github.io/vue-loader/en/workflow/production.html
...
...
src/api/signing/signing.js
View file @
6cdabcc7
...
...
@@ -45,10 +45,19 @@ export function getOrgsByAreaCode (params) {
})
}
// 签约
export
function
createSign
(
params
)
{
// 签约
(乌当)
export
function
createSign
WD
(
params
)
{
return
request
({
url
:
'/v1/voucher/sign'
,
url
:
'/v1/voucher/wd/sign'
,
method
:
'POST'
,
data
:
params
})
}
// 签约(张家港)
export
function
createSignZJG
(
params
)
{
return
request
({
url
:
'/v1/voucher/zjg/sign'
,
method
:
'POST'
,
data
:
params
})
...
...
src/views/signing/index.vue
View file @
6cdabcc7
...
...
@@ -488,7 +488,7 @@
<
script
>
import
store
from
'@/store'
import
{
getOrgInfo
,
getSignInfo
,
getAreaList
,
getVillages
,
getOrgsByAreaCode
,
createSign
,
updateSignImgBySignId
}
from
'@/api/signing/signing'
import
{
getOrgInfo
,
getSignInfo
,
getAreaList
,
getVillages
,
getOrgsByAreaCode
,
createSign
ZJG
,
updateSignImgBySignId
}
from
'@/api/signing/signing'
import
{
validatename
,
cardid
,
isvalidatemobile
}
from
'@/util/validate'
import
{
SubtractDay
,
getBirthByIdNumber
,
getSexByIdCard
,
getAgeByBirth
}
from
'@/util/index'
import
_defaultPicture
from
'../../assets/images/org-default-picture.png'
...
...
@@ -1238,7 +1238,7 @@ export default {
this
.
btnDisabled
=
true
this
.
$Indicator
.
open
()
// console.log('sign params:' + JSON.stringify(params))
createSign
(
params
).
then
(
res
=>
{
createSign
ZJG
(
params
).
then
(
res
=>
{
this
.
btnDisabled
=
false
this
.
$Indicator
.
close
()
if
(
res
.
data
.
code
===
200
&&
res
.
data
.
value
)
{
...
...
src/views/signingWD/index.vue
View file @
6cdabcc7
...
...
@@ -449,7 +449,7 @@
<
script
>
import
store
from
'@/store'
import
{
getOrgInfo
,
getSignInfo
,
getAreaList
,
getVillages
,
getOrgsByAreaCode
,
createSign
}
from
'@/api/signing/signing'
import
{
getOrgInfo
,
getSignInfo
,
getAreaList
,
getVillages
,
getOrgsByAreaCode
,
createSign
WD
}
from
'@/api/signing/signing'
import
{
validatename
,
cardid
,
isvalidatemobile
}
from
'@/util/validate'
import
{
SubtractDay
,
getBirthByIdNumber
,
getSexByIdCard
,
getAgeByBirth
}
from
'@/util/index'
import
_defaultPicture
from
'../../assets/images/org-default-picture.png'
...
...
@@ -1112,7 +1112,7 @@ export default {
this
.
btnDisabled
=
true
this
.
$Indicator
.
open
()
// console.log('sign params:' + JSON.stringify(params))
createSign
(
params
).
then
(
res
=>
{
createSign
WD
(
params
).
then
(
res
=>
{
this
.
btnDisabled
=
false
this
.
$Indicator
.
close
()
if
(
res
.
code
===
200
&&
res
.
value
)
{
...
...
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