f44c0ade12
1. 会员等级背景图去掉校验 2. 当查询不到会员等级是，按无会员等级展示 3. 删除商城首页冗余配置在index中的引用 4. 换绑推广人时，计算上一个推广人的推广人数 5. pc后台清除推广人时，更新推广人数量 6. 保证砍价金额最小为0.01 7. 修复商品删除时购物车关联删除 8. 删除商品问题修复 9. 运费模板——指定包邮，包邮数量类型修改 10. 签到错误修复 11. 修复我的优惠券只查询20条的问题 12. 文章列表修复 13. 拼团商品详情页数据统计显示问题修复 14. PC后台，账户详情，持有优惠券列表修复 15. 支付查询参数修复 16. 修复过期优惠券可以重复领取 17. 订单邮费切换地址重复计算修复 18. 判断是否在指定包邮区域内 必须满足件数 + 金额 才能包邮 19. 支付页面，切换tab，金额计算问题修复 20. 物流模板新增、编辑——修复 21. 去除线下邮费的影响 22. 订单运费计算重写 23. 下单页面到店自提合计金额不应该计算商品邮费 24. 新人券领取后，部分使用时间为空——修复
441 lines
11 KiB
Vue
441 lines
11 KiB
Vue
<template>
|
|
<view class="page">
|
|
<view class="system-height" :style="{height:statusBarHeight}"></view>
|
|
<!-- #ifdef MP -->
|
|
<view class="title-bar" style="height: 43px;">
|
|
<view class="icon" @click="back" v-if="!isHome">
|
|
<image src="../static/left.png"></image>
|
|
</view>
|
|
<view class="icon" @click="home" v-else>
|
|
<image src="../static/home.png"></image>
|
|
</view>
|
|
账户登录
|
|
</view>
|
|
<!-- #endif -->
|
|
<view class="wechat_login">
|
|
<view class="img">
|
|
<image src="../static/wechat_login.png" mode="widthFix"></image>
|
|
</view>
|
|
<view class="btn-wrapper">
|
|
<!-- #ifdef H5 -->
|
|
<button hover-class="none" @click="wechatLogin" class="bg-green btn1">微信登录</button>
|
|
<!-- #endif -->
|
|
<!-- #ifdef MP -->
|
|
<button hover-class="none" open-type="getUserInfo" @getuserinfo="setUserInfo" class="bg-green btn1">微信登录</button>
|
|
<!-- #endif -->
|
|
<!-- <button hover-class="none" @click="isUp = true" class="btn2">手机号登录</button> -->
|
|
</view>
|
|
</view>
|
|
<block v-if="isUp">
|
|
<mobileLogin :isUp="isUp" @close="maskClose" :authKey="authKey" @wechatPhone="wechatPhone"></mobileLogin>
|
|
</block>
|
|
<block v-if="isPhoneBox">
|
|
<routinePhone :logoUrl="logoUrl" :isPhoneBox="isPhoneBox" @close="bindPhoneClose" :authKey="authKey"></routinePhone>
|
|
</block>
|
|
</view>
|
|
</template>
|
|
|
|
<script>
|
|
const app = getApp();
|
|
let statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
|
|
import mobileLogin from '@/components/login_mobile/index.vue'
|
|
import routinePhone from '@/components/login_mobile/routine_phone.vue'
|
|
import {
|
|
mapGetters
|
|
} from "vuex";
|
|
import {
|
|
getLogo,
|
|
silenceAuth,
|
|
getUserPhone,
|
|
wechatAuthV2
|
|
} from '@/api/public';
|
|
import {
|
|
LOGO_URL,
|
|
EXPIRES_TIME,
|
|
USER_INFO,
|
|
STATE_R_KEY
|
|
} from '@/config/cache';
|
|
import {
|
|
getUserInfo
|
|
} from '@/api/user.js'
|
|
import Routine from '@/libs/routine';
|
|
import wechat from "@/libs/wechat";
|
|
export default {
|
|
data() {
|
|
return {
|
|
isUp: false,
|
|
phone: '',
|
|
statusBarHeight: statusBarHeight,
|
|
isHome: false,
|
|
isPhoneBox: false,
|
|
logoUrl: '',
|
|
code: '',
|
|
authKey: '',
|
|
options: '',
|
|
userInfo: {},
|
|
codeNum: 0
|
|
}
|
|
},
|
|
components: {
|
|
mobileLogin,
|
|
routinePhone
|
|
},
|
|
computed: mapGetters({
|
|
'authorizeType': 'authorizeType'
|
|
}),
|
|
onLoad(options) {
|
|
console.log('options',options)
|
|
if (this.authorizeType === 'register') this.isPhoneBox = true
|
|
getLogo().then(res => {
|
|
this.logoUrl = res.data.logoUrl
|
|
})
|
|
let that = this
|
|
// #ifdef H5
|
|
document.body.addEventListener("focusout", () => {
|
|
setTimeout(() => {
|
|
const scrollHeight = document.documentElement.scrollTop || document.body.scrollTop || 0;
|
|
window.scrollTo(0, Math.max(scrollHeight - 1, 0));
|
|
}, 100);
|
|
});
|
|
const {
|
|
code,
|
|
state,
|
|
scope
|
|
} = options;
|
|
this.options = options
|
|
console.log('lalaal',this.options)
|
|
// 获取确认授权code
|
|
this.code = code || ''
|
|
if(!code) location.replace(decodeURIComponent(decodeURIComponent(option.query.back_url)));
|
|
if (code && this.options.scope !== 'snsapi_base') {
|
|
let spread = app.globalData.spid ? app.globalData.spid : 0;
|
|
//公众号授权登录回调 wechatAuth(code, Cache.get("spread"), loginType)
|
|
wechat.auth(code, spread).then(res => {
|
|
console.log('进来的授权',res)
|
|
if (res.type === 'register') {
|
|
this.authKey = res.key;
|
|
console.log('authKey',this.authKey)
|
|
this.isUp = true
|
|
}
|
|
if(res.type === 'login'){
|
|
// let time = res.data.expires_time - this.$Cache.time();
|
|
this.$store.commit('LOGIN', {
|
|
token: res.data.token,
|
|
// time: time
|
|
});
|
|
// this.$store.commit('SETUID', res.data.userInfo.uid);
|
|
// this.$store.commit('UPDATE_USERINFO', res.data.userInfo);
|
|
this.wechatPhone();
|
|
//location.replace(decodeURIComponent(decodeURIComponent(option.query.back_url)));
|
|
}
|
|
}).catch(error => {
|
|
});
|
|
}
|
|
// #endif
|
|
let pages = getCurrentPages();
|
|
console.log('数据库1',pages)
|
|
// let prePage = pages[pages.length - 2];
|
|
// console.log('数据库',prePage)
|
|
// if (prePage.route == 'pages/order_addcart/order_addcart') {
|
|
// this.isHome = true
|
|
// } else {
|
|
// this.isHome = false
|
|
// }
|
|
|
|
},
|
|
methods: {
|
|
back() {
|
|
uni.navigateBack();
|
|
},
|
|
home() {
|
|
uni.switchTab({
|
|
url: '/pages/index/index'
|
|
})
|
|
},
|
|
// 弹窗关闭
|
|
maskClose() {
|
|
this.isUp = false
|
|
},
|
|
bindPhoneClose(data) {
|
|
if (data.isStatus) {
|
|
this.isPhoneBox = false
|
|
this.$util.Tips({
|
|
title: '登录成功',
|
|
icon: 'success'
|
|
}, {
|
|
tab: 3
|
|
})
|
|
} else {
|
|
this.isPhoneBox = false
|
|
}
|
|
|
|
},
|
|
// #ifdef MP
|
|
// 小程序获取手机号码
|
|
getphonenumber(e) {
|
|
uni.showLoading({
|
|
title: '正在登录中'
|
|
});
|
|
Routine.getCode()
|
|
.then(code => {
|
|
this.getUserPhoneNumber(e.detail.encryptedData, e.detail.iv, code);
|
|
})
|
|
.catch(error => {
|
|
uni.$emit('closePage', false)
|
|
uni.hideLoading();
|
|
});
|
|
},
|
|
// 小程序获取手机号码回调
|
|
getUserPhoneNumber(encryptedData, iv, code) {
|
|
getUserPhone({
|
|
encryptedData: encryptedData,
|
|
iv: iv,
|
|
code: code,
|
|
spid: app.globalData.spid,
|
|
spread: app.globalData.code,
|
|
type: 'routine',
|
|
key: this.authKey
|
|
})
|
|
.then(res => {
|
|
let time = res.data.expires_time - this.$Cache.time();
|
|
this.$store.commit('LOGIN', {
|
|
token: res.data.token,
|
|
time: time
|
|
});
|
|
this.userInfo = res.data.userInfo
|
|
this.$store.commit("SETUID", res.data.userInfo.uid);
|
|
this.$store.commit("UPDATE_USERINFO", res.data.userInfo);
|
|
this.$util.Tips({
|
|
title: '登录成功',
|
|
icon: 'success'
|
|
}, {
|
|
tab: 3
|
|
})
|
|
|
|
})
|
|
.catch(res => {
|
|
uni.hideLoading();
|
|
that.$util.Tips({
|
|
title: res
|
|
});
|
|
});
|
|
},
|
|
/**
|
|
* 获取个人用户信息
|
|
*/
|
|
getUserInfo: function() {
|
|
let that = this;
|
|
getUserInfo().then(res => {
|
|
uni.hideLoading();
|
|
that.userInfo = res.data
|
|
that.$store.commit("SETUID", res.data.uid);
|
|
that.$store.commit("UPDATE_USERINFO", res.data);
|
|
that.$util.Tips({
|
|
title: '登录成功',
|
|
icon: 'success'
|
|
}, {
|
|
tab: 3
|
|
})
|
|
});
|
|
},
|
|
setUserInfo(e) {
|
|
uni.showLoading({
|
|
title: '正在登录中'
|
|
});
|
|
Routine.getCode()
|
|
.then(code => {
|
|
this.getWxUser(code);
|
|
})
|
|
.catch(res => {
|
|
uni.hideLoading();
|
|
});
|
|
},
|
|
getWxUser(code) {
|
|
let self = this
|
|
Routine.getUserInfo()
|
|
.then(res => {
|
|
let userInfo = res.userInfo;
|
|
userInfo.code = code;
|
|
userInfo.spread_spid = app.globalData.spid;//获取推广人ID
|
|
userInfo.spread_code = app.globalData.code;//获取推广人分享二维码ID
|
|
userInfo.avatar = userInfo.userInfo.avatarUrl;
|
|
userInfo.city = userInfo.userInfo.city;
|
|
userInfo.country = userInfo.userInfo.country;
|
|
userInfo.nickName = userInfo.userInfo.nickName;
|
|
userInfo.province = userInfo.userInfo.province;
|
|
userInfo.sex = userInfo.userInfo.gender;
|
|
userInfo.type = 'routine'
|
|
Routine.authUserInfo(userInfo.code, userInfo)
|
|
.then(res => {
|
|
console.log(res)
|
|
self.authKey = res.data.key;
|
|
if (res.data.type === 'register') {
|
|
uni.hideLoading();
|
|
self.isPhoneBox = true
|
|
} else {
|
|
uni.hideLoading();
|
|
let time = res.data.expires_time - self.$Cache.time();
|
|
self.$store.commit('LOGIN', {
|
|
token: res.data.token,
|
|
time: time
|
|
});
|
|
self.$util.Tips({
|
|
title: res,
|
|
icon: 'success'
|
|
}, {
|
|
tab: 3
|
|
})
|
|
}
|
|
})
|
|
.catch(res => {
|
|
uni.hideLoading();
|
|
uni.showToast({
|
|
title: res,
|
|
icon: 'none',
|
|
duration: 2000
|
|
});
|
|
});
|
|
})
|
|
.catch(res => {
|
|
uni.hideLoading();
|
|
});
|
|
},
|
|
|
|
|
|
// #endif
|
|
// #ifdef H5
|
|
// 获取url后面的参数
|
|
getQueryString(name) {
|
|
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
|
|
var reg_rewrite = new RegExp("(^|/)" + name + "/([^/]*)(/|$)", "i");
|
|
var r = window.location.search.substr(1).match(reg);
|
|
var q = window.location.pathname.substr(1).match(reg_rewrite);
|
|
if (r != null) {
|
|
return unescape(r[2]);
|
|
} else if (q != null) {
|
|
return unescape(q[2]);
|
|
} else {
|
|
return null;
|
|
}
|
|
},
|
|
// 公众号登录
|
|
wechatLogin() {
|
|
console.log('微信登录',this.code)
|
|
console.log('微信登录2',this.options.code)
|
|
console.log('微信登录3',this.authKey)
|
|
console.log('isUp2',this.isUp)
|
|
if (!this.code && this.options.scope !== 'snsapi_base') {
|
|
this.$wechat.oAuth('snsapi_userinfo', '/pages/users/wechat_login/index');
|
|
} else {
|
|
console.log('isUp',this.isUp)
|
|
// if (this.authKey) {
|
|
// this.isUp = true;
|
|
// }
|
|
this.isUp = true;
|
|
}
|
|
// wechat.auth(this.code, this.$Cache.get("spread")).then(res => {
|
|
// if (res.data.type === 'register') {
|
|
// this.authKey = res.data.key;
|
|
// this.isUp = true
|
|
// }
|
|
// if(res.data.type === 'login'){
|
|
// let time = res.data.expires_time - this.$Cache.time();
|
|
// this.$store.commit('LOGIN', {
|
|
// token: res.data.token,
|
|
// time: time
|
|
// });
|
|
// this.$store.commit('SETUID', res.data.userInfo.uid);
|
|
// this.$store.commit('UPDATE_USERINFO', res.data.userInfo);
|
|
// // location.replace(decodeURIComponent(decodeURIComponent(option.query.back_url)));
|
|
// }
|
|
// }).catch(error => {
|
|
// // location.replace("/");
|
|
// });
|
|
},
|
|
// 输入手机号后的回调
|
|
wechatPhone() {
|
|
if (this.options.back_url) {
|
|
let url = uni.getStorageSync('snRouter')
|
|
let self = this
|
|
this.isUp = false
|
|
uni.showToast({
|
|
title: '登录成功',
|
|
icon: 'none'
|
|
})
|
|
setTimeout(res => {
|
|
location.href = url.indexOf("/pages/index/index") != -1 ? '/' : url
|
|
}, 800)
|
|
} else {
|
|
uni.navigateBack()
|
|
}
|
|
}
|
|
// #endif
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<style lang="scss">
|
|
page {
|
|
background: #fff;
|
|
}
|
|
|
|
.page {
|
|
background: #fff;
|
|
}
|
|
|
|
.wechat_login {
|
|
padding: 72rpx 34rpx;
|
|
|
|
.img image {
|
|
width: 100%;
|
|
}
|
|
|
|
.btn-wrapper {
|
|
margin-top: 86rpx;
|
|
padding: 0 66rpx;
|
|
|
|
button {
|
|
width: 100%;
|
|
height: 86rpx;
|
|
line-height: 86rpx;
|
|
margin-bottom: 40rpx;
|
|
border-radius: 120rpx;
|
|
font-size: 30rpx;
|
|
|
|
&.btn1 {
|
|
color: #fff;
|
|
}
|
|
|
|
&.btn2 {
|
|
color: #666666;
|
|
border: 1px solid #666666;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
.title-bar {
|
|
position: relative;
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
font-size: 36rpx;
|
|
}
|
|
|
|
.icon {
|
|
position: absolute;
|
|
left: 30rpx;
|
|
top: 0;
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
width: 86rpx;
|
|
height: 86rpx;
|
|
|
|
image {
|
|
width: 50rpx;
|
|
height: 50rpx;
|
|
}
|
|
}
|
|
</style>
|