--我的页面更新新版本

--码单管理完成

src/pages/userEdit/index.scss

@@ -119,10 +119,13 @@
     background-color: white;
     border: none;
     outline: none;
-    border-radius: none;
     padding: 0;
     border-radius: 0;
   }
+  .user-edit-popup-operation button::after,.user-edit-logout::after{
+    border-radius: 0;
+    border: none;
+  }
   .user-edit-popup-operation .user-edit-popup-operation-save{
     background: #007aff;
     color: #ffffff;

src/pages/userEdit/index.tsx

@@ -1,28 +1,56 @@
 
-import { goLink } from "@/common/common";
+import { alert, goLink, isEmptyObject, retrieval } from "@/common/common";
 import Popup from "@/components/popup";
 import { Button, Image, Text, Textarea, View } from "@tarojs/components"
 import Taro, { chooseMedia } from "@tarojs/taro";
-import { memo, useCallback, useState } from "react"
+import { GetAdminUserInfoApi, realNameUpdateApi } from "@/api/user";
+import { memo, useCallback, useEffect, useState } from "react"
 import "./index.scss"
 
 export default ()=>{
+	// 用户信息
+	const { fetchData, state } = GetAdminUserInfoApi();
+	const getData = async ()=>{
+		const result = await fetchData();
+    setFormData({
+      ...formData,
+      real_name: result.data.user_name
+    })
+	}
+  useEffect(()=>{
+    getData();
+  },[])
   // 表单数据
   const [formData, setFormData] = useState({
-    nickname: "麦兜"
+    real_name: "麦兜"
   });
-  
   // 显示popup
   const [popupShow,setPopupShow] = useState(false);
   const triggerList = useCallback((key:string)=>{
     setPopupShow(true);
   },[])
-
   // popup保存
-  const handleTextareaSave = ()=>{
-
+	const { fetchData: realNameUpdateFetch } = realNameUpdateApi();
+  const rules = {
+    real_name: [{
+      message: "请输入昵称"
+    }]
   }
-  Taro.eventCenter.on('message:detail', (message) => console.log(message))
+  const handleTextareaSave = async (real_name)=>{
+    retrieval({real_name},rules).then(async ()=>{
+      const result = await realNameUpdateFetch({real_name});
+      if(result.success){
+        getData();
+        setPopupShow(false);
+        alert.success("保存成功");
+      }else{
+        alert.none(result.msg);
+      }
+    }).catch(message=>{
+      alert.none(message);
+    })
+  }
+  // Taro.eventCenter.on('message:detail', (message) => console.log(message))
   // 面面跳转
   const onNavigate = (url:string)=>{
     goLink(url);
@@ -46,7 +74,7 @@ export default ()=>{
         <View>点击编辑头像</View>
       </View>
       <View className="user-edit-content">
-        <UserEditList onClick={()=>triggerList('nickname')} data={formData} label="昵称" placeholder="请输入" icon=""/>
+        <UserEditList onClick={()=>triggerList('real_name')} data={state.data.user_name} label="昵称" placeholder="请输入" icon=""/>
         <UserEditList onClick={()=>onNavigate("/pages/company/index")} label="公司/组织" placeholder="请输入" icon=""/>
         <UserEditList onClick={()=>onNavigate("/pages/addressManager/index")} label="地址管理" placeholder="添加 / 修改收货地址" icon=""/>
         <UserEditList onClick={()=>onNavigate("/pages/weightList/index")} label="码单管理" placeholder="修改码单抬头 / 客户 / 电话等显示信息" icon=""/>
@@ -55,7 +83,7 @@ export default ()=>{
       </View>
       <Button hoverClass="none" className="user-edit-logout">退出当前账号</Button>
 
-      <PopupContent value="123" show={popupShow} setPopupShow={setPopupShow} save={handleTextareaSave}/>
+      <PopupContent value={formData.real_name} show={popupShow} setPopupShow={setPopupShow} save={handleTextareaSave}/>
     </View>
   )
 }
@@ -69,8 +97,10 @@ const UserEditList = memo((props:any)=>{
       </View>
       <View className="user-edit-list-right">
         <View>
-          <View className="user-edit-list-right-placeholder">{props.placeholder}</View>
-          {/* 请输入 */}
+          {
+            props.data?props.data:
+            <View className="user-edit-list-right-placeholder">{props.placeholder}</View>
+          }
         </View>
         <Text className="iconfont icon-a-moreback"></Text>
       </View>
@@ -81,13 +111,16 @@ const UserEditList = memo((props:any)=>{
 // popup内容
 const PopupContent = memo((props:any)=>{
   const [value, setValue] = useState("");
+  useEffect(()=>{
+    setValue(props.value);
+  },[props.value])
   // popup输入长度
   const handleTextareaInput = (ev:any)=>{
     setValue(ev.detail.value.slice(0,20));
   }
   // 重置
   const handleTextareaReset = ()=>{
-    
+    setValue("");
   }
   return (
     <Popup onClose={()=>props.setPopupShow(false)} title="修改昵称" show={props.show}>
@@ -99,7 +132,7 @@ const PopupContent = memo((props:any)=>{
           <Text className="user-edit-popup-tips">请设置2-20个字符，由中文、英文、数字、-和_组成</Text>
           <View className="user-edit-popup-operation">
             <Button onClick={handleTextareaReset} hoverClass="none" className="user-edit-popup-operation-reset">重置</Button>
-            <Button onClick={props.save} hoverClass="none" className="user-edit-popup-operation-save">保存</Button>
+            <Button onClick={()=>props.save(value)} hoverClass="none" className="user-edit-popup-operation-save">保存</Button>
           </View>
         </View>
       </Popup>