From 156484e129322de7a2db0e2b4dafa53f858f1fba Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Mon, 21 Nov 2022 12:02:20 +0800
Subject: [PATCH] cxw-010203

---
 pages/mine/index.js                | 42 ++++++++++++++++++++++++++---
 pages/mine/index.wxml              | 10 ++++---
 pages/mine/index.wxss              |  4 +--
 pages/mine/pages/bindUser/index.js | 43 +++++++++++++++++++-----------
 4 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/pages/mine/index.js b/pages/mine/index.js
index b1b7b8e..0b6508a 100644
--- a/pages/mine/index.js
+++ b/pages/mine/index.js
@@ -1,5 +1,5 @@
 // index.js
-
+const app = getApp()
 Page({
     data: {
         imageUrl: getApp().globalData.imageUrl,
@@ -7,7 +7,10 @@ Page({
         statusBarHeight: 0,
         nickName: "未登录",
         avatarUrl: "",
-        btnShow: false
+        btnShow: false,
+        userName: '',
+        headImg: '',
+        fileList: []
     },
     onLoad: function () {
         wx.getSystemInfo({
@@ -23,19 +26,52 @@ Page({
         this.getTabBar().init();
         this.getUser();
     },
+    // 上传头像的验证
+    beforeRead(event) {
+        const { file, callback } = event.detail;
+        callback(file.type === 'image');
+    },
+    // 上传图片
+    afterRead(event) {
+        const { file } = event.detail;
+        let url = file.url;
+        let base64 = wx.getFileSystemManager().readFileSync(url, "base64");
+        let unionID = wx.getStorageSync('unionID');
+        if(!unionID) {
+            return false;
+        }
+        let obj = {
+            action: 'updImg',
+            unionID: unionID,
+            base64: base64,
+            token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
+        }
+        app.globalData.request(obj).then(res => {
+            let userInfo = wx.getStorageSync("userInfo");
+            userInfo.headImg = res;
+            wx.setStorageSync('userInfo', userInfo);
+            this.setData({
+                headImg: res
+            })
+        })
+    },
     getUser() {
         if(wx.getStorageSync("userInfo")) {
             let userInfo = wx.getStorageSync("userInfo");
             this.setData({
                 nickName: userInfo.nickName,
                 avatarUrl: userInfo.avatarUrl,
+                userName: userInfo.UserName,
+                headImg: userInfo.headImg,
                 btnShow: true
             })
         } else {
             this.setData({
                 nickName: '',
                 avatarUrl: '',
-                btnShow: false
+                btnShow: false,
+                headImg: '',
+                userName: ''
             })
         }
     },
diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml
index 52aece3..ae0cd7e 100644
--- a/pages/mine/index.wxml
+++ b/pages/mine/index.wxml
@@ -1,12 +1,14 @@
 <view class="box" style="{{bgImage}}">
     <!-- style="margin-top:{{statusBarHeight*2}}rpx" -->
     <view class="mine_title">
-        <view class="title_left" style="margin-left: 32rpx;">
-            <view style="font-size:48rpx;font-weight:600;">{{nickName}}</view>
+        <view class="title_left">
+            <view style="font-size:48rpx;font-weight:600;">{{userName}}</view>
             <view style="font-size:24rpx; color: #9b9999;margin-top: 24rpx;"> 欢迎您使⽤硕为思平台</view>
         </view>
-        <view class="title_right" style="margin-right: 32rpx;">
-            <van-image round width="128rpx" height="128rpx" fit='cover' src="{{avatarUrl}}"/>
+        <view class="title_right">
+            <van-uploader file-list="{{ fileList }}" max-count="1" bind:before-read="beforeRead" bind:after-read="afterRead" deletable="{{false}}">
+                <van-image icon="photo" round width="128rpx" height="128rpx" fit='cover' src="{{headImg}}"/>
+            </van-uploader>
         </view>
     </view>
     <view class="content">
diff --git a/pages/mine/index.wxss b/pages/mine/index.wxss
index e4972f5..13ef8fd 100644
--- a/pages/mine/index.wxss
+++ b/pages/mine/index.wxss
@@ -7,9 +7,9 @@
     height: 330px;
 }
 .mine_title{
-    width: 100%;
+    width: calc(100% -64rpx);
     display: flex;
-    padding-top: 208rpx;
+    padding: 208rpx 32rpx 0rpx 32rpx;
     justify-content: space-between;
 }
 
diff --git a/pages/mine/pages/bindUser/index.js b/pages/mine/pages/bindUser/index.js
index 6e83dc8..dc7e6c7 100644
--- a/pages/mine/pages/bindUser/index.js
+++ b/pages/mine/pages/bindUser/index.js
@@ -41,7 +41,7 @@ Page({
     },
     onShow() {
         let userInfo = wx.getStorageSync('userInfo');
-        if(userInfo) {
+        if (userInfo) {
             this.setData({
                 userName: userInfo.UserName || userInfo.userName
             })
@@ -49,13 +49,22 @@ Page({
     },
     // 微信用户初始化
     initData() {
+        let that = this;
         return new Promise((resolve, reject) => {
-            this.getUserCode().then(() => {
-                this.getOpenidByCode().then(() => {
-                    resolve(true)
-                }).catch(err => {
-                    console.log(err)
-                })
+            wx.login({
+                success(res) {
+                    that.setData({
+                        code: res.code
+                    })
+                    that.getOpenidByCode().then(() => {
+                        resolve(true)
+                    }).catch(err => {
+                        console.log(err)
+                    })
+                },
+                fail() {
+                    reject(false)
+                }
             })
         })
     },
@@ -145,11 +154,13 @@ Page({
                 const userInfo = Object.assign({}, res, {
                     nickName: this.data.nickName,
                     avatarUrl: this.data.avatarUrl,
-                    userName: this.data.userName
+                    userName: this.data.userName,
+                    headImg: res.headImg
                 })
                 wx.setStorageSync('token', res.toKen);
                 wx.setStorageSync('userInfo', userInfo);
                 wx.setStorageSync('openid', this.data.openid);
+                wx.setStorageSync('unionID', this.data.unionID);
                 wx.navigateBack({
                     delta: 1
                 });
@@ -158,11 +169,13 @@ Page({
                     let data = err.Data;
                     const userInfo = Object.assign({}, data, {
                         nickName: this.data.nickName,
-                        avatarUrl: this.data.avatarUrl
+                        avatarUrl: this.data.avatarUrl,
+                        userName: this.data.userName,
                     })
                     wx.setStorageSync('token', data.toKen);
                     wx.setStorageSync('userInfo', userInfo);
                     wx.setStorageSync('openid', this.data.openid);
+                    wx.setStorageSync('unionID', this.data.unionID);
                     wx.showModal({
                         title: '提示',
                         content: '登录成功，但未关注公众号。',
@@ -186,20 +199,20 @@ Page({
         })
     },
     //注册
-    register(){
+    register() {
         wx.navigateTo({
-          url: '/pages/mine/pages/register/register',
+            url: '/pages/mine/pages/register/register',
         })
     },
     handlerBack() {
-        if(this.data.isHome == 1) {
+        if (this.data.isHome == 1) {
             wx.switchTab({
-              url: '/pages/index/index'
+                url: '/pages/index/index'
             })
-        } else if(this.data.isHome == 3) {
+        } else if (this.data.isHome == 3) {
             wx.switchTab({
                 url: '/pages/mine/index'
-              })
+            })
         } else {
             wx.navigateBack({
                 delta: 1