From f9a43c8e6a09f2c547835a4a5adef263f24c4cb6 Mon Sep 17 00:00:00 2001 From: fengyuexingzi Date: Wed, 17 Oct 2018 16:58:36 +0800 Subject: [PATCH] mini auth --- mini/app.js | 76 +++---- mini/app.json | 4 +- mini/pages/index/index.js | 12 +- mini/pages/index/index.wxml | 1 - mini/pages/ucenter/index/index.js | 56 +++-- mini/pages/ucenter/index/index.wxml | 102 +++------ mini/pages/ucenter/index/index.wxss | 265 ++++++++++++---------- mini/pages/welcome.js | 66 ------ mini/pages/welcome.json | 1 - mini/pages/welcome.wxml | 2 - mini/pages/welcome.wxss | 1 - mini/pages/welcome/welcome.js | 66 ------ mini/pages/welcome/welcome.json | 1 - mini/pages/welcome/welcome.wxml | 2 - mini/pages/welcome/welcome.wxss | 1 - mini/static/images/more/confirm-word1.png | Bin 31938 -> 0 bytes mini/static/images/more/fruit.jpg | Bin 0 -> 17415 bytes 17 files changed, 246 insertions(+), 410 deletions(-) delete mode 100644 mini/pages/welcome.js delete mode 100644 mini/pages/welcome.json delete mode 100644 mini/pages/welcome.wxml delete mode 100644 mini/pages/welcome.wxss delete mode 100644 mini/pages/welcome/welcome.js delete mode 100644 mini/pages/welcome/welcome.json delete mode 100644 mini/pages/welcome/welcome.wxml delete mode 100644 mini/pages/welcome/welcome.wxss delete mode 100644 mini/static/images/more/confirm-word1.png create mode 100644 mini/static/images/more/fruit.jpg diff --git a/mini/app.js b/mini/app.js index 5ba8714..d7c81ce 100644 --- a/mini/app.js +++ b/mini/app.js @@ -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) - } - }) - } - }) - } - }, - - globalData: { - userInfo: null - } + // 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) + // } + // }) + // } + // }) + // } + // }, + }) \ No newline at end of file diff --git a/mini/app.json b/mini/app.json index 187c6c5..224ee13 100644 --- a/mini/app.json +++ b/mini/app.json @@ -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", diff --git a/mini/pages/index/index.js b/mini/pages/index/index.js index 3249fef..7081a0e 100644 --- a/mini/pages/index/index.js +++ b/mini/pages/index/index.js @@ -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 () { diff --git a/mini/pages/index/index.wxml b/mini/pages/index/index.wxml index de5c664..7ad53cf 100644 --- a/mini/pages/index/index.wxml +++ b/mini/pages/index/index.wxml @@ -1,7 +1,6 @@ -