Loki
/
zsw-farm-bxg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化微信授权

zyh
Gao xiaosong 4 years ago
parent
84e8f3e5d2
commit
4fb75be4b0
3 changed files with 1374 additions and 1349 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 138
      pages/authorization/index.vue
  2. 265
      pages/user/User/index.vue
  3. 524
      utils/index.js

138
pages/authorization/index.vue
Unescape View File

@ -7,7 +7,8 @@
<open-data class="user-avatar" type="userAvatarUrl"></open-data> <open-data class="user-avatar" type="userAvatarUrl"></open-data>
<open-data class="user-name" type="userNickName"></open-data> <open-data class="user-name" type="userNickName"></open-data>
<view class="login-notice">为了提供更优质的服务，需要获取您的头像昵称</view> <view class="login-notice">为了提供更优质的服务，需要获取您的头像昵称</view>
<button class="cu-btn author-btn" @getuserinfo="getUserInfo" open-type="getUserInfo">授权并查看</button> <button class="cu-btn author-btn" v-if="canIUseGetUserProfile" @tap="getUserInfoProfile">授权并查看</button>
<button class="cu-btn author-btn" v-else @getuserinfo="getUserInfo" open-type="getUserInfo">授权并查看</button>
<button class="cu-btn close-btn" @tap="back">暂不授权</button> <button class="cu-btn close-btn" @tap="back">暂不授权</button>
</view> </view>
</view> </view>
@ -25,100 +26,135 @@
</template> </template>
<script> <script>
import { import { mapState, mapMutations, mapActions } from 'vuex'
mapState, import { wxappAuth, getUser } from '@/api/user'
mapMutations, import dayjs from 'dayjs'
mapActions import cookie from '@/utils/store/cookie'
} from "vuex"; import { login, authorize } from '@/utils'
import {
wxappAuth,
getUser
} from "@/api/user";
import dayjs from "dayjs";
import cookie from "@/utils/store/cookie";
import {
login,
authorize
} from "@/utils";
export default { export default {
data() { data() {
return { return {
authorize: false, authorize: false,
}; canIUseGetUserProfile: false,
}
}, },
computed: { computed: {
...mapState(["isAuthorization", "$deviceType", "token"]), ...mapState(['isAuthorization', '$deviceType', 'token']),
}, },
onShow() { onLoad() {
console.log(wx.getUserProfile)
if (wx.getUserProfile) {
console.log(this)
this.canIUseGetUserProfile = true
console.log(this.canIUseGetUserProfile)
}
// // 先校验用户是否授权，如果没有授权，显示授权按钮 // // 先校验用户是否授权，如果没有授权，显示授权按钮
}, },
onHide() { onHide() {
this.updateAuthorizationPage(false); this.updateAuthorizationPage(false)
this.changeAuthorization(false); this.changeAuthorization(false)
}, },
onUnload() { onUnload() {
this.updateAuthorizationPage(false); this.updateAuthorizationPage(false)
this.changeAuthorization(false); this.changeAuthorization(false)
}, },
methods: { methods: {
...mapActions(["changeAuthorization", "setUserInfo"]), ...mapActions(['changeAuthorization', 'setUserInfo']),
...mapMutations(["updateAuthorizationPage"]), ...mapMutations(['updateAuthorizationPage']),
toLogin() { toLogin() {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/user/Login/index", path: '/pages/user/Login/index',
query: {}, query: {},
}); })
}, },
back() { back() {
this.$yrouter.switchTab({ this.$yrouter.switchTab({
path: "/pages/home/index", path: '/pages/home/index',
query: {}, query: {},
}); })
}, },
getUserInfo(data) { getUserInfo(data) {
if (data.detail.errMsg == "getUserInfo:fail auth deny") { console.log(data)
console.log('getUserInfo')
if (data.detail.errMsg == 'getUserInfo:fail auth deny') {
uni.showToast({ uni.showToast({
title: "取消授权", title: '取消授权',
icon: "none", icon: 'none',
duration: 2000, duration: 2000,
}); })
return; return
} }
uni.showLoading({ uni.showLoading({
title: "登录中", title: '登录中',
}); })
login() login()
.then((res) => { .then(e => {
uni.hideLoading()
console.log('重定向') console.log('重定向')
this.$yrouter.reLaunch({ this.$yrouter.reLaunch({
path: cookie.get("redirect").replace(/\ /g, '') path: cookie.get('redirect').replace(/\ /g, ''),
}); })
}) })
.catch((error) => { .catch(error => {
console.log(error); uni.hideLoading()
console.log(error)
uni.showToast({ uni.showToast({
title: error, title: error,
icon: "none", icon: 'none',
duration: 2000, duration: 2000,
}); })
}); })
}, },
getUserInfoProfile(data) {
console.log('getUserInfoProfile')
wx.getUserProfile({
lang: 'zh_CN',
desc: '需要获取您的信息用来展示',
success: res => {
console.log(res)
uni.showLoading({
title: '登录中',
})
login(res)
.then(e => {
console.log('重定向')
this.$yrouter.reLaunch({
path: cookie.get('redirect').replace(/\ /g, ''),
})
})
.catch(error => {
console.log(error)
uni.showToast({
title: error,
icon: 'none',
duration: 2000,
})
})
}, },
mounted() {}, })
}; },
},
mounted() {
if (wx.getUserProfile) {
console.log(this)
this.canIUseGetUserProfile = true
console.log(this.canIUseGetUserProfile)
}
},
}
</script> </script>
<style lang="less"> <style lang="less">
.container { .container {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
position: relative; position: relative;
} }
.force-login-wrap { .force-login-wrap {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
@ -189,5 +225,5 @@
color: #eb3729; color: #eb3729;
} }
} }
} }
</style> </style>

