.

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

@@ -1,4 +1,5 @@
 import { useState,useEffect } from "react"
+import { useModel } from '@/store'
 import Taro from "@tarojs/taro"
 import { View, Image, ScrollView } from "@tarojs/components"
 import userBgi from '@/assets/user/userBgi.png'
@@ -16,7 +17,8 @@ import banner1 from '@/assets/banner/1.jpg'
 import './style.less'
 
 export default (props) => {
-  const { isLogin } = props
+  const { phone,setPhone } = useModel('phone')
+
   const handleAccount = () => { 
     Taro.navigateTo({ url: '/pages/userInfo/index' });
    }
@@ -42,28 +44,29 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/bankCard/index' });
    }
   const signOut = () => { 
+    setPhone()
     Taro.reLaunch({ url: '/pages/index/index?tab=2' });
   }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
       {
-        isLogin &&
+        phone &&
         <View className='personTip'>该账号归张三所属</View>
       }
       <View className='userHead'>
         <Image src={userBgi} className='userBgi' />
-        <View className='headcontent' onClick={handleLogin}>
-          <Image src={isLogin ? banner1 : avatar} className='avatar' />
+        <View className='headcontent' onClick={phone?'':handleLogin}>
+          <Image src={phone ? banner1 : avatar} className='avatar' />
           {
-            isLogin ? <View>
+            phone ? <View>
               <View>张三</View>
-              <View>13612345678</View>
+              <View>{phone}</View>
             </View> : <View>点击登录</View>
           }
         </View>
       </View>
       {
-        isLogin &&
+        phone &&
         <View className='userCard'>
           <View
             className='cardItem'
@@ -103,7 +106,7 @@ export default (props) => {
           <MyCell icon={feedback} action={goto} user handleAction={handleFeedback}>意见反馈</MyCell>
         </View>
         {
-          isLogin && <View className='signOut' onClick={signOut}>退出登录</View>
+          phone && <View className='signOut' onClick={signOut}>退出登录</View>
         }
       </View>
 

src/pages/login/index.jsx

@@ -14,8 +14,8 @@ import './style.less'
 
 export default (props) => {
   const { person } = useModel('person')
+  const { setPhone:setphone } = useModel('phone')
 
-  console.log(person)
   const [agreement,setAgreement]=useState(false)
   const [phone,setPhone]=useState()
   const [qCode,setqCode]=useState()
@@ -28,9 +28,20 @@ export default (props) => {
   }
   const changeqCode=()=>{
     if (rulePhone(phone)) {
-      setQcode({phone:phone})
+      setQcode({phone:phone}).then((res)=>{
+        Taro.showToast({
+          title: '发送成功，请注意查收',
+          icon: 'none',
+          duration: 2000
+        })
+      }).catch(() => {
+        Taro.showToast({
+          title: '网络异常, 请刷新小程序重试',
+          icon: 'none',
+        })
+      })
 
-      let time=10
+      let time=60
       setDsb(true)
       // 调接口
       let timer = setInterval(() => {
@@ -72,13 +83,21 @@ export default (props) => {
         return false
       }
       // 登录
-      Taro.showToast({
-        title: '登录成功',
-        icon: 'none',
-        duration: 1000
+      updatePhone(person.personId,{phone:phone,captcha:qCode}).then((res)=>{
+        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: '网络异常, 请刷新小程序重试',
+          icon: 'none',
+        })
       })
-      Taro.reLaunch({ url: '/pages/index/index?tab=2&&isLogin=true' });
-
     } else {
       Taro.showToast({
         title: '请输入正确的手机号和验证码',

src/pages/login/style.less

@@ -39,7 +39,7 @@
       }
     }
     .loginAction{
-      width: 9em;
+      width: 10em;
       background: linear-gradient(0deg, #00AE39,#A0E067);
       border-radius: 20px;
       line-height: 68px;

src/store/models/person.js

@@ -8,10 +8,9 @@ export default () => {
 
   const login = (params) => {
     signIn(params).then((res) => {
-      const { person: taPerson,  sessionKey: skey,  token } = res;
+      const { person: taPerson,  sessionKey: skey } = res;
       setPerson(taPerson);
       setSessionKey(skey);
-      Taro.setStorage({ key: 'token', data: token })
     })
   }