Merge branch 'master' of http://git.ycjcjy.com/shigongli/client-s into master

config/index.js

@@ -45,7 +45,7 @@ const config = {
     }
   },
   h5: {
-    publicPath: '/',
+    publicPath: './',
     staticDirectory: 'static',
     postcss: {
       autoprefixer: {

src/app.js

@@ -10,7 +10,7 @@ import './app.scss'
 const store = configStore()
 
 const App = (props)=> {
-  const {user, getUser} = useUser()
+  const {user, getUser} = useUser(store)
   const code = getCode()
 
   useEffect(() => {
@@ -21,11 +21,11 @@ const App = (props)=> {
       } else {
         // 请求 user
         getUser(code)
+        setCode(code)
       }
     }
 
-    return () => setCode(code)
-
+    // return () => setCode(code)
   }, [])
 
   // 在 App 类中的 render() 函数没有实际作用

src/layout/IsLogin.jsx

@@ -1,18 +1,13 @@
-import React from "react";
+import React, { useState, useEffect } from "react";
 import { View, ScrollView } from "@tarojs/components";
 import "./index.scss";
 import useUser from "../store/user";
 
 const IsLogin = ({ children }) => {
   const { user } = useUser();
-  console.log(user, "user");
 
-  return user 
-  ? user.personId
-    ? children
-    :<View style={{textAlign:'center'}}>您没有登录权限</View>
-  : <View style={{textAlign:'center'}}>登录中...</View>
-  ;
+  return user && user.userId ? children :
+    (<View className="no-rights">您暂无权限访问当前页面</View>)
 };
 
 export default IsLogin;

src/layout/index.scss

@@ -2,4 +2,11 @@
     
     height: calc(100vh - 173.33px)
     
-}
+}
+
+.no-rights {
+    text-align: center;
+    margin-top: 200px;
+    font-size: 0.7em;
+    color: #888;
+}

src/reducers/index.js

@@ -1,10 +1,6 @@
 import { combineReducers } from 'redux'
-// import user from './user'
-// import page from './page'
-// import guide from './guide'
+import user from './user'
 
 export default combineReducers({
-  // user,
-  // page,
-  // guide,
+  user,
 })

src/reducers/user.js

@@ -1,28 +1,14 @@
-import {
-  ADD,
-  MINUS
-} from '../constants/user'
 
-// landlord: 'landlord',
-//     customer:'customer'
-// adminuser
-const INITIAL_STATE = {
-  user:'22'
-}
+const INITIAL_STATE = {}
 
-export default function counter(state = INITIAL_STATE, action) {
+export default function user(state = INITIAL_STATE, action) {
   switch (action.type) {
-    case ADD:
+    case 'setUser':
       return {
         ...state,
-        num: state.num + 1
+        ...action.payload || {}
       }
-      case MINUS:
-        return {
-          ...state,
-          num: state.num - 1
-        }
-        default:
-          return state
+      default:
+        return state
   }
 }

src/store/user.js

@@ -1,20 +1,35 @@
-import { useState } from "react";
 import Taro from '@tarojs/taro'
+import { useSelector, useDispatch } from "react-redux"
 
 import request from '../util/request'
 
-export default function useUser() {
-    const [user, setUser] = useState()
+export default function useUser(store) {
+  let user = undefined
+  try {
+    user = useSelector(s => s.user)
+  } catch (e) {
+    user = store ? store.getState().user : undefined
+  }
+
+  let dispatch = undefined
+  try {
+    dispatch = useDispatch()
+  } catch (e) {
+    dispatch = store ? store.dispatch : undefined
+  }
 
     const getUser = code => {
         request({url:`/login?code=${code}`,method:"POST"}).then((res)=>{
-          console.log(res.data.data,'res')
-          setUser(res.data.data)
+          
+          const usr = res.data.data
+          dispatch({type: 'setUser', payload: usr})
 
-          Taro.setStorage({
-            key:"token",
-            data:res.data.data.token
-          })
+          if (usr.token) {
+            Taro.setStorage({
+              key: "token",
+              data: usr.token
+            })
+          }
         })
     }
 

src/util/getCodeUrl.js

@@ -4,14 +4,7 @@ const appid = APPID
 
 export default function(path) {
 
-    console.log(window.location,'window.location')
-  const  redirect_uri = `${window.location.origin}/${window.location.hash}`
-
-
-//   window.location.origin = `${window.location.protocol}//${Taro.Current.router.path
-//       window.location.hostname
-//     }${window.location.port ? ':' + window.location.port : ''}`;
-    console.log(APPID,redirect_uri,'333')
+    const  redirect_uri = `${window.location.origin}${window.location.pathname}${window.location.hash}`
 
     const url=`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${encodeURIComponent(redirect_uri)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
     return url