265
pages/user/User/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<view class="user"> <view class="user">
<view v-if="$store.getters.token||userInfo.uid"> <view v-if="$store.getters.token || userInfo.uid">
<view class="header bg-color-red acea-row row-between-wrapper"> <view class="header bg-color-red acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper"> <view class="picTxt acea-row row-between-wrapper">
<view class="pictrue"> <view class="pictrue">
@ -15,7 +15,7 @@
</view> </view>
</view> </view>
<view @click="goPersonalData()" class="id" v-if="userInfo.phone"> <view @click="goPersonalData()" class="id" v-if="userInfo.phone">
<text>ID：{{ userInfo.uid || 0}}</text> <text>ID：{{ userInfo.uid || 0 }}</text>
<text class="iconfont icon-bianji1"></text> <text class="iconfont icon-bianji1"></text>
</view> </view>
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
@ -64,40 +64,35 @@
<view @click="goMyOrder(0)" class="item"> <view @click="goMyOrder(0)" class="item">
<view class="pictrue"> <view class="pictrue">
<image src="@/static/images/dfk.png" /> <image src="@/static/images/dfk.png" />
<text class="order-status-num" <text class="order-status-num" v-if="userInfo.orderStatusNum.unpaidCount > 0">{{ userInfo.orderStatusNum.unpaidCount }}</text>
v-if="userInfo.orderStatusNum.unpaidCount > 0">{{ userInfo.orderStatusNum.unpaidCount }}</text>
</view> </view>
<view>待付款</view> <view>待付款</view>
</view> </view>
<view @click="goMyOrder(1)" class="item"> <view @click="goMyOrder(1)" class="item">
<view class="pictrue"> <view class="pictrue">
<image src="@/static/images/dfh.png" /> <image src="@/static/images/dfh.png" />
<text class="order-status-num" <text class="order-status-num" v-if="userInfo.orderStatusNum.unshippedCount > 0">{{ userInfo.orderStatusNum.unshippedCount }}</text>
v-if="userInfo.orderStatusNum.unshippedCount > 0">{{ userInfo.orderStatusNum.unshippedCount }}</text>
</view> </view>
<view>待发货</view> <view>待发货</view>
</view> </view>
<view @click="goMyOrder(2)" class="item"> <view @click="goMyOrder(2)" class="item">
<view class="pictrue"> <view class="pictrue">
<image src="@/static/images/dsh.png" /> <image src="@/static/images/dsh.png" />
<text class="order-status-num" <text class="order-status-num" v-if="userInfo.orderStatusNum.receivedCount > 0">{{ userInfo.orderStatusNum.receivedCount }}</text>
v-if="userInfo.orderStatusNum.receivedCount > 0">{{ userInfo.orderStatusNum.receivedCount }}</text>
</view> </view>
<text>待收货</text> <text>待收货</text>
</view> </view>
<view @click="goMyOrder(3)" class="item"> <view @click="goMyOrder(3)" class="item">
<view class="pictrue"> <view class="pictrue">
<image src="@/static/images/dpj.png" /> <image src="@/static/images/dpj.png" />
<text class="order-status-num" <text class="order-status-num" v-if="userInfo.orderStatusNum.evaluatedCount > 0">{{ userInfo.orderStatusNum.evaluatedCount }}</text>
v-if="userInfo.orderStatusNum.evaluatedCount > 0">{{ userInfo.orderStatusNum.evaluatedCount }}</text>
</view> </view>
<text>待评价</text> <text>待评价</text>
</view> </view>
<view @click="goReturnList()" class="item"> <view @click="goReturnList()" class="item">
<view class="pictrue"> <view class="pictrue">
<image src="@/static/images/sh.png" /> <image src="@/static/images/sh.png" />
<text class="order-status-num" <text class="order-status-num" v-if="userInfo.orderStatusNum.refundCount > 0">{{ userInfo.orderStatusNum.refundCount }}</text>
v-if="userInfo.orderStatusNum.refundCount > 0">{{ userInfo.orderStatusNum.refundCount }}</text>
</view> </view>
<text>售后/退款</text> <text>售后/退款</text>
</view> </view>
@ -132,110 +127,97 @@
</view> </view>
</template> </template>
<script> <script>
import { import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
mapState, import { getUserInfo, getMenuUser, bindingPhone } from '@/api/user'
mapGetters, import { isWeixin, VUE_APP_RESOURCES_URL } from '@/utils'
mapMutations, import cookie from '@/utils/store/cookie'
mapActions import SwitchWindow from '@/components/SwitchWindow'
} from "vuex"; import Authorization from '@/pages/authorization/index'
import {
getUserInfo,
getMenuUser,
bindingPhone
} from "@/api/user";
import {
isWeixin,
VUE_APP_RESOURCES_URL
} from "@/utils";
import cookie from "@/utils/store/cookie";
import SwitchWindow from "@/components/SwitchWindow";
import Authorization from "@/pages/authorization/index";
const NAME = "User"; const NAME = 'User'
export default { export default {
name: NAME, name: NAME,
components: { components: {
SwitchWindow, SwitchWindow,
Authorization Authorization,
}, },
props: {}, props: {},
data: function () { data: function() {
return { return {
MyMenus: [], MyMenus: [],
switchActive: false, switchActive: false,
isWeixin: false isWeixin: false,
}; }
}, },
computed: mapGetters(["userInfo"]), computed: mapGetters(['userInfo']),
methods: { methods: {
...mapMutations(["updateAuthorizationPage"]), ...mapMutations(['updateAuthorizationPage']),
goReturnList() { goReturnList() {
this.$yrouter.push("/pages/order/ReturnList/index"); this.$yrouter.push('/pages/order/ReturnList/index')
}, },
goMyOrder(type) { goMyOrder(type) {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/order/MyOrder/index", path: '/pages/order/MyOrder/index',
query: { query: {
type type,
} },
}); })
}, },
goBindPhone() { goBindPhone() {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/user/BindingPhone/index", path: '/pages/user/BindingPhone/index',
}); })
}, },
goUserCoupon() { goUserCoupon() {
this.$yrouter.push("/pages/user/coupon/UserCoupon/index"); this.$yrouter.push('/pages/user/coupon/UserCoupon/index')
}, },
goIntegral() { goIntegral() {
this.$yrouter.push("/pages/user/signIn/Integral/index"); this.$yrouter.push('/pages/user/signIn/Integral/index')
}, },
goUserPromotion() { goUserPromotion() {
this.$yrouter.push("/pages/user/promotion/UserPromotion/index"); this.$yrouter.push('/pages/user/promotion/UserPromotion/index')
}, },
goUserAccount() { goUserAccount() {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/user/UserAccount/index" path: '/pages/user/UserAccount/index',
}); })
}, },
goPersonalData() { goPersonalData() {
this.$yrouter.push("/pages/user/PersonalData/index"); this.$yrouter.push('/pages/user/PersonalData/index')
}, },
getPhoneNumber: function (e) { getPhoneNumber: function(e) {
let thit = this; let thit = this
console.log(e)
// 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定 // 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定
if (e.mp.detail.errMsg == "getPhoneNumber:ok") { if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
uni.showLoading({ uni.showLoading({
title: "绑定中" title: '绑定中',
}); })
bindingPhone({ wxappBindingPhone({
encryptedData: e.mp.detail.encryptedData, encryptedData: e.mp.detail.encryptedData,
iv: e.mp.detail.iv iv: e.mp.detail.iv,
}) })
.then(res => { .then(res => {
// this.User(); // this.User();
thit.$store.dispatch("userInfo", true); thit.$store.dispatch('userInfo', true)
uni.hideLoading(); uni.hideLoading()
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: "success", icon: 'success',
duration: 2000 duration: 2000,
}); })
}) })
.catch(error => { .catch(error => {
uni.hideLoading(); uni.hideLoading()
thit.$store.dispatch("userInfo", true); thit.$store.dispatch('userInfo', true)
console.log(error); console.log(error)
uni.showToast({ uni.showToast({
title: error.msg || title: error.msg || error.response.data.msg || error.response.data.message,
error.response.data.msg || icon: 'none',
error.response.data.message, duration: 2000,
icon: "none", })
duration: 2000 })
});
});
// // 获取当前环境的服务商 // // 获取当前环境的服务商
// uni.getProvider({ // uni.getProvider({
// service: "oauth", // service: "oauth",
@ -284,109 +266,102 @@
// }); // });
} else { } else {
uni.showToast({ uni.showToast({
title: "已拒绝授权", title: '已拒绝授权',
icon: "none", icon: 'none',
duration: 2000 duration: 2000,
}); })
} }
}, },
changeswitch: function (data) { changeswitch: function(data) {
this.switchActive = data; this.switchActive = data
}, },
MenuUser: function () { MenuUser: function() {
let that = this; let that = this
getMenuUser() getMenuUser()
.then(res => { .then(res => {
uni.hideLoading(); uni.hideLoading()
that.MyMenus = res.data.routine_my_menus; that.MyMenus = res.data.routine_my_menus
}) })
.catch(error => { .catch(error => {
uni.hideLoading(); uni.hideLoading()
console.log(error); console.log(error)
}); })
}, },
goPages: function (index) { goPages: function(index) {
let url = this.MyMenus[index].uniapp_url; let url = this.MyMenus[index].uniapp_url
if ( if (url === '/pages/user/promotion/UserPromotion/index' && this.userInfo.statu === 1) {
url === "/pages/user/promotion/UserPromotion/index" &&
this.userInfo.statu === 1
) {
if (!this.userInfo.isPromoter) { if (!this.userInfo.isPromoter) {
uni.showToast({ uni.showToast({
title: "您还没有推广权限！！", title: '您还没有推广权限！！',
icon: "none", icon: 'none',
duration: 2000 duration: 2000,
}); })
return; return
} }
} }
if ( if (url === '/pages/orderAdmin/OrderIndex/index' && !this.userInfo.adminid) {
url === "/pages/orderAdmin/OrderIndex/index" &&
!this.userInfo.adminid
) {
uni.showToast({ uni.showToast({
title: "您还不是管理员！！", title: '您还不是管理员！！',
icon: "none", icon: 'none',
duration: 2000 duration: 2000,
}); })
return; return
} }
console.log(this.userInfo) console.log(this.userInfo)
if (url === "/pages/orderAdmin/OrderCancellation/index" && !this.userInfo.checkStatus) { if (url === '/pages/orderAdmin/OrderCancellation/index' && !this.userInfo.checkStatus) {
uni.showToast({ uni.showToast({
title: "您没有核销权限,请后台店员设置！！", title: '您没有核销权限,请后台店员设置！！',
icon: "none", icon: 'none',
duration: 2000 duration: 2000,
}); })
return; return
} }
this.$yrouter.push({ this.$yrouter.push({
path: this.MyMenus[index].uniapp_url path: this.MyMenus[index].uniapp_url,
}); })
}, },
goPages2: function () { goPages2: function() {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/shop/GoodsList/index", path: '/pages/shop/GoodsList/index',
query: { query: {
// id: 0, // id: 0,
title: '积分商城', title: '积分商城',
isIntegral: true, isIntegral: true,
} },
})
}); },
}
}, },
watch: { watch: {
userInfo() { userInfo() {
this.MenuUser(); this.MenuUser()
} },
}, },
onShow() { onShow() {
if (this.$store.getters.token) { if (this.$store.getters.token) {
// //
uni.showLoading({ uni.showLoading({
title: "加载中" title: '加载中',
}); })
this.$store.dispatch("getUser", true); this.$store.dispatch('getUser', true)
this.MenuUser(); this.MenuUser()
this.isWeixin = isWeixin(); this.isWeixin = isWeixin()
} }
}, },
onHide() { onHide() {
console.log("离开用户中心"); console.log('离开用户中心')
this.updateAuthorizationPage(false); this.updateAuthorizationPage(false)
} },
}; }
</script> </script>
<style lang="less"> <style lang="less">
.footer-line-height { .footer-line-height {
height: 1 * 100rpx; height: 1 * 100rpx;
} }
.order-status-num { .order-status-num {
min-width: 0.33 * 100rpx; min-width: 0.33 * 100rpx;
background-color: #fff; background-color: #fff;
color: #eb3729; color: #eb3729;
@ -397,17 +372,17 @@
font-size: 0.2 * 100rpx; font-size: 0.2 * 100rpx;
padding: 0 0.08 * 100rpx; padding: 0 0.08 * 100rpx;
border: 1px solid #eb3729; border: 1px solid #eb3729;
} }
.pictrue { .pictrue {
position: relative; position: relative;
} }
.switch-h5 { .switch-h5 {
margin-left: 0.2 * 100rpx; margin-left: 0.2 * 100rpx;
} }
.binding { .binding {
margin-top: 0.1 * 100rpx; margin-top: 0.1 * 100rpx;
display: inline-block; display: inline-block;
padding: 0.05 * 100rpx 0.2 * 100rpx; padding: 0.05 * 100rpx 0.2 * 100rpx;
@ -417,15 +392,15 @@
line-height: 1.5; line-height: 1.5;
border: 1px solid #e8695e; border: 1px solid #e8695e;
color: #ffffff; color: #ffffff;
} }
.by { .by {
text-align: center; text-align: center;
padding: 30rpx 0; padding: 30rpx 0;
} }
.by-text { .by-text {
text-align: center; text-align: center;
font-size: 24rpx; font-size: 24rpx;
} }
</style> </style>

524
utils/index.js
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save