.

src/components/LoginModel/index.jsx

@@ -4,7 +4,7 @@ import { useModel } from '@/store'
 import { View, Image, Input, Text, Button } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import MyButton from "@/components/MyButton"
-import {updatePhone, setQcode } from '@/services/login'
+import { updatePhone, setQcode } from '@/services/login'
 import bgi from '@/assets/login/loginImg.png'
 import vCode from '@/assets/login/VerificationCode.png'
 import checkedImg from '@/assets/login/checkedImg.png'
@@ -12,21 +12,21 @@ import unChecked from '@/assets/login/unChecked.png'
 import './style.less'
 
 export default (props) => {
-  const {tab}=props
-  const { person,setPerson } = useModel('person')
-  const [agreement,setAgreement]=useState(false)
-  const [phone,setPhone]=useState()
-  const [qCode,setqCode]=useState()
-  const [qCodeBtn,setqCodeBtn]=useState('获取验证码')
-  const [dsb,setDsb]=useState(false)
-  const handlePhone=(e)=>{
+  const { tab } = props
+  const { person, setPerson } = useModel('person')
+  const [agreement, setAgreement] = useState(false)
+  const [phone, setPhone] = useState()
+  const [qCode, setqCode] = useState()
+  const [qCodeBtn, setqCodeBtn] = useState('获取验证码')
+  const [dsb, setDsb] = useState(false)
+  const handlePhone = (e) => {
     if (e.detail.value) {
       setPhone(e.detail.value)
     }
   }
-  const changeqCode=()=>{
+  const changeqCode = () => {
     if (rulePhone(phone)) {
-      setQcode({phone:phone}).then((res)=>{
+      setQcode({ phone: phone }).then((res) => {
         Taro.showToast({
           title: '发送成功，请注意查收',
           icon: 'none',
@@ -39,7 +39,7 @@ export default (props) => {
         })
       })
 
-      let time=60
+      let time = 60
       setDsb(true)
       // 调接口
       let timer = setInterval(() => {
@@ -48,14 +48,14 @@ export default (props) => {
         if (time === 0) {
           setDsb(false)
           setqCodeBtn('重新发送')
-          time=60
+          time = 60
           clearInterval(timer)
         }
       }, 1000)
 
     }
   }
-  const rulePhone=(val)=>{
+  const rulePhone = (val) => {
     if (!/^1[0-9]{10}$/.test(val)) {
       Taro.showToast({
         title: '请输入正确的11位手机号',
@@ -65,13 +65,13 @@ export default (props) => {
       return false
     } else return true
   }
-  const handleqCode=(e)=>{
+  const handleqCode = (e) => {
     if (e.detail.value) {
       setqCode(e.detail.value)
     }
   }
-  const onLogin = () => { 
-    if (rulePhone(phone)&&qCode) {
+  const onLogin = () => {
+    if (rulePhone(phone) && qCode) {
       if (!agreement) {
         Taro.showToast({
           title: '请确认下方协议',
@@ -81,7 +81,7 @@ export default (props) => {
         return false
       }
       // 登录
-      updatePhone(person.personId,{phone:phone,captcha:qCode}).then((res)=>{
+      updatePhone(person.personId, { phone: phone, captcha: qCode }).then((res) => {
         setPerson(res.person)
         Taro.showToast({
           title: '登录成功',
@@ -89,9 +89,9 @@ export default (props) => {
           duration: 1000
         })
         if (tab) {
-          setTimeout(()=>{
+          setTimeout(() => {
             Taro.redirectTo({ url: `/pages/index/index?tab=${tab}` });
-          },1000)
+          }, 1000)
         }
       }).catch((e) => {
         Taro.showToast({
@@ -108,7 +108,7 @@ export default (props) => {
     }
   }
   return (
-    <View className='page-index' style={{position:'absolute', zIndex:9999}}>
+    <View className='page-index' style={{ position: 'absolute', zIndex: 9999 }}>
       <View className='index-navbar'>
         <CustomNav home title='登录' />
       </View>
@@ -119,7 +119,7 @@ export default (props) => {
         <View className='loginCell'>
           <View className='loginHeader'>+86</View>
           <Input type='number' maxlength='11' placeholder='请输入手机号' value={phone} onInput={handlePhone} />
-          <Button  className={['loginAction',dsb?'qCodeActive':'']} disabled={dsb} onClick={dsb?'':changeqCode}>{qCodeBtn}</Button>
+          <Button className={['loginAction', dsb ? 'qCodeActive' : '']} disabled={dsb} onClick={dsb ? '' : changeqCode}>{qCodeBtn}</Button>
         </View>
         <View className='loginCell'>
           <View className='loginHeader'>
@@ -129,9 +129,15 @@ export default (props) => {
         </View>
         <View className='footer'>
           <MyButton value='登录' onClick={onLogin} />
-          <View className='agreement' onClick={()=>setAgreement(!agreement)}>
-              <Image src={agreement?checkedImg:unChecked} className='footerCheckbox' />
-              请认真查看<Text>文本协议/隐私政策</Text>，确认之后选择此项！
+          <View className='agreement' onClick={() => setAgreement(!agreement)}>
+            <Image src={agreement ? checkedImg : unChecked} className='footerCheckbox' />
+            请认真查看<Text
+              onClick={
+                (e) => {
+                  e.stopPropagation();
+                  Taro.navigateTo({ url: '/pages/versionUpdate/index' });
+                }}
+            >文本协议/隐私政策</Text>，确认之后选择此项！
           </View>
         </View>
       </View>

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

@@ -46,7 +46,7 @@ export default (props) => {
   }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
-      <View className='personTip'>该账号归{person.nickName || '张三'}所属</View>
+      <View className='personTip'>该账号归{person.nickName}pc用户名所属</View>
       <View className='userHead' onClick={handleAccount}>
         <Image src={userBgi} className='userBgi' />
         <View className='headcontent' >
@@ -88,7 +88,7 @@ export default (props) => {
           <MyCell icon={aboutUs} action={goto} user handleAction={handleAboutUs}>关于我们</MyCell>
         </View>
         <View className='userBox'>
-          <MyCell icon={update} action={goto} user handleAction={handleUpdate}>版本更新</MyCell>
+          <MyCell icon={update} action={goto} user handleAction={handleUpdate}>用户协议及隐私政策</MyCell>
         </View>
         <View className='userBox'>
           <MyCell icon={feedback} action={goto} user handleAction={handleFeedback}>意见反馈</MyCell>

src/pages/index/components/User/style.less

@@ -1,7 +1,6 @@
 .personTip{
   font-size: 24px;
   color: #FFFFFF;
-  width: 247px;
   height: 54px;
   background: #000000;
   opacity: 0.3;

src/pages/userInfo/index.jsx

@@ -87,6 +87,12 @@ export default withLayout((props) => {
           <Image src={avatar} className='avatarImg' />
           <View className='change'>更换头像</View>
         </View>
+        <View className='userCell'>
+          <View>用户名：</View>
+          <View style={{ display: 'flex', opacity: 0.5, alignItems: 'center', height: '54px' }}>
+            <Input type='text' value='pc端用户名' disabled className='userName' />
+          </View>
+        </View>
         <View className='userCell'>
           <View>姓名：</View>
           <View style={{ display: 'flex', alignItems: 'center', height: '54px' }}>

src/pages/userInfo/style.less

@@ -21,6 +21,15 @@
       right: 0;
     }
   }
+  .userPcName{
+    box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.12);
+    font-size: 34px;
+    font-weight: bold;
+    color: #333333;
+    height: 108px;
+    line-height: 108px;
+    margin-top: 80px;
+  }
   .userCell{
     background: #FFF;
     box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.12);

src/pages/versionUpdate/index.jsx

@@ -8,7 +8,7 @@ export default withLayout((props) => {
   return (
     <View className='page-index'>
       <View className='index-navbar'>
-        <CustomNav title='关于我们' />
+        <CustomNav title='用户协议' />
       </View>
       <View className='index-container version'>
         <ScrollView scrollY style={{ height: '100%' }}>

src/utils/hooks/useLogin.js

@@ -1,28 +1,31 @@
 import Taro, { useRouter } from "@tarojs/taro";
-import { useModel } from '@/store'
+import { useModel } from "@/store";
 import { useMemo, useState, useEffect } from "react";
 
 const whiteList = [
   "/pages/index/index",
-  "/pages/Login/index"
-]
+  "/pages/Login/index",
+  "/pages/versionUpdate/index",
+];
 
 export default () => {
-  const router = useRouter()
-  const { person } = useModel('person')
-  const [loginVisible, setLoginVisible] = useState(false)
+  const router = useRouter();
+  const { person } = useModel("person");
+  const [loginVisible, setLoginVisible] = useState(false);
+
+  const isInWhiteList = useMemo(
+    () => whiteList.includes(router.path),
+    [router.path]
+  );
+  const hasPhone = useMemo(() => !!person?.phone, [person?.phone]);
 
-  const isInWhiteList = useMemo(() => whiteList.includes(router.path), [router.path])
-  const hasPhone = useMemo(() => !!person?.phone, [person?.phone])
-  
   useEffect(() => {
     if (!isInWhiteList && !hasPhone) {
-      setLoginVisible(true)
+      setLoginVisible(true);
     } else {
-      setLoginVisible(false)
+      setLoginVisible(false);
     }
-  }, [hasPhone, isInWhiteList])
-
+  }, [hasPhone, isInWhiteList]);
 
-  return { loginVisible }
-};
+  return { loginVisible };
+};