From ccfa0d8db4e6bb5e789bd743dd5fef29795c71ba Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Sat, 22 Mar 2025 17:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/index.wxml       |  2 +-
 pages/userDetail/index.js   | 23 ++++++++++++++++++++---
 pages/userDetail/index.wxml |  2 +-
 pages/userName/index.js     | 14 ++++++++------
 pages/userName/index.wxml   |  2 +-
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml
index f2c44fb..5fdb784 100644
--- a/pages/mine/index.wxml
+++ b/pages/mine/index.wxml
@@ -20,7 +20,7 @@
               </block>
               <view class="usernamebox">
                 <view class="username">
-                  <view class="theusername">{{userInfo.user.nickName || '伯才用户' }}</view>
+                  <view class="theusername">{{userInfo.user.userName || '伯才用户' }}</view>
                   <i class="iconfont icon-nv3 f12" style="color:#fb8585;line-height:20px" wx:if="{{userInfo.user.sex == 2}}"></i>
                   <i class="iconfont icon-nan3 f12" style="color:#10aeff;line-height:20px" wx:if="{{userInfo.user.sex == 1}}"></i>
                 </view>
diff --git a/pages/userDetail/index.js b/pages/userDetail/index.js
index 755b455..81258b2 100644
--- a/pages/userDetail/index.js
+++ b/pages/userDetail/index.js
@@ -29,18 +29,19 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    let that = this;
     if (wx.getStorageSync("configInfo")) {
       this.setData({
         configInfo: { ...wx.getStorageSync("configInfo"), biao: false },
       });
       console.log('configInfo', this.data.configInfo);
     }
-    setTimeout(() => {
+    that.copyUpdateToken(()=>{
       console.log('app.globalData.loginUserInfo',app.globalData.loginUserInfo);
-      this.setData({
+      that.setData({
         userInfo: app.globalData.loginUserInfo,
       });
-    }, 100);
+    })
 
   },
   showToggle () {
@@ -108,6 +109,22 @@ Page({
 
     })
   },
+  copyUpdateToken(callback=()=>{}){
+    let that = this;
+    customRequest('/appLoginByToken', { header: 'headers', method: 'GET', data: {} }).then((res) => {
+      console.log(res);
+      app.globalData.agencyStatus = res.data.data.agencyStatus;
+      app.globalData.loginUserInfo = res.data.data;
+      wx.setStorageSync("loginUser", res.data.data);
+      wx.setStorageSync("LOGINUSER_ID", res.data.data.user.agencyId);
+      this.setData({
+        drawerShow: false
+      })
+      // that.onLoad()
+      // that.onShow()
+      callback();
+    })
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/userDetail/index.wxml b/pages/userDetail/index.wxml
index 1bb6cc7..12fc66e 100644
--- a/pages/userDetail/index.wxml
+++ b/pages/userDetail/index.wxml
@@ -22,7 +22,7 @@
       <view class="userName">
         <view class="fw500">用户名</view>
         <view>
-          <view>{{userInfo.nickName}}</view>
+          <view>{{userInfo.userName}}</view>
           <view class="iconfont icon-gengduo11"></view>
         </view>
       </view>
diff --git a/pages/userName/index.js b/pages/userName/index.js
index 2a9cc6e..b7507e8 100644
--- a/pages/userName/index.js
+++ b/pages/userName/index.js
@@ -7,7 +7,7 @@ Page({
    */
   data: {
     userId: "",
-    nickName: "",
+    userName: "",
     btnLoading: false,
   },
 
@@ -21,7 +21,7 @@ Page({
 
     var that = this;
 
-    if (app.isEmptyCheck(e.detail.value.nickName)) {
+    if (app.isEmptyCheck(e.detail.value.userName)) {
       wx.showToast({
         icon: "none",
         title: "请输入姓名",
@@ -34,10 +34,12 @@ Page({
     var formData = e.detail.value;
     // formData["userId"] = that.data.userId;
 
-    console.log(formData);
-    customRequest("/user/updateNickName", { header: 'headers', method: 'POST', data:formData }).then((res) => {
+   
+    customRequest("/user/updateNickName", { header: 'headers', method: 'POST', data:{
+      nickName:formData.userName
+    } }).then((res) => {
       if (res.data.status == 200) {
-        app.globalData.user.nickName = formData.nickName;
+        app.globalData.user.userName = formData.userName;
 
         wx.navigateBack({
           delta: 1,
@@ -93,7 +95,7 @@ Page({
   onShow: function () {
     this.setData({
       userId: app.globalData.user.id,
-      nickName: app.globalData.user.nickName,
+      userName: app.globalData.user.userName,
     });
   },
 
diff --git a/pages/userName/index.wxml b/pages/userName/index.wxml
index a53bd32..394b648 100644
--- a/pages/userName/index.wxml
+++ b/pages/userName/index.wxml
@@ -4,7 +4,7 @@
       <view class="weui-cell">
         <view class="weui-cell__hd"><label class="weui-label fw500">用户名</label></view>
         <view class="weui-cell__bd">
-          <input name="nickName"  type='nickname' value="{{nickName}}" class="weui-input tr" placeholder="请输入用户名" placeholder-class="weui-input__placeholder" />
+          <input name="userName"  type='userName' value="{{userName}}" class="weui-input tr" placeholder="请输入用户名" placeholder-class="weui-input__placeholder" />
         </view>
       </view>
     </view>