Commit 4c1a3f59 by 潘琦

1、签约页未签名未作校验;2、已签约未审核和已签约审核驳回点击按钮提示并且关闭当前页;已签约已审核跳转至首页;3、IOS微信鉴权报NetWork问题;

parent 59897d1d
......@@ -31,8 +31,8 @@ export function getOrgInfo (params) {
export function getSignInfo (params) {
return request({
url: '/v1/voucher/poll',
method: 'POST',
data: params
method: 'GET',
params: params
})
}
......
src/assets/images/notice-img.png

52.3 KB | W: | H:

src/assets/images/notice-img.png

350 KB | W: | H:

src/assets/images/notice-img.png
src/assets/images/notice-img.png
src/assets/images/notice-img.png
src/assets/images/notice-img.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -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()
}
}
......
......@@ -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: '保存失败',
......
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 => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment