diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/pages/guide/index.js b/pages/guide/index.js index e59f8bf..1444e20 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -54,9 +54,8 @@ }, onLoad: async function (options) { await this.wxLogin(); - // const res = await getBanner({bannerName:'',bannerModule:''}) - // console.log(res) - + const res = await getBanner({bannerName:'',bannerModule:''}) + console.log(res) this.setData({ isLogin: true }); diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/pages/guide/index.js b/pages/guide/index.js index e59f8bf..1444e20 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -54,9 +54,8 @@ }, onLoad: async function (options) { await this.wxLogin(); - // const res = await getBanner({bannerName:'',bannerModule:''}) - // console.log(res) - + const res = await getBanner({bannerName:'',bannerModule:''}) + console.log(res) this.setData({ isLogin: true }); diff --git a/pages/mine/mine.js b/pages/mine/mine.js index bd78a4c..00f02f6 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -65,9 +65,11 @@ id: '1', name: '系统设置' }, - ], - avatarUrl: defaultAvatarUrl, - nickname: '微信用户', + ], + defaultUrl:defaultAvatarUrl, + avatarUrl: '', + nickname: '微信用户', + isShow:true }, /** @@ -79,11 +81,18 @@ //点我授权 handleSq() { getUserProfile(this.onAuthSuccess); - }, - onChooseAvatar(e) { - const { avatarUrl } = e.detail - this.setData({ - avatarUrl, - }) - } + }, + getUserProfile(e) { + // 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 + wx.getUserProfile({ + desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 + success: (res) => { + this.setData({ + avatarUrl: res.userInfo.avatarUrl, + isShow:false, + nickname:res.userInfo.nickName + }) + } + }) + } }) \ No newline at end of file diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/pages/guide/index.js b/pages/guide/index.js index e59f8bf..1444e20 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -54,9 +54,8 @@ }, onLoad: async function (options) { await this.wxLogin(); - // const res = await getBanner({bannerName:'',bannerModule:''}) - // console.log(res) - + const res = await getBanner({bannerName:'',bannerModule:''}) + console.log(res) this.setData({ isLogin: true }); diff --git a/pages/mine/mine.js b/pages/mine/mine.js index bd78a4c..00f02f6 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -65,9 +65,11 @@ id: '1', name: '系统设置' }, - ], - avatarUrl: defaultAvatarUrl, - nickname: '微信用户', + ], + defaultUrl:defaultAvatarUrl, + avatarUrl: '', + nickname: '微信用户', + isShow:true }, /** @@ -79,11 +81,18 @@ //点我授权 handleSq() { getUserProfile(this.onAuthSuccess); - }, - onChooseAvatar(e) { - const { avatarUrl } = e.detail - this.setData({ - avatarUrl, - }) - } + }, + getUserProfile(e) { + // 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 + wx.getUserProfile({ + desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 + success: (res) => { + this.setData({ + avatarUrl: res.userInfo.avatarUrl, + isShow:false, + nickname:res.userInfo.nickName + }) + } + }) + } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 5475716..4f9e09a 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,6 +1,7 @@ { "usingComponents": { - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index" }, "navigationBarTitleText": "我的", "navigationBarBackgroundColor": "#f8f8f8" diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/pages/guide/index.js b/pages/guide/index.js index e59f8bf..1444e20 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -54,9 +54,8 @@ }, onLoad: async function (options) { await this.wxLogin(); - // const res = await getBanner({bannerName:'',bannerModule:''}) - // console.log(res) - + const res = await getBanner({bannerName:'',bannerModule:''}) + console.log(res) this.setData({ isLogin: true }); diff --git a/pages/mine/mine.js b/pages/mine/mine.js index bd78a4c..00f02f6 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -65,9 +65,11 @@ id: '1', name: '系统设置' }, - ], - avatarUrl: defaultAvatarUrl, - nickname: '微信用户', + ], + defaultUrl:defaultAvatarUrl, + avatarUrl: '', + nickname: '微信用户', + isShow:true }, /** @@ -79,11 +81,18 @@ //点我授权 handleSq() { getUserProfile(this.onAuthSuccess); - }, - onChooseAvatar(e) { - const { avatarUrl } = e.detail - this.setData({ - avatarUrl, - }) - } + }, + getUserProfile(e) { + // 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 + wx.getUserProfile({ + desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 + success: (res) => { + this.setData({ + avatarUrl: res.userInfo.avatarUrl, + isShow:false, + nickname:res.userInfo.nickName + }) + } + }) + } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 5475716..4f9e09a 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,6 +1,7 @@ { "usingComponents": { - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index" }, "navigationBarTitleText": "我的", "navigationBarBackgroundColor": "#f8f8f8" diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 5058180..a120e6d 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -3,9 +3,10 @@ - - - + + {{nickname}} diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/pages/guide/index.js b/pages/guide/index.js index e59f8bf..1444e20 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -54,9 +54,8 @@ }, onLoad: async function (options) { await this.wxLogin(); - // const res = await getBanner({bannerName:'',bannerModule:''}) - // console.log(res) - + const res = await getBanner({bannerName:'',bannerModule:''}) + console.log(res) this.setData({ isLogin: true }); diff --git a/pages/mine/mine.js b/pages/mine/mine.js index bd78a4c..00f02f6 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -65,9 +65,11 @@ id: '1', name: '系统设置' }, - ], - avatarUrl: defaultAvatarUrl, - nickname: '微信用户', + ], + defaultUrl:defaultAvatarUrl, + avatarUrl: '', + nickname: '微信用户', + isShow:true }, /** @@ -79,11 +81,18 @@ //点我授权 handleSq() { getUserProfile(this.onAuthSuccess); - }, - onChooseAvatar(e) { - const { avatarUrl } = e.detail - this.setData({ - avatarUrl, - }) - } + }, + getUserProfile(e) { + // 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 + wx.getUserProfile({ + desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 + success: (res) => { + this.setData({ + avatarUrl: res.userInfo.avatarUrl, + isShow:false, + nickname:res.userInfo.nickName + }) + } + }) + } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 5475716..4f9e09a 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,6 +1,7 @@ { "usingComponents": { - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index" }, "navigationBarTitleText": "我的", "navigationBarBackgroundColor": "#f8f8f8" diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 5058180..a120e6d 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -3,9 +3,10 @@ - - - + + {{nickname}} diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 36e2d90..acc87cc 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -22,14 +22,21 @@ .nickname { margin-top: 20rpx; } +.head-button{ + width: 190rpx ; + height: 190rpx ; + border-radius: 50%; + padding: 0 !important; +} +.head-picture-default{ + width: 190rpx; + height: 100%; + border-radius: 50%; +} .head-picture { - display: flex; - justify-content: center; - align-items: center; width: 190rpx; height: 190rpx; border-radius: 50%; - /* background-color: #ccc; */ border: 1rpx solid #ccc; background-color: #f4f4f6; overflow: hidden; diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/pages/guide/index.js b/pages/guide/index.js index e59f8bf..1444e20 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -54,9 +54,8 @@ }, onLoad: async function (options) { await this.wxLogin(); - // const res = await getBanner({bannerName:'',bannerModule:''}) - // console.log(res) - + const res = await getBanner({bannerName:'',bannerModule:''}) + console.log(res) this.setData({ isLogin: true }); diff --git a/pages/mine/mine.js b/pages/mine/mine.js index bd78a4c..00f02f6 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -65,9 +65,11 @@ id: '1', name: '系统设置' }, - ], - avatarUrl: defaultAvatarUrl, - nickname: '微信用户', + ], + defaultUrl:defaultAvatarUrl, + avatarUrl: '', + nickname: '微信用户', + isShow:true }, /** @@ -79,11 +81,18 @@ //点我授权 handleSq() { getUserProfile(this.onAuthSuccess); - }, - onChooseAvatar(e) { - const { avatarUrl } = e.detail - this.setData({ - avatarUrl, - }) - } + }, + getUserProfile(e) { + // 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 + wx.getUserProfile({ + desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 + success: (res) => { + this.setData({ + avatarUrl: res.userInfo.avatarUrl, + isShow:false, + nickname:res.userInfo.nickName + }) + } + }) + } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 5475716..4f9e09a 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,6 +1,7 @@ { "usingComponents": { - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index" }, "navigationBarTitleText": "我的", "navigationBarBackgroundColor": "#f8f8f8" diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 5058180..a120e6d 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -3,9 +3,10 @@ - - - + + {{nickname}} diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 36e2d90..acc87cc 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -22,14 +22,21 @@ .nickname { margin-top: 20rpx; } +.head-button{ + width: 190rpx ; + height: 190rpx ; + border-radius: 50%; + padding: 0 !important; +} +.head-picture-default{ + width: 190rpx; + height: 100%; + border-radius: 50%; +} .head-picture { - display: flex; - justify-content: center; - align-items: center; width: 190rpx; height: 190rpx; border-radius: 50%; - /* background-color: #ccc; */ border: 1rpx solid #ccc; background-color: #f4f4f6; overflow: hidden; diff --git a/utils/api/index.js b/utils/api/index.js index 133435e..4d7824e 100644 --- a/utils/api/index.js +++ b/utils/api/index.js @@ -1,25 +1,8 @@ import fetch from '../common/fetch' const baseUrl = 'https://kitchen.smartlog.work' const getBannerUrl = baseUrl + '/appBannerInfo/mini/listPage' -const login = baseUrl + '/miniUser/login' // 获取banner轮播图 export function getBanner(params) { return fetch.post(getBannerUrl, params).then(res => res); } -// 登录 -export function LOGIN(data) { - const params = { - wxCode:data, - appid:'wx84dba45d4abf799f', - wxUserInfo: { - nickName: '', - country: '', - province: '', - city: '', - avatarUrl: '', - phone: 17571066031, - }, - } - return fetch.post(login,params).then((res) => res); -} diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/pages/guide/index.js b/pages/guide/index.js index e59f8bf..1444e20 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -54,9 +54,8 @@ }, onLoad: async function (options) { await this.wxLogin(); - // const res = await getBanner({bannerName:'',bannerModule:''}) - // console.log(res) - + const res = await getBanner({bannerName:'',bannerModule:''}) + console.log(res) this.setData({ isLogin: true }); diff --git a/pages/mine/mine.js b/pages/mine/mine.js index bd78a4c..00f02f6 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -65,9 +65,11 @@ id: '1', name: '系统设置' }, - ], - avatarUrl: defaultAvatarUrl, - nickname: '微信用户', + ], + defaultUrl:defaultAvatarUrl, + avatarUrl: '', + nickname: '微信用户', + isShow:true }, /** @@ -79,11 +81,18 @@ //点我授权 handleSq() { getUserProfile(this.onAuthSuccess); - }, - onChooseAvatar(e) { - const { avatarUrl } = e.detail - this.setData({ - avatarUrl, - }) - } + }, + getUserProfile(e) { + // 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 + wx.getUserProfile({ + desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 + success: (res) => { + this.setData({ + avatarUrl: res.userInfo.avatarUrl, + isShow:false, + nickname:res.userInfo.nickName + }) + } + }) + } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 5475716..4f9e09a 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,6 +1,7 @@ { "usingComponents": { - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index" }, "navigationBarTitleText": "我的", "navigationBarBackgroundColor": "#f8f8f8" diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 5058180..a120e6d 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -3,9 +3,10 @@ - - - + + {{nickname}} diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 36e2d90..acc87cc 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -22,14 +22,21 @@ .nickname { margin-top: 20rpx; } +.head-button{ + width: 190rpx ; + height: 190rpx ; + border-radius: 50%; + padding: 0 !important; +} +.head-picture-default{ + width: 190rpx; + height: 100%; + border-radius: 50%; +} .head-picture { - display: flex; - justify-content: center; - align-items: center; width: 190rpx; height: 190rpx; border-radius: 50%; - /* background-color: #ccc; */ border: 1rpx solid #ccc; background-color: #f4f4f6; overflow: hidden; diff --git a/utils/api/index.js b/utils/api/index.js index 133435e..4d7824e 100644 --- a/utils/api/index.js +++ b/utils/api/index.js @@ -1,25 +1,8 @@ import fetch from '../common/fetch' const baseUrl = 'https://kitchen.smartlog.work' const getBannerUrl = baseUrl + '/appBannerInfo/mini/listPage' -const login = baseUrl + '/miniUser/login' // 获取banner轮播图 export function getBanner(params) { return fetch.post(getBannerUrl, params).then(res => res); } -// 登录 -export function LOGIN(data) { - const params = { - wxCode:data, - appid:'wx84dba45d4abf799f', - wxUserInfo: { - nickName: '', - country: '', - province: '', - city: '', - avatarUrl: '', - phone: 17571066031, - }, - } - return fetch.post(login,params).then((res) => res); -} diff --git a/utils/common/fetch.js b/utils/common/fetch.js index a17f1c6..607a6a7 100644 --- a/utils/common/fetch.js +++ b/utils/common/fetch.js @@ -1,35 +1,18 @@ -import {getLogin} from '../request' - // 发送请求 function fetch(method) { return function (url, data, otherParams = {}) { - const sessionId = wx.getStorageSync("sessionId"); //定时器 return new Promise((resolve, reject) => { wx.request({ url, method, data, - header: { - token: sessionId, - }, success(data) { if (data.statusCode === 200) { if (data.data.code === 200) { resolve(data.data.data); - } else if (data.data.code === 2401) { - wx.showToast({ - title: `登录过期，正在重新登录`, - icon: "none", - duration: 2000, - }); - getLogin(); - resolve(data.data.message); - } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || - data.data.code === 2402) { - resolve('用户未注册'); - } else { + } else { wx.showToast({ // title: "系统异常，请稍后再试！", title: `${data.data.message}`, diff --git a/app.js b/app.js index 68ffd75..5820573 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ import { Provider } from './libs/wechat-weapp-redux.min'; import { configStore } from './utils/store/store'; import { judgeMyApi } from './utils/util/index' -import {getLogin} from './utils/request' const store = configStore(); let count = 0; @@ -30,7 +29,6 @@ }, onShow: async function() { - getLogin() let access_token = await wx.getStorageSync('access_token') if(!access_token) return; await this.onConnect(); diff --git a/pages/guide/index.js b/pages/guide/index.js index e59f8bf..1444e20 100644 --- a/pages/guide/index.js +++ b/pages/guide/index.js @@ -54,9 +54,8 @@ }, onLoad: async function (options) { await this.wxLogin(); - // const res = await getBanner({bannerName:'',bannerModule:''}) - // console.log(res) - + const res = await getBanner({bannerName:'',bannerModule:''}) + console.log(res) this.setData({ isLogin: true }); diff --git a/pages/mine/mine.js b/pages/mine/mine.js index bd78a4c..00f02f6 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -65,9 +65,11 @@ id: '1', name: '系统设置' }, - ], - avatarUrl: defaultAvatarUrl, - nickname: '微信用户', + ], + defaultUrl:defaultAvatarUrl, + avatarUrl: '', + nickname: '微信用户', + isShow:true }, /** @@ -79,11 +81,18 @@ //点我授权 handleSq() { getUserProfile(this.onAuthSuccess); - }, - onChooseAvatar(e) { - const { avatarUrl } = e.detail - this.setData({ - avatarUrl, - }) - } + }, + getUserProfile(e) { + // 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 + wx.getUserProfile({ + desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 + success: (res) => { + this.setData({ + avatarUrl: res.userInfo.avatarUrl, + isShow:false, + nickname:res.userInfo.nickName + }) + } + }) + } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 5475716..4f9e09a 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,6 +1,7 @@ { "usingComponents": { - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index" }, "navigationBarTitleText": "我的", "navigationBarBackgroundColor": "#f8f8f8" diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 5058180..a120e6d 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -3,9 +3,10 @@ - - - + + {{nickname}} diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 36e2d90..acc87cc 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -22,14 +22,21 @@ .nickname { margin-top: 20rpx; } +.head-button{ + width: 190rpx ; + height: 190rpx ; + border-radius: 50%; + padding: 0 !important; +} +.head-picture-default{ + width: 190rpx; + height: 100%; + border-radius: 50%; +} .head-picture { - display: flex; - justify-content: center; - align-items: center; width: 190rpx; height: 190rpx; border-radius: 50%; - /* background-color: #ccc; */ border: 1rpx solid #ccc; background-color: #f4f4f6; overflow: hidden; diff --git a/utils/api/index.js b/utils/api/index.js index 133435e..4d7824e 100644 --- a/utils/api/index.js +++ b/utils/api/index.js @@ -1,25 +1,8 @@ import fetch from '../common/fetch' const baseUrl = 'https://kitchen.smartlog.work' const getBannerUrl = baseUrl + '/appBannerInfo/mini/listPage' -const login = baseUrl + '/miniUser/login' // 获取banner轮播图 export function getBanner(params) { return fetch.post(getBannerUrl, params).then(res => res); } -// 登录 -export function LOGIN(data) { - const params = { - wxCode:data, - appid:'wx84dba45d4abf799f', - wxUserInfo: { - nickName: '', - country: '', - province: '', - city: '', - avatarUrl: '', - phone: 17571066031, - }, - } - return fetch.post(login,params).then((res) => res); -} diff --git a/utils/common/fetch.js b/utils/common/fetch.js index a17f1c6..607a6a7 100644 --- a/utils/common/fetch.js +++ b/utils/common/fetch.js @@ -1,35 +1,18 @@ -import {getLogin} from '../request' - // 发送请求 function fetch(method) { return function (url, data, otherParams = {}) { - const sessionId = wx.getStorageSync("sessionId"); //定时器 return new Promise((resolve, reject) => { wx.request({ url, method, data, - header: { - token: sessionId, - }, success(data) { if (data.statusCode === 200) { if (data.data.code === 200) { resolve(data.data.data); - } else if (data.data.code === 2401) { - wx.showToast({ - title: `登录过期，正在重新登录`, - icon: "none", - duration: 2000, - }); - getLogin(); - resolve(data.data.message); - } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || - data.data.code === 2402) { - resolve('用户未注册'); - } else { + } else { wx.showToast({ // title: "系统异常，请稍后再试！", title: `${data.data.message}`, diff --git a/utils/request.js b/utils/request.js index 0248485..656657f 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,5 +1,4 @@ require('regenerator-runtime') -import {LOGIN} from '../utils/api/index' const EXPIRDCODE = 1010; const INVALIDCODE = 1004; let errorInfo = {}; @@ -70,35 +69,6 @@ return request(params); }; -// 登录 -export function getLogin() { - console.log('login') - return new Promise((resolve, reject) => { - wx.login({ - onlyAuthorize: true, - success(data) { - console.log('登录参数', data, wx.getStorageSync('sessionId')) - LOGIN(data.code).then(res => { - wx.setStorageSync('sessionId', res); - wx.showToast({ - title: `登录成功`, - icon: "none", - duration: 2000, - }); - resolve('登录成功'); - }); - }, - fail(err) { - console.log('login fail', err); - wx.showToast({ - title: '登录错误', - icon: 'none' - }); - reject('登录错误'); - }, - }); - }) -} export const login = async () => { if(!wxAppid.length) wxAppid = 'cloud'