Skip to content

J
jd-vx-app
Commit 9ff11fc2 authored by 肖健's avatar 肖健
Browse files
Options

加签处理

parent 4adc59c9
Show whitespace changes
Inline Side-by-side
Showing with 749 additions and 736 deletions
common/api/api.js
View file @ 9ff11fc2
......@@ -70,11 +70,9 @@ const httpTokenRequest = (opts, data) => {
uni.removeStorageSync('userToken')
let returnPage= '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType,
success:()=>{
this.$jdLoginPage(returnPage, pageType, () => {
requestNumber = 0
}
})
}
return;
......
common/request/request/core/request.js
View file @ 9ff11fc2
import { mergeConfig, dispatchRequest, jsonpRequest} from "./utils.js";
import {jdLoginPage} from '@/common/utils.js'
export default class request {
constructor(options) {
......@@ -131,9 +132,7 @@ export default class request {
uni.removeStorageSync('userToken')
let returnPage= '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType,
})
jdLoginPage(returnPage, pageType)
}
}, 800)
}
......
common/request/requestConfig.js
View file @ 9ff11fc2
import request from "./request";
import {jdLoginPage} from '@/common/utils.js'
// 全局配置的请求域名
......@@ -185,9 +187,7 @@ $http.dataFactory = async function(res) {
uni.removeStorageSync('userToken')
let returnPage= '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType,
})
jdLoginPage(returnPage, pageType)
}
}, 800)
} else { //其他错误提示
......
common/utils.js
View file @ 9ff11fc2
import util from '@/pages/login/util.js'
import ParamsSign from 'js-security-jdxcx';
let loginPlugin = requirePlugin('loginPlugin');
export function goToLocation(item) {
//小程序内链接
if(item.busType == 3 && item.link){
......@@ -13,9 +14,7 @@ export function goToLocation(item) {
uni.setStorageSync('jdNavToObj', item)
let returnPage= '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType
})
this.$jdLoginPage(returnPage, pageType)
return
}
//H5链接,判断链接是否设置
......@@ -41,3 +40,20 @@ export function goToLocation(item) {
}
}
export function jdLoginPage(returnPage, pageType, successCallback) {
//设置加固对象
loginPlugin.setParamsSign && loginPlugin.setParamsSign(ParamsSign);
var url = '/pages/login/index/index?returnPage=' + (returnPage ? returnPage : '') + "&pageType=" + (pageType ? pageType: '');
console.log('url', url);
uni.navigateTo({
url: url,
success:()=>{
if(successCallback) {
successCallback();
}
}
})
}
\ No newline at end of file
main.js
View file @ 9ff11fc2
......@@ -6,7 +6,7 @@ Vue.prototype.$store = store;
import http from "./common/api/api.js"
import $http from '@/common/request/requestConfig';
import {goToLocation} from '@/common/utils.js'
import {goToLocation, jdLoginPage} from '@/common/utils.js'
Vue.config.productionTip = false
import ActiveForm from "@/common/active-form/active-form";
......@@ -15,6 +15,7 @@ Vue.use(uView);
Vue.prototype.http = http
Vue.prototype.$http = $http
Vue.prototype.$goToLocation = goToLocation
Vue.prototype.$jdLoginPage = jdLoginPage
// import uma from "umtrack-wx";
// uma.init({
......
pages/home-new.vue
View file @ 9ff11fc2
......@@ -155,9 +155,7 @@
goJdLogin(){
let returnPage= '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType
})
this.$jdLoginPage(returnPage, pageType)
},
getPrice() {
if(this.clickState == false){
......
pages/home.vue
View file @ 9ff11fc2
......@@ -100,9 +100,7 @@
goJdLogin(){
let returnPage= '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType
})
this.$jdLoginPage(returnPage, pageType)
},
getPrice() {
if(this.clickState == false){
......
pages/main.vue
View file @ 9ff11fc2
......@@ -143,15 +143,28 @@
}, 300)
}
} else {
let returnPage = '/pages/main';
let returnPage = '/pages/main'
let pageType = "reLaunch"
uni.navigateTo({
url: "/pages/login/index/index?returnPage=" + returnPage + '&pageType=' + pageType
})
this.$jdLoginPage(returnPage, pageType)
}
break;
case 3:
this.tab = 'shop'
// this.tab = 'shop'
uni.navigateToMiniProgram({
appId: 'wx1bfd5dd137c5ef13', // 跳转目标小程序的id
// path: item.link, // 目标小程序的页面路径
extraData: { // 需要携带的参数
},
success:(res)=> {
// 打开成功
},
fail:()=>{
}
})
break;
case 4:
this.tab = 'personal'
......@@ -313,10 +326,11 @@
} = res;
if (!token) {
console.log(res, "pin_key失效")
uni.navigateTo({
url: "/pages/login/index/index"
})
uni.hideLoading()
let returnPage= '/pages/main'
let pageType = "reLaunch"
that.$jdLoginPage(returnPage, pageType)
// uni.showToast({
// title: `京东登录失败:${message}`,
// icon: 'none',
......@@ -402,9 +416,7 @@
uni.setStorageSync('scene', decodeURIComponent(option.scene))
let returnPage = '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url: "/pages/login/index/index?returnPage=" + returnPage + '&pageType=' + pageType
})
this.$jdLoginPage(returnPage, pageType)
}
}
} else {
......
pages/moveCar.vue
View file @ 9ff11fc2
......@@ -102,9 +102,10 @@
// uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=1'
// })
uni.navigateTo({
url: '/pages/login/index/index'
})
let returnPage= '/pages/main'
let pageType = "reLaunch"
uni.setStorageSync('tabbar', 1)
this.$jdLoginPage(returnPage, pageType)
return;
}
const that = this
......
pages/personal.vue
View file @ 9ff11fc2
......@@ -199,11 +199,9 @@
// uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=4'
// })
let returnPage= '/pages/main';
let returnPage= '/pages/main'
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType
})
this.$jdLoginPage(returnPage, pageType)
return;
}
uni.navigateTo({
......@@ -218,11 +216,9 @@
// uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=4'
// })
let returnPage= '/pages/main';
let returnPage= '/pages/main'
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType
})
this.$jdLoginPage(returnPage, pageType)
return;
}
if(vo.type == "jd"){
......@@ -255,9 +251,10 @@
// uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=4'
// })
uni.navigateTo({
url: '/pages/login/index/index'
})
uni.setStorageSync('tabbar', 4)
let returnPage = '/pages/main'
let pageType = "reLaunch"
this.$jdLoginPage(returnPage, pageType)
return;
}
uni.navigateTo({
......@@ -396,7 +393,8 @@
let query = uni.createSelectorQuery().in(that);
setTimeout(() => {
query.select(".personal").boundingClientRect(function(data) { //data - 各种参数 // 获取元素高度
query.select(".personal").boundingClientRect(function(data) { //data - 各种参数
// 获取元素高度
let personalHeight = data.height
uni.createSelectorQuery().in(that.$parent.$refs.myTab).select(".weui-tabbar").boundingClientRect(function(data) { //data - 各种参数
......
pages/shop.vue
View file @ 9ff11fc2
......@@ -105,9 +105,7 @@ export default {
if(!token){
let returnPage= '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType
})
this.$jdLoginPage(returnPage, pageType)
return;
}
if(link){
......
pagesA/pages/mrAct/index.vue
View file @ 9ff11fc2
......@@ -334,9 +334,7 @@ export default {
//跳转到登录页
let returnPage = '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url: "/pages/login/index/index?returnPage=" + returnPage + '&pageType=' + pageType
})
this.$jdLoginPage(returnPage, pageType)
return
}
},
......
pagesA/pages/popAct/index.vue
View file @ 9ff11fc2
......@@ -156,9 +156,7 @@ export default {
//跳转到登录页
let returnPage = '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url: "/pages/login/index/index?returnPage=" + returnPage + '&pageType=' + pageType
})
this.$jdLoginPage(returnPage, pageType)
},
// 选择爱车
radioChange(item){
......
pagesC/pages/shop/detail.vue
View file @ 9ff11fc2
......@@ -48,9 +48,9 @@ export default {
// uni.navigateTo({
// url: '/pages/binding/index?url=/pagesC/pages/shop/detail&id=' + this.id
// })
uni.navigateTo({
url: '/pages/login/index/index'
})
let returnPage= '/pages/main'
let pageType = "reLaunch"
this.$jdLoginPage(returnPage, pageType)
return;
}
uni.navigateTo({
......
pagesC/pages/shop/search.vue
View file @ 9ff11fc2
......@@ -71,9 +71,7 @@
if (!token) {
let returnPage = '/pages/main';
let pageType = "reLaunch"
uni.navigateTo({
url: "/pages/login/index/index?returnPage=" + returnPage + '&pageType=' + pageType
})
this.$jdLoginPage(returnPage, pageType)
return;
}
if (link) {
......
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