Skip to content

J
jd-vx-app
Commit e88bab69 authored by lijiongliang's avatar lijiongliang
Browse files
Options

页面修改

parent 28abc381
Show whitespace changes
Inline Side-by-side
Showing with 504 additions and 409 deletions
pages/binding/index.vue
View file @ e88bab69
......@@ -20,8 +20,7 @@
</view> -->
<view v-if="isCanUse2">
<view>
<button class="login__btn" v-if="!checked" hover-class="none" type='primary'
@click="checkLogin">
<button class="login__btn" v-if="!checked" hover-class="none" type='primary' @click="checkLogin">
微信一键登录
</button>
......@@ -38,14 +37,14 @@
<u-checkbox-group placement="row">
<u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
</u-checkbox-group>
已阅读并同意 <span @click="goArticle(1)">《用户注册服务协议》</span>、<span @click="goArticle(2)">《京东挪车牌隐私权政策》</span>。若您的手机号未注册，将为您直接注册友众账号
已阅读并同意 <span @click="goArticle(1)">《用户注册服务协议》</span>、<span
@click="goArticle(2)">《京东挪车牌隐私权政策》</span>。若您的手机号未注册，将为您直接注册友众账号
</div>
</div>
</view>
</template>
<script>
export default {
export default {
data() {
return {
checked: true,
......@@ -53,16 +52,16 @@ export default {
isCanUse: false, //默认为true
isCanUse2: false, //默认为true
openid: '',
nc_protocol : false,
nc_protocol: false,
//扫描二维码参数
scene : "",
scene: "",
//检查绑定挪车码
checkCode: {},
//上级url
superiorUrl: '/pages/main',
//上级路径参数
superiorParam: "index",
failure:null
failure: null
};
},
methods: {
......@@ -79,19 +78,24 @@ export default {
},
//检查挪车码存在、是否绑定
getCheckMoveCode(){
let opts = { url: '/app/user/check/move/code', method: 'post' };
this.http.httpTokenRequest(opts, {code:this.scene}).then(res => {
getCheckMoveCode() {
let opts = {
url: '/app/user/check/move/code',
method: 'post'
};
this.http.httpTokenRequest(opts, {
code: this.scene
}).then(res => {
if (res.data.code == 200) {
this.checkCode = res.data.data
//未绑定了的情况
if(!this.checkCode.bindFlag){
if (!this.checkCode.bindFlag) {
uni.navigateTo({
url: '/pagesB/pages/move-car/scan?moveCode=' + this.checkCode.code
})
}else if(this.checkCode.selfFlag){
} else if (this.checkCode.selfFlag) {
}else{
} else {
}
}
......@@ -111,7 +115,10 @@ export default {
let param = {
code: code,
}
let opts = { url: '/xcx/code/session', method: 'post' }
let opts = {
url: '/xcx/code/session',
method: 'post'
}
await that.http.httpRequest(opts, param).then(res => {
if (res.data.code == 200) {
that.openid = res.data.data.openid
......@@ -123,7 +130,7 @@ export default {
getPhoneNumber(e) {
uni.showLoading({
title: '加载中',
mask:true
mask: true
});
let that = this
if (e.detail.errMsg == "getPhoneNumber:ok") {
......@@ -142,25 +149,33 @@ export default {
let param = {
code: detail.code,
openid : that.openid
openid: that.openid
}
let opts = {
url: '/xcx/login',
method: 'post'
}
let opts = { url: '/xcx/login', method: 'post' }
await that.http.httpRequest(opts, param).then(res => {
if (res.data.code == 200) {
uni.showToast({
title:'授权成功',
duration:1500
title: '授权成功',
duration: 1500
})
uni.setStorageSync('xcxIndexPath', res.data.data.xcxIndexPath);
uni.setStorageSync("userToken", res.data.data.token)
if(this.scene) {
let param = {code : this.scene}
opts = { url: '/app/user/check/move/code', method: 'post' }
if (this.scene) {
let param = {
code: this.scene
}
opts = {
url: '/app/user/check/move/code',
method: 'post'
}
that.http.httpTokenRequest(opts, param).then(res => {
if (res.data.code == 200) {
if(res.data.data.bindFlag) {
if (res.data.data.bindFlag) {
that.gotoMoveCar();
} else {
that.gotoBindMoveCar();
......@@ -168,7 +183,7 @@ export default {
}
})
} else if(this.failure == 401 ){
} else if (this.failure == 401) {
uni.navigateBack()
return
} else {
......@@ -177,20 +192,20 @@ export default {
} else {
uni.showToast({
title:'授权失败',
icon:'none',
title: '授权失败',
icon: 'none',
})
}
})
},
gotoIndex() {
let jumpUrl = this.superiorUrl
if(this.superiorUrl == '/pages/main'){
if(!this.superiorParam){
if (this.superiorUrl == '/pages/main') {
if (!this.superiorParam) {
this.superiorParam = "0"
}
jumpUrl += "?index=" + this.superiorParam
}else{
} else {
jumpUrl += "?id=" + this.superiorParam
}
//跳转到绑定页面
......@@ -220,17 +235,20 @@ export default {
});
},
// 跳转协议政策页面
goArticle(index){
let opts = { url: '', method: 'get' };
if(index == 1){
goArticle(index) {
let opts = {
url: '',
method: 'get'
};
if (index == 1) {
opts.url = "/app/user/registerAgreement"
}else{
} else {
opts.url = "/app/user/ofPrivacy"
}
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
let data = res.data.msg
uni.setStorageSync("articelContent",data)
uni.setStorageSync("articelContent", data)
uni.navigateTo({
url: '/pages/binding/article'
});
......@@ -241,23 +259,23 @@ export default {
onLoad(e) { //默认加载
let openid = uni.getStorageSync('openid');
this.failure = e.failure
if(!openid) {
if (!openid) {
this.wechatLogin()
} else {
this.openid = openid;
}
if(e && e.url){
if (e && e.url) {
this.superiorUrl = e.url
if(e.index){
if (e.index) {
this.superiorParam = e.index
}
if(e.id){
if (e.id) {
this.superiorParam = e.id
}
}
// #ifdef MP-WEIXIN
if(e.scene) {
if (e.scene) {
//获取二维码携带的参数
//扫码后得到的参数
......@@ -275,18 +293,26 @@ export default {
let userToken = uni.getStorageSync('userToken')
if (userToken) {
let that = this
let opts = { url: '/app/user/info', method: 'get' }
let opts = {
url: '/app/user/info',
method: 'get'
}
that.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
uni.setStorageSync('xcxIndexPath', res.data.data.xcxIndexPath);
if(that.scene) {
let param = {code : this.scene}
opts = { url: '/app/user/check/move/code', method: 'post' }
if (that.scene) {
let param = {
code: this.scene
}
opts = {
url: '/app/user/check/move/code',
method: 'post'
}
that.http.httpTokenRequest(opts, param).then(res => {
console.info(res);
if (res.data.code == 200) {
if(res.data.data.bindFlag) {
if (res.data.data.bindFlag) {
that.gotoMoveCar();
} else {
that.gotoBindMoveCar();
......@@ -300,8 +326,8 @@ export default {
} else {
uni.showToast({
title:'授权失败',
icon:'none',
title: '授权失败',
icon: 'none',
})
this.isCanUse2 = true
}
......@@ -312,25 +338,28 @@ export default {
// #endif
}
}
}
</script>
<style lang="scss" scoped>
button::after {
button::after {
border: none;
}
.appCotent{
}
.appCotent {
display: flex;
align-items: center;
justify-content: center;
}
.binding {
}
.binding {
position: relative;
top:-120rpx;
top: -120rpx;
.login__logo {
// padding-top: 206rpx;
text-align: center;
image {
width: 174rpx;
height: 174rpx;
......@@ -377,9 +406,10 @@ button::after {
left: 0;
right: 0;
margin: 0 auto;
span {
color: rgb(0, 81, 255);
}
}
}
}
</style>
pages/main.vue
View file @ e88bab69
......@@ -34,7 +34,8 @@
data() {
return {
tab: "index",
page: 1
page: 1,
scene: null // 二维码携带参数
}
},
computed: {
......@@ -162,7 +163,10 @@
let param = {
code: code,
}
let opts = { url: '/xcx/code/session', method: 'post' }
let opts = {
url: '/xcx/code/session',
method: 'post'
}
await that.http.httpRequest(opts, param).then(res => {
if (res.data.code == 200) {
that.openid = res.data.data.openid
......@@ -174,7 +178,7 @@
onLoad(option) {
// 静默授权获取openid
let openid = uni.getStorageSync('openid');
if(!openid) {
if (!openid) {
this.wechatLogin()
}
......@@ -191,8 +195,10 @@
});
}
console.log(option,uni.getStorageSync('scene'),22222222222)
let token = uni.getStorageSync('userToken')
if(!token){
if (!token) {
let ptKey = plugin.getPtKey();
if (ptKey) {
uni.showLoading({
......@@ -207,12 +213,15 @@
} = res;
if (!token) {
uni.navigateTo({
url:"/pages/login/index/index"
})
uni.hideLoading()
uni.showToast({
title: `京东登录失败:${message}`,
icon: 'none',
duration: 2000
});
// uni.showToast({
// title: `京东登录失败:${message}`,
// icon: 'none',
// duration: 2000
// });
} else {
let opts = {
url: '/xcx/login',
......@@ -221,17 +230,40 @@
let openid = uni.getStorageSync('openid')
that.http.httpTokenRequest(opts, {
token: token,
openid:openid
openid: openid
}).then(res => {
if (res.data.code == 200) {
let token = res.data.data.token
uni.setStorageSync('userToken',token)
uni.setStorageSync('userToken', token)
uni.hideLoading()
uni.showToast({
title: "登录成功",
icon: 'none',
duration: 2000
});
// 判断是否扫码进入
that.scene = uni.getStorageSync('scene')
if (that.scene) {
//获取二维码携带的参数
//扫码后得到的参数
that.http.httpTokenRequest({
url: '/app/user/check/move/code',
method: 'post'
}, {
code: that.scene
}).then(res => {
if (res.data.code == 200) {
if (res.data.data.bindFlag) {
that.gotoMoveCar(that.scene);
} else {
that.gotoBindMoveCar(that.scene);
}
uni.removeStorageSync('scene')
}
})
}
}
})
}
......@@ -239,6 +271,35 @@
}).catch(err => {
console.log('err', err)
})
}else{
// 判断是否扫码进入
if (option && option.scene) {
uni.setStorageSync('scene', decodeURIComponent(option.scene))
uni.navigateTo({
url:"/pages/login/index/index"
})
}
}
}else{
// 判断是否扫码进入
if (option && option.scene) {
//获取二维码携带的参数
//扫码后得到的参数
that.scene = decodeURIComponent(option.scene)
that.http.httpTokenRequest({
url: '/app/user/check/move/code',
method: 'post'
}, {
code: that.scene
}).then(res => {
if (res.data.code == 200) {
if (res.data.data.bindFlag) {
that.gotoMoveCar(that.scene);
} else {
that.gotoBindMoveCar(that.scene);
}
}
})
}
}
......
pages/personal.vue
View file @ e88bab69
......@@ -62,6 +62,7 @@
</template>
<script>
let plugin = requirePlugin('loginPlugin');
export default {
data() {
return {
......@@ -71,11 +72,12 @@ export default {
icon: require("@/static/my/my01.png"),
title: "我的订单",
url: "/pagesD/pages/personal/myJdOrder"
},{
icon: require("@/static/my/my12.png"),
title: "我的地址",
url: "/pagesD/pages/personal/myAddress"
},
// {
// icon: require("@/static/my/my12.png"),
// title: "我的地址",
// url: "/pagesD/pages/personal/myAddress"
// },
{
icon: require("@/static/my/my8.png"),
title: "使用帮助",
......@@ -133,10 +135,12 @@ export default {
uni.removeStorageSync('userToken')
uni.removeStorageSync('xcxIndexPath')
// uni.removeStorageSync('openid')
plugin.logout().then((res) => {
console.jdLoginLog(res, 'logoutres');
uni.reLaunch({
url: '/pages/main'
});
});
}
})
......@@ -488,7 +492,7 @@ export default {
background: rgba(0, 0, 0, .1);
}
.list__item:nth-of-type(3) {
.list__item:nth-of-type(2) {
.list__left {
image {
width: 29rpx;
......@@ -498,7 +502,7 @@ export default {
}
}
.list__item:nth-of-type(4) {
.list__item:nth-of-type(3) {
.list__left {
image {
width: 28rpx;
......@@ -508,7 +512,7 @@ export default {
}
}
.list__item:nth-of-type(5) {
.list__item:nth-of-type(4) {
.list__left {
image {
width: 28rpx;
......
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