.

src/pages/index/components/User/index.jsx

@@ -16,7 +16,8 @@ import bankCard from '@/assets/user/bankCard.png'
 import './style.less'
 
 export default (props) => {
-  const { phone, setPhone } = useModel('phone')
+  const { setPhone } = useModel('phone')
+  const { person } = useModel('person')
 
   const handleAccount = () => {
     Taro.navigateTo({ url: '/pages/userInfo/index' });
@@ -45,14 +46,14 @@ export default (props) => {
   }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
-      <View className='personTip'>该账号归张三所属</View>
+      <View className='personTip'>该账号归{person.nickName||'张三'}所属</View>
       <View className='userHead'>
         <Image src={userBgi} className='userBgi' />
         <View className='headcontent' >
-          <Image src={avatar} className='avatar' />
+          <Image src={person.avatar||avatar} className='avatar' />
           <View>
-            <View>张三</View>
-            <View>{phone}</View>
+            <View>{person.nickName||'张三'}</View>
+            <View>{person.phone}</View>
           </View>
         </View>
       </View>

src/pages/login/index.jsx

@@ -13,8 +13,7 @@ import unChecked from '@/assets/login/unChecked.png'
 import './style.less'
 
 export default (props) => {
-  const { person } = useModel('person')
-  const { setPhone:setphone } = useModel('phone')
+  const { person,setPerson } = useModel('person')
 
   const [agreement,setAgreement]=useState(false)
   const [phone,setPhone]=useState()
@@ -84,17 +83,16 @@ export default (props) => {
       }
       // 登录
       updatePhone(person.personId,{phone:phone,captcha:qCode}).then((res)=>{
+        setPerson({...person,phone:phone})
         Taro.showToast({
           title: '登录成功',
           icon: 'none',
           duration: 1000
         })
-        setphone(res.phone)
         Taro.reLaunch({ url: '/pages/index/index?tab=2&&isLogin=true' });
       }).catch((e) => {
-        console.log(e)
         Taro.showToast({
-          title: '网络异常, 请刷新小程序重试',
+          title: '手机号或者验证码不正确',
           icon: 'none',
         })
       })

src/pages/machineryDetail/index.jsx

@@ -1,4 +1,4 @@
-import { View, Image, ScrollView,Swiper,SwiperItem } from "@tarojs/components"
+import { View, Image, ScrollView, Swiper, SwiperItem } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import Jianbian from "@/components/Jianbian"
 import withLayout from '@/layouts'
@@ -9,18 +9,18 @@ import micon from '@/assets/machinery/micon2.png'
 import './style.less'
 
 export default withLayout((props) => {
-  const imgList=[
+  const imgList = [
     {
-      thumb:banner1
+      thumb: banner1
     },
     {
-      thumb:banner1
+      thumb: banner1
     },
     {
-      thumb:banner1
+      thumb: banner1
     },
     {
-      thumb:banner1
+      thumb: banner1
     }
   ]
   return (
@@ -30,18 +30,17 @@ export default withLayout((props) => {
       </View>
       <View className='index-container'>
         <ScrollView scrollY style={{ height: '100%' }}>
-        <Swiper
-          circular
-          autoplay
-          className='swiper'
-        >
+          <Swiper
+            circular
+            autoplay
+            className='swiper'
+          >
             {imgList.map((item, inx) => (
               <SwiperItem key={inx}>
                 <Image src={item.thumb} mode='widthFix' className='storeImage' />
               </SwiperItem>
             ))}
           </Swiper>
-          {/* <Image src={banner1} mode='aspectFill' className='detailHead' /> */}
           <View className='detailContent'>
             <Jianbian status='1' />
             <View className='detialName'>收割机001--S001</View>

src/pages/userInfo/index.jsx

@@ -1,24 +1,29 @@
 import { useState } from "react"
+import { useModel } from '@/store'
 import Taro from "@tarojs/taro"
 import { Input, View, Image } from "@tarojs/components"
 import withLayout from '@/layouts'
 import CustomNav from "@/components/CustomNav"
 import MyButton from "@/components/MyButton"
+import { updateInfo } from '@/services/login'
 import banner1 from '@/assets/banner/1.jpg'
 import resetImg from '@/assets/user/cancel.png'
 import './style.less'
 
 export default withLayout((props) => {
-  const [name, setName] = useState()
-  const [phone, setPhone] = useState()
-  const [avatar, setAvatar] = useState(banner1)
+
+  const { person, setPerson } = useModel('person')
+
+  const [name, setName] = useState(person.nickName)
+  const [phone, setPhone] = useState(person.phone)
+  const [avatar, setAvatar] = useState(person.avatar)
   const changeName = (e) => {
     setName(e.detail.value)
   }
   const changePhone = (e) => {
     setPhone(e.detail.value)
   }
-  const rulePhone=(val)=>{
+  const rulePhone = (val) => {
     if (!/^1[0-9]{10}$/.test(val)) {
       Taro.showToast({
         title: '请输入正确的11位手机号',
@@ -30,34 +35,39 @@ export default withLayout((props) => {
   }
   const handleSave = () => {
     if (rulePhone(phone)) {
-      Taro.showToast({
-        title: '保存成功',
-        icon: 'none',
+      updateInfo(person.personId, { ...person, avatar: avatar, phone: phone, nickName: name }).then((res) => {
+        setPerson(res)
+        Taro.showToast({
+          title: '保存成功',
+          icon: 'none',
+        })
+        Taro.navigateBack({ delta: 1 })
+      }).catch((e) => {
+        console.log(e)
+        Taro.showToast({
+          title: '网络异常, 请刷新小程序重试',
+          icon: 'none',
+        })
       })
-      Taro.navigateBack({delta:1})
     }
   }
-  const resetName=()=>{
+  const resetName = () => {
     setName()
   }
-  const resetPhone=()=>{
+  const resetPhone = () => {
     setPhone()
   }
-  const changeAvatar=()=>{
-    Taro.chooseImage({
-      count: 1,
+  const changeAvatar = () => {
+    Taro.getUserProfile({
+      lang: 'zh_CN',
+      desc: "获取你的昵称、头像、地区及性别",
       success: function (res) {
-        setAvatar(res.tempFilePaths[0])
-        // uploadFile(res.tempFilePaths[0]).then((res2) => {
-        //   const date = {
-        //     targetId: roomId,
-        //     targetType: 'room',
-        //     content: res2,
-        //     contentType: 'image'
-        //   }
-        //   saveExtend(date)
-        //   setReset(!reset)
-        // })
+        setAvatar(res.userInfo.avatarUrl)
+      },
+      fail: () => {
+        //拒绝授权
+        console.error("拒绝了请求");
+        return;
       }
     })
   }

src/services/login.js

@@ -22,3 +22,10 @@ export const signIn = (data) => request('/login', { data, method: 'post' })
 
 export const updatePhone = (id, data) => request(`/person/${id}/phone`, { method: 'put', data })
 
+/**
+ * 修改个人信息
+ * @param {*} 
+ * @returns 
+ */
+
+ export const updateInfo = (id, data) => request(`/person/${id}`, { method: 'put', data })

src/utils/request.js

@@ -4,19 +4,12 @@ import { getQueryString } from '.'
 
 const logger = Taro.getRealtimeLogManager()
 
-let appid = null;
 
 export default (url, options) => {
   const { params, skipError, header, ...leftOptions } = options || {}
   const queryStr = getQueryString(params)
-
-  if (!appid) {
-    const { miniProgram } = Taro.getAccountInfoSync();
-    appid = miniProgram.appId
-  }
-
   const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
-  const nwUrl = `${HOST}/api/wx/${appid}${urlWithParams}`
+  const nwUrl = `${HOST}/api/wx/worker${urlWithParams}`
 
   const authToken = Taro.getStorageSync('token')