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
4c1a3f59
Commit
4c1a3f59
authored
Sep 05, 2019
by
潘琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、签约页未签名未作校验;2、已签约未审核和已签约审核驳回点击按钮提示并且关闭当前页;已签约已审核跳转至首页;3、IOS微信鉴权报NetWork问题;
parent
59897d1d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
10 deletions
+32
-10
signing.js
src/api/signing/signing.js
+2
-2
notice-img.png
src/assets/images/notice-img.png
+0
-0
permission.js
src/permission.js
+2
-1
index.vue
src/views/signing/index.vue
+17
-6
wxpermission.js
src/wxpermission.js
+11
-1
No files found.
src/api/signing/signing.js
View file @
4c1a3f59
...
...
@@ -31,8 +31,8 @@ export function getOrgInfo (params) {
export
function
getSignInfo
(
params
)
{
return
request
({
url
:
'/v1/voucher/poll'
,
method
:
'
POS
T'
,
data
:
params
method
:
'
GE
T'
,
params
:
params
})
}
...
...
src/assets/images/notice-img.png
View replaced file @
59897d1d
View file @
4c1a3f59
52.3 KB
|
W:
|
H:
350 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/permission.js
View file @
4c1a3f59
...
...
@@ -15,7 +15,6 @@ router.beforeEach((to, from, next) => {
// 判断链接是否被微信分享篡改,false需重定向
if
(
redirectUrl
())
{
wxpermission
(
0
,
()
=>
{})
// store.dispatch('setToken', '')
// store.dispatch('setUserId', '')
// let accessToken = store.getters.access_token
...
...
@@ -25,12 +24,14 @@ router.beforeEach((to, from, next) => {
if
(
params
.
code
)
{
store
.
dispatch
(
'setCode'
,
params
.
code
)
getOauthFn
(()
=>
{
wxpermission
(
0
,
()
=>
{})
next
()
})
}
else
{
getWXOauth
()
}
}
else
{
wxpermission
(
0
,
()
=>
{})
next
()
}
}
...
...
src/views/signing/index.vue
View file @
4c1a3f59
...
...
@@ -472,7 +472,7 @@ import { validatename, cardid, isvalidatemobile } from '@/util/validate'
import
{
SubtractDay
,
getBirthByIdNumber
,
getSexByIdCard
,
getAgeByBirth
}
from
'@/util/index'
import
_defaultPicture
from
'../../assets/images/org-default-picture.png'
import
_noticePicture
from
'../../assets/images/notice-img.png'
import
{
wxpermission
}
from
'@/wxpermission'
//
import { wxpermission } from '@/wxpermission'
const
wx
=
require
(
'weixin-js-sdk'
)
export
default
{
...
...
@@ -490,6 +490,7 @@ export default {
groupname
:
''
},
signStatus
:
'create'
,
signState
:
''
,
// 0=待审核 1=审核通过 2=审核不通过 3=审核已取消
alreadySignNum
:
0
,
// 已签约服务人员数
childrenArr
:
[
{
...
...
@@ -593,7 +594,7 @@ export default {
},
created
()
{
console
.
log
(
'created'
)
wxpermission
(
0
,
()
=>
{})
//
wxpermission(0, () => {})
// this.getOrgInfoFn()
this
.
getUserSignInfoFn
()
// 获取用户签约信息回显
},
...
...
@@ -681,6 +682,7 @@ export default {
this
.
fileUuid
=
data
.
fileUuid
this
.
signId
=
data
.
signId
this
.
userId
=
data
.
userId
this
.
signState
=
data
.
state
this
.
BaseForm
.
name
=
data
.
name
this
.
BaseForm
.
idCard
=
data
.
idCard
this
.
BaseForm
.
phone
=
data
.
phoneNumber
...
...
@@ -995,6 +997,13 @@ export default {
}
},
confirmSignature
()
{
if
(
this
.
signState
===
'1'
)
{
// 待审核 跳转至首页
this
.
$router
.
push
({
path
:
'/home'
})
return
}
this
.
BaseValidateHandle
()
if
(
this
.
pageType
===
1
)
{
// 子女
let
downState
=
true
...
...
@@ -1027,7 +1036,7 @@ export default {
},
handelSubmit
()
{
// 签名无误提交
this
.
signatureImage
=
this
.
$refs
.
signature
.
save
()
if
(
this
.
signatureImage
===
''
)
{
if
(
this
.
$refs
.
signature
.
isEmpty
()
)
{
this
.
$toast
({
message
:
'未获到签名信息,请先签名!'
,
position
:
'center'
,
...
...
@@ -1110,9 +1119,11 @@ export default {
position
:
'center'
,
duration
:
3000
})
setTimeout
(
function
()
{
wx
.
closeWindow
()
},
2500
)
if
(
this
.
signState
===
'0'
||
this
.
signState
===
'2'
||
this
.
signState
===
''
)
{
// 待审核、签约驳回、第一次签约
setTimeout
(
function
()
{
wx
.
closeWindow
()
},
2500
)
}
}
else
{
this
.
$toast
({
message
:
'保存失败'
,
...
...
src/wxpermission.js
View file @
4c1a3f59
import
{
WXconfirm
}
from
'@/api/wxconfirm'
import
store
from
'@/store'
// import { removeUrlParam } from '@/util/index'
import
{
Toast
}
from
'mint-ui'
const
wx
=
require
(
'weixin-js-sdk'
)
export
const
wxpermission
=
(
state
,
fn
)
=>
{
console
.
log
(
'微信鉴权'
)
console
.
log
(
window
.
location
.
href
)
let
curUrl
=
window
.
location
.
href
if
(
curUrl
.
split
(
'#'
).
length
>=
2
)
{
curUrl
=
window
.
location
.
href
.
split
(
'#'
)[
0
]
}
// Toast({
// message: curUrl,
// position: 'center',
// duration: 5 * 1000
// })
let
params
=
{
url
:
window
.
location
.
href
.
split
(
'#'
)[
0
]
,
url
:
curUrl
,
auth_id
:
store
.
getters
.
authId
}
WXconfirm
(
params
).
then
(
res
=>
{
...
...
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