Commit bbe736bf51a9e8daa8da12b2fb8fb94c6d1a398e

Authored by 夏洋涛
1 parent d4165af3
Exists in master

feat:去除测试数据,修改location.href

@@ -14,4 +14,5 @@ npm-debug.log* @@ -14,4 +14,5 @@ npm-debug.log*
14 yarn-debug.log* 14 yarn-debug.log*
15 yarn-error.log* 15 yarn-error.log*
16 16
17 -public.zip  
18 \ No newline at end of file 17 \ No newline at end of file
  18 +public.zip
  19 +*.zip
src/components/Background.vue
@@ -45,7 +45,7 @@ export default { @@ -45,7 +45,7 @@ export default {
45 let isLogin = this.checkLogin() 45 let isLogin = this.checkLogin()
46 if (!isLogin) return 46 if (!isLogin) return
47 if (process.env.NODE_ENV === 'production' && this.common.isWeiXin()) { 47 if (process.env.NODE_ENV === 'production' && this.common.isWeiXin()) {
48 - location.href = `http://sao315.com/w/api/saoyisao?redirect_uri=https://zlyanxue.cn/wap/index.html%23/MyClassList` 48 + window.open(`http://sao315.com/w/api/saoyisao?redirect_uri=https://zlyanxue.cn/wap/index.html%23/MyClassList`)
49 } else { 49 } else {
50 this.$router.push({ name: 'MyClassList', query: { qrresult: '188' } }) 50 this.$router.push({ name: 'MyClassList', query: { qrresult: '188' } })
51 } 51 }
src/views/Authorize.vue
@@ -17,8 +17,7 @@ export default { @@ -17,8 +17,7 @@ export default {
17 let openId = localStorage.getItem('openId') 17 let openId = localStorage.getItem('openId')
18 if (!openId) { 18 if (!openId) {
19 if (!code) { 19 if (!code) {
20 - // location.href = `https://ocp.sxsedu.net/szsh/usercenter/api/wx/wx1305e88d2bc74073/getCode/yx_zlyx`  
21 - location.href = `https://ocp.sxsedu.net/szsh/usercenter/api/wx/wx1305e88d2bc74073/getCode/yx_test_auth` 20 + window.open('https://ocp.sxsedu.net/szsh/usercenter/api/wx/wx1305e88d2bc74073/getCode/yx_test_auth')
22 } else { 21 } else {
23 // 通过code获取openId和token 22 // 通过code获取openId和token
24 this.$toast.loading({ 23 this.$toast.loading({
@@ -40,8 +39,8 @@ export default { @@ -40,8 +39,8 @@ export default {
40 } else { 39 } else {
41 setTimeout(() => { 40 setTimeout(() => {
42 localStorage.removeItem('openId') 41 localStorage.removeItem('openId')
43 - // location.href = `https://ocp.sxsedu.net/szsh/usercenter/api/wx/wx1305e88d2bc74073/getCode/yx_zlyx`  
44 - location.href = `https://ocp.sxsedu.net/szsh/usercenter/api/wx/wx1305e88d2bc74073/getCode/yx_test_auth` 42 + window.open('https://ocp.sxsedu.net/szsh/usercenter/api/wx/wx1305e88d2bc74073/getCode/yx_test_auth')
  43 +
45 }, 2000) 44 }, 2000)
46 } 45 }
47 }) 46 })
src/views/Home.vue
@@ -238,10 +238,10 @@ export default { @@ -238,10 +238,10 @@ export default {
238 const miniprogram = sUserAgent.indexOf('miniprogram') > -1 && sUserAgent.indexOf('alipay') > -1 238 const miniprogram = sUserAgent.indexOf('miniprogram') > -1 && sUserAgent.indexOf('alipay') > -1
239 if (dtdreamweb) { 239 if (dtdreamweb) {
240 // alert('浙里办') 240 // alert('浙里办')
241 - window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=8301b7fe71594245b97560ff841db1f2` 241 + window.open(`https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=8301b7fe71594245b97560ff841db1f2`)
242 } else if (miniprogram) { 242 } else if (miniprogram) {
243 // alert('支付宝') 243 // alert('支付宝')
244 - window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=8301b7fe71594245b97560ff841db1f2` 244 + window.open(`https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=8301b7fe71594245b97560ff841db1f2`)
245 } else { 245 } else {
246 // alert('非浙里办渠道访问,显示测试用户数据') 246 // alert('非浙里办渠道访问,显示测试用户数据')
247 // console.log('非浙里办渠道访问,显示测试用户数据', userData) 247 // console.log('非浙里办渠道访问,显示测试用户数据', userData)
@@ -298,20 +298,20 @@ export default { @@ -298,20 +298,20 @@ export default {
298 }).then((res) => { 298 }).then((res) => {
299 if (dtdreamweb) { 299 if (dtdreamweb) {
300 // alert('浙里办') 300 // alert('浙里办')
301 - window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=8301b7fe71594245b97560ff841db1f2` 301 + window.open(`https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=8301b7fe71594245b97560ff841db1f2`)
302 } else if (miniprogram) { 302 } else if (miniprogram) {
303 // alert('支付宝') 303 // alert('支付宝')
304 - window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=8301b7fe71594245b97560ff841db1f2` 304 + window.open(`https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=8301b7fe71594245b97560ff841db1f2`)
305 } 305 }
306 }) 306 })
307 } else { 307 } else {
308 localStorage.setItem('reloadCount', 2) 308 localStorage.setItem('reloadCount', 2)
309 if (dtdreamweb) { 309 if (dtdreamweb) {
310 // alert('浙里办') 310 // alert('浙里办')
311 - window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=8301b7fe71594245b97560ff841db1f2` 311 + window.open(`https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=8301b7fe71594245b97560ff841db1f2`)
312 } else if (miniprogram) { 312 } else if (miniprogram) {
313 // alert('支付宝') 313 // alert('支付宝')
314 - window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=8301b7fe71594245b97560ff841db1f2` 314 + window.open(`https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=8301b7fe71594245b97560ff841db1f2`)
315 } 315 }
316 } 316 }
317 }, 317 },