From 9cb8aa0bacb6137599cfc9088f07c58472132e0e Mon Sep 17 00:00:00 2001 From: axlrose2333 <690927457@qq.com> Date: Mon, 15 May 2023 14:30:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/api/index.ts | 8 +- miniprogram/api/request.ts | 7 +- miniprogram/app.json | 7 +- miniprogram/app.scss | 5 + miniprogram/app.ts | 22 +++-- miniprogram/assets/avatar.png | Bin 0 -> 7203 bytes miniprogram/pages/home/home.ts | 3 + miniprogram/pages/login/login.json | 4 + miniprogram/pages/login/login.scss | 42 ++++++++ miniprogram/pages/login/login.ts | 154 +++++++++++++++++++++++++++++ miniprogram/pages/login/login.wxml | 24 +++++ miniprogram/pages/star/star.ts | 22 +++-- miniprogram/pages/star/star.wxml | 2 +- miniprogram/utils/custom.ts | 47 +++++++++ project.config.json | 2 +- typings/index.d.ts | 2 + 16 files changed, 330 insertions(+), 21 deletions(-) create mode 100644 miniprogram/assets/avatar.png create mode 100644 miniprogram/pages/login/login.json create mode 100644 miniprogram/pages/login/login.scss create mode 100644 miniprogram/pages/login/login.ts create mode 100644 miniprogram/pages/login/login.wxml create mode 100644 miniprogram/utils/custom.ts diff --git a/miniprogram/api/index.ts b/miniprogram/api/index.ts index 1ada32f..679d751 100644 --- a/miniprogram/api/index.ts +++ b/miniprogram/api/index.ts @@ -32,7 +32,7 @@ const request={ avatarUrl:params.avatarUrl } return net.request({ - api:'/api/token', + api:'/api/v1/token', data, header:{ 'content-type': 'application/x-www-form-urlencoded' @@ -58,6 +58,12 @@ const request={ return true; } }, + bindingWX:function(data:any) { + return net.request({ + api:'/api/user/binding/wechat', + data + }) + }, getWineList:function(data:any) { return net.request({ api:'/api/v1/wine', diff --git a/miniprogram/api/request.ts b/miniprogram/api/request.ts index 92d1af6..606b4e1 100644 --- a/miniprogram/api/request.ts +++ b/miniprogram/api/request.ts @@ -1,7 +1,7 @@ -// var baseUrl = "https://dfhd.guwengkj.com"; +// var baseUrl = "https://wine.api.echol.cn"; var baseUrl = "http://192.168.1.40:8083"; -// const APPID = "wx3d38ce1103a82225"; -// const SECRET = '3c41ca428b4d0f43cfaef6f567a1cc06'; +// const APPID = "wx29f3e0dc2f7f2c54"; +// const SECRET = '95a893451cf25b696612a7d1735a04b8'; const service = { request:(options:any) => { let {api,data={},method="POST",header='',callback} = options @@ -18,6 +18,7 @@ const service = { 'content-type': 'application/json' } } + // let auth = base64encode("admin:admin") header["Authorization"]=token || 'Basic ZGV2OmRldjEyMw== ' return new Promise((resolve,reject)=>{ wx.request({ diff --git a/miniprogram/app.json b/miniprogram/app.json index ab83b48..a934a81 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -5,7 +5,8 @@ "pages/logs/logs", "pages/star/star", "pages/search/search", - "pages/detail/detail" + "pages/detail/detail", + "pages/login/login" ], "window": { "backgroundTextStyle": "light", @@ -20,13 +21,13 @@ { "pagePath": "pages/home/home", "text": "酒单", - "iconPath":"./images/menu.png", + "iconPath": "./images/menu.png", "selectedIconPath": "./images/menu.png" }, { "pagePath": "pages/index/index", "text": "我的", - "iconPath":"./images/home.png", + "iconPath": "./images/home.png", "selectedIconPath": "./images/home.png" } ] diff --git a/miniprogram/app.scss b/miniprogram/app.scss index 4f6f9ff..0772472 100644 --- a/miniprogram/app.scss +++ b/miniprogram/app.scss @@ -58,4 +58,9 @@ height: 1px; } } +.tip{ + font-size: 12px; + color: gray; + margin: 10px; +} diff --git a/miniprogram/app.ts b/miniprogram/app.ts index 99e1f90..15055f2 100644 --- a/miniprogram/app.ts +++ b/miniprogram/app.ts @@ -1,16 +1,22 @@ // app.ts +let api = require("./api/index") App({ - globalData: {}, - onLaunch() { + globalData: { + userInfo: undefined, + isLogin: false, + code:null + }, + async onLaunch() { // 展示本地存储能力 - const logs = wx.getStorageSync('logs') || [] - logs.unshift(Date.now()) - wx.setStorageSync('logs', logs) + // const logs = wx.getStorageSync('logs') || [] + // logs.unshift(Date.now()) + // wx.setStorageSync('logs', logs) // 登录 wx.login({ success: res => { console.log(res.code) + this.globalData.code = res.code // 发送 res.code 到后台换取 openId, sessionKey, unionId }, }) @@ -21,5 +27,9 @@ App({ console.log(res); } }) - }, + // 检查是否登录 + const login_res = await api.checkLogin() + console.log(login_res) + this.globalData.isLogin = login_res + } }) \ No newline at end of file diff --git a/miniprogram/assets/avatar.png b/miniprogram/assets/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..c552c1fd953a5eb51ade2d075b94491ce143ff58 GIT binary patch literal 7203 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 z() Page({ /** * 页面的初始数据 @@ -97,6 +98,8 @@ Page({ }) }, async getList() {//获取列表 + app.globalData.isLogin = api.checkLogin(1) + // app.globalData.isLogin = login_state const res = await api.getWineList({ current:1, size:10 diff --git a/miniprogram/pages/login/login.json b/miniprogram/pages/login/login.json new file mode 100644 index 0000000..a38ebaa --- /dev/null +++ b/miniprogram/pages/login/login.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "登录" +} \ No newline at end of file diff --git a/miniprogram/pages/login/login.scss b/miniprogram/pages/login/login.scss new file mode 100644 index 0000000..3bed1c2 --- /dev/null +++ b/miniprogram/pages/login/login.scss @@ -0,0 +1,42 @@ +/* pages/login/login.wxss */ +page{ + height: 100%; +} +.container{ + align-items: center; +} +.title{ + font-weight: bolder; + font-size: 40rpx; +} +.more-info{ + color: gray; + font-size: 24rpx; + margin-top: 1rem; +} +.buy-btn{ + margin-top:1rem; + background-color: #000; + color: white; + border-radius: 50rpx; + font-weight: 200; + font-size: 24rpx; +} +.title-part{ + text-align: center; +} +.avatar-wrapper{ + width: 80rpx !important; + height: 80rpx; + padding: 0px; + margin: 0 auto; + overflow: hidden; + margin-bottom: 40rpx; +} +.avatar{ + width: 80rpx; + height: 80rpx; +} +.weui-input{ + +} \ No newline at end of file diff --git a/miniprogram/pages/login/login.ts b/miniprogram/pages/login/login.ts new file mode 100644 index 0000000..e62ac56 --- /dev/null +++ b/miniprogram/pages/login/login.ts @@ -0,0 +1,154 @@ +// pages/login/login.ts +const defaultAvatarUrl = '../../assets/avatar.png' +const api = require("../../api/index") +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + avatarUrl:defaultAvatarUrl , + nickName:'' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad() { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + onChooseAvatar(e:any) { + console.log(e); + const { avatarUrl } = e.detail + this.setData({ + avatarUrl, + }) + }, + async toWXLogin() { + console.log(app.globalData.code) + wx.showLoading({ + title: '加载中', + }) + if(!this.data.nickName) { + wx.showToast({ + title:'请填写昵称', + icon: 'error', + duration: 2000 + }) + return + } + const token_res = await api.getAccess_token({code:app.globalData.code,nickName:this.data.nickName,avatarUrl:this.data.avatarUrl}); + if(token_res.code == 200){ + // 设置缓存 + wx.setStorageSync('token', token_res.data.access_token);//token + wx.setStorageSync('userId', token_res.data.userId);//userId + wx.setStorageSync('nickName', this.data.nickName);//nickName + wx.setStorageSync('avatarUrl', this.data.avatarUrl);//avatarUrl + //绑定微信 + const login_res =await api.bindingWX({code:app.globalData.code}); + if(login_res.code == 200){ + wx.hideLoading() + wx.navigateBack({ + delta: -1 + }) + } + } + else{ + wx.hideLoading() + wx.showToast({ + title:token_res.message, + icon: 'error', + duration: 2000 + }) + } + }, + async getPhoneNumber (e:any) {//获取手机号 + // var _this=this; + console.log(e) + wx.showLoading({ + title: '加载中', + }) + if(!this.data.nickName) { + wx.showToast({ + title:'请填写昵称', + icon: 'error', + duration: 2000 + }) + return + } + const token_res = await api.getAccess_token({code:e.detail.code,nickName:this.data.nickName,avatarUrl:this.data.avatarUrl}); + if(token_res.code == 200){ + // 设置缓存 + wx.setStorageSync('token', token_res.data.access_token);//token + wx.setStorageSync('userId', token_res.data.userId);//userId + wx.setStorageSync('nickName', this.data.nickName);//nickName + wx.setStorageSync('avatarUrl', this.data.avatarUrl);//avatarUrl + //绑定微信 + const login_res =await api.toLogin(); + if(login_res.code == 200){ + wx.hideLoading() + wx.navigateBack({ + delta: -1 + }) + } + } + else{ + wx.hideLoading() + wx.showToast({ + title:token_res.message, + icon: 'error', + duration: 2000 + }) + } + }, +}) \ No newline at end of file diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml new file mode 100644 index 0000000..1229cb6 --- /dev/null +++ b/miniprogram/pages/login/login.wxml @@ -0,0 +1,24 @@ + + + + + + + 点击下方头像位置获取微信头像 + + + + + + + + + diff --git a/miniprogram/pages/star/star.ts b/miniprogram/pages/star/star.ts index 8ac7b7a..25d8b68 100644 --- a/miniprogram/pages/star/star.ts +++ b/miniprogram/pages/star/star.ts @@ -1,5 +1,6 @@ // pages/star/star.ts const api = require("../../api/index") +const app = getApp() Page({ /** @@ -78,12 +79,21 @@ Page({ }, async getList() { - const res = await api.getMyWineList({ - current:1, - size:10 - }) - if(res.code === 200) { - + console.log(app.globalData.isLogin) + if(app.globalData.isLogin) { + const res = await api.getMyWineList({ + current:1, + size:10 + }) + if(res.code === 200) { + + } + } + else{ // 跳转登录页 + wx.navigateTo({ + url:'../login/login' + }) } + } }) \ No newline at end of file diff --git a/miniprogram/pages/star/star.wxml b/miniprogram/pages/star/star.wxml index 07dd65e..89d7c85 100644 --- a/miniprogram/pages/star/star.wxml +++ b/miniprogram/pages/star/star.wxml @@ -1,5 +1,5 @@ - + {{item.name}} diff --git a/miniprogram/utils/custom.ts b/miniprogram/utils/custom.ts new file mode 100644 index 0000000..46301e3 --- /dev/null +++ b/miniprogram/utils/custom.ts @@ -0,0 +1,47 @@ +const custom = { + encode (input:any) { + let _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + let output = ""; + let chr1, chr2, chr3, enc1, enc2, enc3, enc4; + let i = 0; + input = this.utf8_encode(input); + while (i < input.length) { + chr1 = input.charCodeAt(i++); + chr2 = input.charCodeAt(i++); + chr3 = input.charCodeAt(i++); + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } + output = output + + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + + _keyStr.charAt(enc3) + _keyStr.charAt(enc4); + } + return output; + }, + utf8_encode(input) { + input = input.replace(/\r\n/g,"\n"); + let utftext = ""; + for (let n = 0; n < input.length; n++) { + let c = input.charCodeAt(n); + if (c < 128) { + utftext += String.fromCharCode(c); + } else if((c > 127) && (c < 2048)) { + utftext += String.fromCharCode((c >> 6) | 192); + utftext += String.fromCharCode((c & 63) | 128); + } else { + utftext += String.fromCharCode((c >> 12) | 224); + utftext += String.fromCharCode(((c >> 6) & 63) | 128); + utftext += String.fromCharCode((c & 63) | 128); + } + + } + return utftext; + } +} +module.exports = custom \ No newline at end of file diff --git a/project.config.json b/project.config.json index 04dd88a..700036f 100644 --- a/project.config.json +++ b/project.config.json @@ -22,7 +22,7 @@ "simulatorPluginLibVersion": {}, "condition": {}, "srcMiniprogramRoot": "miniprogram/", - "appid": "wx3d38ce1103a82225", + "appid": "wx29f3e0dc2f7f2c54", "libVersion": "2.31.0", "editorSetting": { "tabIndent": "insertSpaces", diff --git a/typings/index.d.ts b/typings/index.d.ts index 3ee60c8..754cc82 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -3,6 +3,8 @@ interface IAppOption { globalData: { userInfo?: WechatMiniprogram.UserInfo, + isLogin:boolean, + code:any } userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback, } \ No newline at end of file