xingzi
/
minishop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mini auth

Browse Source
master
fengyuexingzi 7 years ago
parent 599413c8d8
commit f9a43c8e6a
17 changed files with 246 additions and 410 deletions
Show Stats Download Patch File Download Diff File

74
mini/app.js vendored
Unescape View File

@ -5,33 +5,14 @@ var user = require('./services/user.js');
App({
onLaunch: function () {
wx.navigateTo({
url: '/pages/welcome/welcome',
wx.chooseLocation({
success: data => {
console.log(data)
}
})
// wx.login({
// success: res =>{
// console.log(res);
// },
// fail: error => {
// console.log(error);
// }
// })
// wx.getSetting({
// success: res => {
// if(res.authSetting['scope.userInfo']){
// console.log("已授权");
// wx.getUserInfo({
// success: res => {
// console.log(res);
// }
// })
// }else{
// console.log("未授权");
// }
// }
// })
// wx.showModal({
@ -136,7 +117,7 @@ App({
// });
},
}
// globalData: {
// userInfo: {
@ -147,28 +128,25 @@ App({
// token: '',
// }
getUserInfo: function (cb) {
var that = this
if (this.globalData.userInfo) {
typeof cb == "function" && cb(this.globalData.userInfo)
} else {
//调用登录接口
wx.login({
success: function () {
wx.getUserInfo({
success: function (res) {
console.log(res);
wx.setStorageSync('isFirst', res.userInfo);
that.globalData.userInfo = res.userInfo
typeof cb == "function" && cb(that.globalData.userInfo)
}
})
}
})
}
},
// getUserInfo: function (cb) {
// var that = this
// if (this.globalData.userInfo) {
// typeof cb == "function" && cb(this.globalData.userInfo)
// } else {
// //调用登录接口
// wx.login({
// success: function () {
// wx.getUserInfo({
// success: function (res) {
// console.log(res);
// wx.setStorageSync('isFirst', res.userInfo);
// that.globalData.userInfo = res.userInfo
// typeof cb == "function" && cb(that.globalData.userInfo)
// }
// })
// }
// })
// }
// },
globalData: {
userInfo: null
}
})

4
mini/app.json
Unescape View File

@ -34,9 +34,7 @@
"pages/shopping/address/address",
"pages/shopping/addressAdd/addressAdd",
"pages/goods/goods",
"pages/topicDetail/topicDetail",
"pages/welcome",
"pages/welcome/welcome"
"pages/topicDetail/topicDetail"
],
"window": {
"backgroundTextStyle": "dark",

12
mini/pages/index/index.js vendored
Unescape View File

@ -43,12 +43,12 @@ Page({
//this.getIndexData();
var that = this
app.getUserInfo(function (userInfo) {
//更新数据
that.setData({
userInfo: userInfo
})
})
// app.getUserInfo(function (userInfo) {
// //更新数据
// that.setData({
// userInfo: userInfo
// })
// })
},
onReady: function () {

1
mini/pages/index/index.wxml
Unescape View File

@ -1,7 +1,6 @@
<!--index.wxml-->
<view class="container">
<button id='abc' open-type="getUserInfo">登录</button>
<swiper class="banner" indicator-dots="true" autoplay="true" interval="3000" duration="1000">
<swiper-item wx:for="{{carouselInfo}}" wx:key="{{item.id}}">
<navigator url="{{item.businessId}}">

56
mini/pages/ucenter/index/index.js vendored
Unescape View File

@ -7,37 +7,53 @@ Page({
data: {
userInfo: {}
},
onLoad: function (options) {
// 页面初始化 options为页面跳转所带来的参数
console.log(app.globalData)
onLoad: function(options) {
var that = this
wx.getSetting({
success: res => {
if (res.authSetting['scope.userInfo']) {
console.log('已授权');
wx.getUserInfo({
withCredentials: true,
lang: '',
success: function(res) {
that.setData({
userInfo: res.userInfo
})
},
})
}
}
})
},
onReady: function () {
onReady: function() {
},
onShow: function () {
onShow: function() {
let userInfo = wx.getStorageSync('userInfo');
let token = wx.getStorageSync('token');
// let userInfo = wx.getStorageSync('userInfo');
// let token = wx.getStorageSync('token');
// 页面显示
if (userInfo && token) {
app.globalData.userInfo = userInfo;
app.globalData.token = token;
}
// // 页面显示
// if (userInfo && token) {
// app.globalData.userInfo = userInfo;
// app.globalData.token = token;
// }
this.setData({
userInfo: app.globalData.userInfo,
});
// this.setData({
// userInfo: app.globalData.userInfo,
// });
},
onHide: function () {
onHide: function() {
// 页面隐藏
},
onUnload: function () {
onUnload: function() {
// 页面关闭
},
goLogin(){
goLogin() {
user.loginByWeixin().then(res => {
this.setData({
userInfo: res.data.userInfo
@ -48,12 +64,12 @@ Page({
console.log(err)
});
},
exitLogin: function () {
exitLogin: function() {
wx.showModal({
title: '',
confirmColor: '#b4282d',
content: '退出登录？',
success: function (res) {
success: function(res) {
if (res.confirm) {
wx.removeStorageSync('token');
wx.removeStorageSync('userInfo');

74
mini/pages/ucenter/index/index.wxml
Unescape View File

@ -1,9 +1,20 @@
<view class="container">
<view class="profile-info" bindtap="goLogin">
<image class="avatar" src="{{userInfo.avatar}}"></image>
<view wx:if="{{false}}">
<view class="avatar">
<open-data type="userAvatarUrl" ></open-data>
</view>
<text class='auth-title'>请提供以下授权，即可继续操作</text>
<text class='auth-detail'>获得你的公开信息(昵称、头像等)</text>
<button class='auth-btn' open-type='getUserInfo'>确认授权</button>
</view>
<view wx:else>
<view class="profile-info">
<image class="avatar" src="{{userInfo.avatarUrl}}"></image>
<view class="info">
<text class="name">{{userInfo.nickname}}11</text>
<!-- <text class="level">{{userInfo.username}}</text> -->
<text class="name">{{userInfo.nickName}}{{test}}</text>
</view>
</view>
@ -14,69 +25,16 @@
<text class="txt">我的订单</text>
</navigator>
</view>
<view class="item">
<navigator url="/pages/ucenter/coupon/coupon" class="a">
<text class="icon coupon"></text>
<text class="txt">优惠券</text>
</navigator>
</view>
<!-- <view class="item no-border">
<navigator url="url" class="a">
<text class="icon gift"></text>
<text class="txt">礼品卡</text>
</navigator>
</view> -->
<view class="item">
<navigator url="/pages/ucenter/collect/collect" class="a">
<text class="icon address"></text>
<text class="txt">我的收藏</text>
</navigator>
</view>
<view class="item">
<navigator url="/pages/ucenter/footprint/footprint" class="a">
<text class="icon security"></text>
<text class="txt">我的足迹</text>
</navigator>
</view>
<view class="item">
<navigator url="url" class="a">
<text class="icon kefu"></text>
<text class="txt">会员福利</text>
</navigator>
</view>
<view class="item">
<navigator url="../address/address" class="a">
<text class="icon address"></text>
<text class="txt">地址管理</text>
</navigator>
</view>
<!-- <view class="item">
<navigator url="url" class="a">
<text class="icon security"></text>
<text class="txt">账号安全</text>
</navigator>
</view> -->
<!-- <view class="item item-bottom">
<navigator url="url" class="a">
<text class="icon help"></text>
<text class="txt">帮助中心</text>
</navigator>
</view> -->
<view class="item item-bottom">
<navigator url="/pages/ucenter/feedback/feedback" class="a">
<text class="icon feedback"></text>
<text class="txt">意见反馈</text>
</navigator>
</view>
<view class="item item-bottom">
<navigator url="url" class="a">
<text class="icon kefu"></text>
<text class="txt">联系客服</text>
</navigator>
</view>
</view>
<!--<view class="logout" bindtap="exitLogin">退出登录</view>-->
</view>

83
mini/pages/ucenter/index/index.wxss
Unescape View File

@ -1,16 +1,44 @@
page{
page {
height: 100%;
width: 100%;
background: #f4f4f4;
}
.container{
.avatar {
width: 300rpx;
height: 300rpx;
margin:150rpx auto ;
border-radius: 150px;
overflow: hidden;
}
.auth-title {
display: block;
text-align: center;
margin: 50rpx auto;
}
.auth-detail {
display: block;
font-size: 20rpx;
text-align: center
}
.auth-btn {
background: rgb(238, 205, 16);
margin: 50rpx 100rpx;
color: white;
}
.container {
background: #f4f4f4;
height: auto;
padding-bottom:10rpx;
padding-bottom: 10rpx;
overflow: hidden;
width: 100%;
}
.profile-info{
.profile-info {
width: 100%;
height: 280rpx;
display: flex;
@ -18,22 +46,22 @@ page{
align-items: center;
justify-content: flex-start;
padding: 0 30.25rpx;
background: #333;
background: rgb(177, 182, 196);
}
.profile-info .avatar{
.profile-info .avatar {
height: 148rpx;
width: 148rpx;
border-radius: 50%;
}
.profile-info .info{
.profile-info .info {
flex: 1;
height: 85rpx;
padding-left: 31.25rpx;
}
.profile-info .name{
.profile-info .name {
display: block;
height: 45rpx;
line-height: 45rpx;
@ -42,7 +70,7 @@ page{
margin-bottom: 10rpx;
}
.profile-info .level{
.profile-info .level {
display: block;
height: 30rpx;
line-height: 30rpx;
@ -51,24 +79,24 @@ page{
font-size: 30rpx;
}
.user-menu{
.user-menu {
width: 100%;
height: auto;
overflow: hidden;
background: #fff;
margin-bottom:100rpx;
margin-bottom: 100rpx;
}
.user-menu .item{
.user-menu .item {
float: left;
width: 33.33333%;
height: 187.5rpx;
border-right: 1px solid rgba(0,0,0,.15);
border-bottom: 1px solid rgba(0,0,0,.15);
border-right: 1px solid rgba(0, 0, 0, 0.15);
border-bottom: 1px solid rgba(0, 0, 0, 0.15);
text-align: center;
}
.user-menu .item .a{
.user-menu .item .a {
display: flex;
width: 100%;
height: 100%;
@ -85,7 +113,7 @@ page{
border-bottom: none;
}
.user-menu .icon{
.user-menu .icon {
margin: 0 auto;
display: block;
height: 52.803rpx;
@ -93,56 +121,55 @@ page{
margin-bottom: 16rpx;
}
.user-menu .icon.order{
.user-menu .icon.order {
background: url(http://xiaot-static.oss-cn-hangzhou.aliyuncs.com/XiaoT/icon/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -437.5rpx no-repeat;
background-size: 52.803rpx;
}
.user-menu .icon.coupon{
.user-menu .icon.coupon {
background: url(http://xiaot-static.oss-cn-hangzhou.aliyuncs.com/XiaoT/icon/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -62.4997rpx no-repeat;
background-size: 52.803rpx;
}
.user-menu .icon.gift{
.user-menu .icon.gift {
background: url(http://xiaot-static.oss-cn-hangzhou.aliyuncs.com/XiaoT/icon/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -187.5rpx no-repeat;
background-size: 52.803rpx;
}
.user-menu .icon.address{
.user-menu .icon.address {
background: url(http://xiaot-static.oss-cn-hangzhou.aliyuncs.com/XiaoT/icon/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 0 no-repeat;
background-size: 52.803rpx;
}
.user-menu .icon.security{
.user-menu .icon.security {
background: url(http://xiaot-static.oss-cn-hangzhou.aliyuncs.com/XiaoT/icon/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -500rpx no-repeat;
background-size: 52.803rpx;
}
.user-menu .icon.kefu{
.user-menu .icon.kefu {
background: url(http://xiaot-static.oss-cn-hangzhou.aliyuncs.com/XiaoT/icon/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -312.5rpx no-repeat;
background-size: 52.803rpx;
}
.user-menu .icon.help{
.user-menu .icon.help {
background: url(http://xiaot-static.oss-cn-hangzhou.aliyuncs.com/XiaoT/icon/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -250rpx no-repeat;
background-size: 52.803rpx;
}
.user-menu .icon.feedback{
.user-menu .icon.feedback {
background: url(http://xiaot-static.oss-cn-hangzhou.aliyuncs.com/XiaoT/icon/ucenter-sdf6a55ee56-f2c2b9c2f0.png) 0 -125rpx no-repeat;
background-size: 52.803rpx;
}
.user-menu .txt{
.user-menu .txt {
display: block;
height: 24rpx;
width: 100%;
font-size: 24rpx;
color:#333;
color: #333;
}
.logout{
.logout {
margin-top: 50rpx;
height: 101rpx;
width: 100%;

66
mini/pages/welcome.js vendored
Unescape View File

@ -1,66 +0,0 @@
// pages/welcome.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

1
mini/pages/welcome.json
Unescape View File

@ -1 +0,0 @@
{}

2
mini/pages/welcome.wxml
Unescape View File

@ -1,2 +0,0 @@
<!--pages/welcome.wxml-->
<text>pages/welcome.wxml</text>

1
mini/pages/welcome.wxss
Unescape View File

@ -1 +0,0 @@
/* pages/welcome.wxss */

66
mini/pages/welcome/welcome.js vendored
Unescape View File

@ -1,66 +0,0 @@
// pages/welcome/welcome.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

1
mini/pages/welcome/welcome.json
Unescape View File

@ -1 +0,0 @@
{}

2
mini/pages/welcome/welcome.wxml
Unescape View File

@ -1,2 +0,0 @@
<!--pages/welcome/welcome.wxml-->
<text>pages/welcome/welcome.wxml</text>

1
mini/pages/welcome/welcome.wxss
Unescape View File

@ -1 +0,0 @@
/* pages/welcome/welcome.wxss */

BIN
mini/static/images/more/confirm-word1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
mini/static/images/more/fruit.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

Write Preview
Loading…
Cancel
Save