home

src/app.js

@@ -14,7 +14,6 @@ class App extends Component {
 
     const { logins, setUserLocation } = store.getModel('userData').getState()
 
-    // const { sserLocation, setUserLocation } = useModel('userData')
 
     // 登录获取人员信息
 

src/layouts/index.jsx

@@ -2,7 +2,7 @@
 
 import useRouter from '@/utils/hooks/useRouter'
 import Taro from '@tarojs/taro'
-import { useEffect } from 'react'
+import { useEffect, useMemo } from 'react'
 import { useModel } from '@/store'
 
 
@@ -11,12 +11,11 @@ import useLogin from '@/utils/hooks/useLogin'
 
 
 export default (Child) => (props) => {
-  const { person } = useModel('person')
+  const { person } = useModel('userData')
   const router = useRouter()
 
-  const location = Taro.getStorageSync('location')
+  const { path } = router
 
-  const { hasPhone } = useLogin()
 
 
   // Taro.useReady(()=>{
@@ -29,5 +28,36 @@ export default (Child) => (props) => {
   // 确保执行过 login 方法，拿到了 person
   const isLoged = useMemo(() => !!person?.personId, [person?.personId])
 
-  return isLoged ? <Child {...props} router={router} location={location} /> : <></>
-}
+  return isLoged ? <Child {...props} router={router} /> : <></>
+}
+
+
+
+
+
+// export default (Child) => (props) => {
+//   const { person } = useModel('userData')
+//   const router = useRouter()
+
+//   const { path } = router
+
+//   useEffect(() => {
+//     if (!person?.phone) {
+//       if (path != '/pages/index/index' && path !== '/pages/UserLogin/index') {
+//         Taro.navigateTo({ url: `/pages/UserLogin/index?id${1}` })
+//       }
+//     }
+//     console.log("🚀 ~ file: index.jsx ~ line 11 ~ person", person, path)
+
+//     // if (path != '/pages/index/index' && !person?.phone) {
+//     //   Taro.navigateTo({ url: `/pages/userInfo/index?id${1}` })
+//     // }
+//   }, [path, person?.phone])
+
+
+
+
+
+//   return <Child {...props} router={router} />
+
+// }

src/pages/index/index.jsx

@@ -24,7 +24,13 @@ export default withLayout((props) => {
   const [isDidShow, setIsDidShow] = useState(0)
 
   useDidShow(() => {
-    setIsDidShow(isDidShow + 1)
+    if (!person?.phone) {
+      Taro.navigateTo({ url: `/pages/UserLogin/index` })
+    } else {
+
+      setIsDidShow(isDidShow + 1)
+
+    }
   })
 
   useEffect(() => {
@@ -35,14 +41,12 @@ export default withLayout((props) => {
 
 
   const handleTabChange = (e) => {
-    if (!person?.phone) {
-      Taro.navigateTo({ url: `/pages/UserLogin/index?id${1}` })
+    if (!person?.phone || tab !== 0) {
+      Taro.navigateTo({ url: `/pages/UserLogin/index` })
 
     } else {
-      if (person?.phone) {
-        const { index } = e.detail
-        setCurrentTab(index)
-      }
+      const { index } = e.detail
+      setCurrentTab(index)
 
     }
 

src/pages/index/tabs/Mine.jsx

@@ -10,6 +10,8 @@ import helpCenter from '@/assets/mineImgaes/helpCenter.png'//帮助中心
 import versionUpdate from '@/assets/mineImgaes/versionUpdate.png'//版本更新
 import userMoren from '@/assets/mineImgaes/userMoren.png'//默认头像
 import userRight from '@/assets/mineImgaes/userRight.png'
+import back from '@/assets/mineImgaes/mineBack.png'
+
 import { useModel } from "@/store"
 import withLayout from '@/layouts'
 import { getAddress } from "@/services/address"
@@ -33,14 +35,6 @@ export default withLayout((props) => {
   const $instance = Taro.getCurrentInstance()
 
 
-  const userInfo = useMemo(() => {
-    console.log($instance.router.params, '$instance.router.params路由')
-    if ($instance.router.params.userOk || person.phone) {
-      setIsLoginBox(true)
-      return { phone: person?.phone, nickName: person?.nickName, avatar: person?.avatar }
-    }
-
-  }, [$instance.router.params, person])
 
 
 
@@ -49,15 +43,23 @@ export default withLayout((props) => {
       let abccList = e.records.sort((a, b) => b.isDefault - a.isDefault)
       setAddresInfo(abccList[0].address)
     })
+    if ($instance.router.params.userOk || person.phone) {
+      setIsLoginBox(true)
+
+    }
   })
   useEffect(() => {
 
     getAddress().then((e) => {
       let abccList = e.records.sort((a, b) => b.isDefault - a.isDefault)
       console.log("🚀 ~ file: index.jsx ~ line 75 ~ getAddress ~ abccList", abccList)
-      setAddresInfo(abccList[0].address)
+      setAddresInfo(abccList[0]?.address)
     })
-  }, [])
+    if ($instance.router.params.userOk || person.phone) {
+      setIsLoginBox(true)
+
+    }
+  }, [$instance.router.params.userOk, person?.avatar, person?.nickName, person.phone])
 
   const setAddress = (dd) => {
     Taro.navigateTo({ url: `/pages/MyAddressList/index?id${dd}` })
@@ -105,18 +107,22 @@ export default withLayout((props) => {
         {/* 头像 */}
         {
           !isLoginBox ?
-            <View style={{ backgroundImage: "url(" + require("@/assets/mineImgaes/mineBack.png") + ")" }} className='User-Avatar-background-falseBox'>
+            <View className='User-Avatar-background-falseBox'>
+              <Image className='Userback' src={back} />
+
               <Image className='User-Avatar-background-falseBox-userImg userImg' src={userMoren} />
               <View onClick={userLoginnow} className='User-Avatar-background-falseBox-userLogin' >点击登陆</View>
             </View>
             :
             <>
-              <View style={{ backgroundImage: "url(" + require("@/assets/mineImgaes/mineBack.png") + ")" }} className='User-Avatar-background-trueBox'>
+              <View className='User-Avatar-background-trueBox'>
+                <Image className='Userback' src={back} />
+
                 <View className='setPassword' onClick={goUserInfo}>修改个人信息</View>
-                <Image className='User-Avatar-background-trueBox-userImg' src={userInfo?.avatar || userMoren} />
+                <Image className='User-Avatar-background-trueBox-userImg' src={person?.avatar || userMoren} />
                 <View className='User-Avatar-background-trueBox-name'>
-                  <View >{userInfo?.nickName || '请填写姓名'}</View>
-                  <View >{userInfo?.phone}</View>
+                  <View >{person?.nickName || '请填写姓名'}</View>
+                  <View >{person?.phone}</View>
                 </View>
               </View>
 

src/pages/index/tabs/MineCss/style.less

@@ -1,6 +1,6 @@
 .User-Avatar-background-falseBox {
   width: 95vw;
-  height: 30vh;
+  height: 404px;
   background-size: 100% 100%;
   background-repeat: no-repeat;
   border-radius: 40px;
@@ -9,6 +9,11 @@
   margin: 0 auto;
   display: flex;
   margin-bottom: 30px;
+  .Userback {
+    width: 95vw;
+    height: 404px;
+    position: absolute;
+  }
   &-userImg {
     position: relative;
     top: 8vh;
@@ -36,12 +41,17 @@
   background-size: 100% 100%;
   background-repeat: no-repeat;
   width: 95vw;
-  height: 30vh;
+  height: 404px;
   border-radius: 40px;
   box-shadow: 0px 10px 24px 0px rgba(0, 0, 0, 0.1);
   margin-top: 1em;
   margin: 0 auto 30px auto;
   display: flex;
+  .Userback {
+    width: 95vw;
+    height: 404px;
+    position: absolute;
+  }
   &-userImg {
     position: relative;
     top: 8vh;

src/utils/hooks/useLogin.js

@@ -3,13 +3,13 @@ import { useModel } from '@/store'
 import { useEffect, useMemo } from "react";
 
 const whiteList = [
-  "/pages/login/index",
+  "/pages/UserLogin/index",
   "/pages/index/index"
 ]
 
 export default () => {
   const router = useRouter()
-  const { person } = useModel('person')
+  const { person } = useModel('userData')
 
   const isInWhiteList = useMemo(() => whiteList.includes(router.path), [router.path])
   const hasPhone = useMemo(() => !!person?.phone, [person?.phone])
@@ -17,7 +17,7 @@ export default () => {
 
   useEffect(() => {
     if (!isInWhiteList && !hasPhone) {
-      Taro.navigateTo({ url: "/pages/login/index" });
+      Taro.navigateTo({ url: "/pages/UserLogin/index" });
     }
   }, [hasPhone, isInWhiteList])