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

src/app.js

 const store = configStore()
 
 class App extends Component {
-  componentDidMount() {
-console.log(this.props,'this.props')
-   
-  }
+  componentDidMount() {}
 
   onLaunch () {
     wx.login({

src/pages/index/index.jsx

   const { houseId ,orderId} = router.params
   const user = useSelector(state => state.user)
 
+  console.log(user)
+
   const dispatch = useDispatch()
 
-  const [userRole, setUserRole] = useState('1')
-  const [pageState, SetPageState] = useState('1')
-  const [list, setList] = useState([])
+  // const [userRole, setUserRole] = useState('1')
+  // const [pageState, SetPageState] = useState('1')
+  // const [list, setList] = useState([])
   const [visible, setVisible] = useState(false)
 
   useEffect(() => {
-    console.log(user,houseId, 'indexuser')
     if (user.personId && !user.phone) {
       setVisible(true)
     }
     if (user.personId && user.phone) {
       setVisible(false)
     }
-  }, [user.phone])
+  }, [user.phone, user.personId])
 
 
   const onOk = (res) => {
   const onCancel = (e) => {
     setVisible(false)
   }
-  console.log(user.role == roleList.landlord, 'indexuser')
 
   return <View className='index'>
 
     {user.personId && <View>
-      {visible && <GetPhone visible={true} onOk={onOk} onCancel={onCancel} ></GetPhone>}
-      {!visible && user.role == roleList.customer && <Customer houseId={houseId} orderId={orderId}></Customer>}
-      {!visible && user.role == roleList.landlord && <Landlord ></Landlord>}
+      <GetPhone visible={visible} onOk={onOk} onCancel={onCancel} ></GetPhone>
+      {user.role == roleList.customer && <Customer houseId={houseId} orderId={orderId}></Customer>}
+      {user.role == roleList.landlord && <Landlord ></Landlord>}
     </View>}
 
 

src/reducers/user.js

 
 // 异步的action
 export function asyncLogina() {
-  console.log('asyncLogin22')
   return dispatch => {
     dispatch({
       type: 'LOGIN',
 }
 
 export default function user(state = INITIAL_STATE, action) {
-  console.log(state, 'state33')
   switch (action.type) {
     case 'LOGIN': {
 
-      if (action.user.shopKeeperList.length > 0) {
+      if (action.user.shopKeeperList && action.user.shopKeeperList.length) {
         return {
           ...state,
           ...action.user,
-          // role: 'landlord',
-          role: 'customer',
+          role: 'landlord',
+          // role: 'customer',
         }
       } else {
         return {
           ...state,
           ...action.user,
           role: 'customer',
-      
-          
-          
         }
       }
 

src/util/request.js

   }
   // user.user?.token||
   const token = Taro.getStorageSync('token')||''
-  console.log(token,'token')
+  // console.log(token,'token')
   return [{
       url: `${baseURL}${api}`,
       method,