fix

config/dev.js

@@ -5,7 +5,8 @@ module.exports = {
   },
   defineConstants: {
     HOST: '"http://localhost:7080"',
-    WSS_HOST: '"ws://localhost:7080"',
+    // HOST: '"https://sgl.ycjcjy.com"',
+    
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     // OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
   },

config/index.js

@@ -1,3 +1,5 @@
+const path = require('path')
+
 const config = {
   projectName: 'shigongliApp',
   date: '2020-12-12',
@@ -65,6 +67,14 @@ const config = {
         }
       }
     }
+  },
+  alias: {
+    '@/assets': path.resolve(__dirname, '..', 'src/assets'),
+    '@/compents': path.resolve(__dirname, '..', 'src/compents'),
+    '@/layout': path.resolve(__dirname, '..', 'src/layout'),
+    '@/store': path.resolve(__dirname, '..', 'src/store'),
+    '@/reducers': path.resolve(__dirname, '..', 'src/reducers'),
+    '@/util': path.resolve(__dirname, '..', 'src/util'),
   }
 }
 

src/actions/user.js

@@ -1,24 +1,20 @@
 import {
-  ADD,
-  MINUS
+  LOGIN,
 } from '../constants/user'
 
-export const add = () => {
+export const login = () => {
+  console.log('login')
   return {
-    type: ADD
-  }
-}
-export const minus = () => {
-  return {
-    type: MINUS
+    type: LOGIN
   }
 }
 
 // 异步的action
-export function asyncAdd () {
+export function asyncLogin () {
+  console.log('asyncLogin')
   return dispatch => {
-    setTimeout(() => {
-      dispatch(add())
-    }, 2000)
+    console.log('asyncLogin')
+      dispatch(login())
+    
   }
 }

src/app.js

@@ -1,33 +1,65 @@
-
 import 'taro-ui/dist/style/index.scss'
-import React, { Component } from 'react'
-import { Provider } from 'react-redux'
+import React, {
+  Component
+} from 'react'
+import Taro from '@tarojs/taro'
+import {
+  Provider,connect
+} from 'react-redux'
 
 import configStore from './store'
+import {asyncLogin} from './reducers/user'
 
 import './app.scss'
+import request from './util/request'
 
 const store = configStore()
 
 class App extends Component {
-  componentDidMount () {}
+  componentDidMount() {
+console.log(this.props,'this.props')
+   
+  }
+
+  onLaunch () {
+    wx.login({
+      success (res) {
+        if (res.code) {
+          //发起网络请求
+          // console.log(res.code,store.getState(),'code')
+          // asyncLogin().dispatch()
+          // store.dispatch(asyncLogin())
+          // asyncLogin()
+          request({url:`/login?code=${res.code}`,method:"post"}).then((res)=>{
+            console.log(res.data.data.token,'res.data.data.token')
+            store.dispatch({type:'LOGIN',user:res.data.data})
+            Taro.setStorage({
+              key:"token",
+              data:res.data.data.token
+            })
+          })
+        } else {
+          console.log('登录失败！' + res.errMsg)
+        }
+      }
+    })
+  }
+
+  componentDidShow() {}
 
-  componentDidShow () {}
+  componentDidHide() {}
 
-  componentDidHide () {}
+  componentDidCatchError() {}
 
-  componentDidCatchError () {}
 
   // 在 App 类中的 render() 函数没有实际作用
   // 请勿修改此函数
-  render () {
-    return (
-      <Provider store={store}>
-        {this.props.children}
-      </Provider>
+  render() {
+    return ( <Provider store = {store} > 
+        {this.props.children} 
+    </Provider>
     )
   }
 }
 
 export default App
-

src/constants/user.js

@@ -1,2 +1,2 @@
-export const ADD = 'ADD'
+export const LOGIN = 'LOGIN'
 export const MINUS = 'MINUS'

src/pages/index/index.jsx

@@ -13,7 +13,6 @@ import './index.scss'
 import request from '../../util/request'
 const index = (props) => {
 
-  const page = useSelector(state => state.page)
 
   const user = useSelector(state => state.user)
 
@@ -21,8 +20,6 @@ const index = (props) => {
   const [pageState, SetPageState] = useState('1')
   const [list, setList] = useState([])
   useEffect(() => {
-
-    console.log(page,'page')
     setList([
       {
         name: 'zhou',
@@ -40,15 +37,7 @@ const index = (props) => {
 
     // fetch({ url: API_CARDS_LIST, payload })
 
-    request({
-      url:'/api/taHouseSurround',
-      method: 'get',
-      // params:{
-      //   id:3,
-
-      //   b:3
-      // }
-    })
+  
 
 
   }, [])
@@ -74,7 +63,6 @@ const index = (props) => {
 
       {user.role==roleList.customer&&<Customer></Customer>  }
       {user.role==roleList.landlord&&<Landlord></Landlord>  }
-      {user.role==roleList.adminuser&&<AdminUser></AdminUser>  }
         {/* {userRole == 1 ? <Register userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></Register> :
           <View>userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}
             {(userRole == 'guide' || userRole == 2) && <Guide userRole={userRole}/>}

src/pages/landlord/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useState } from 'react'
-import Taro, {  } from "@tarojs/taro";
+import Taro, { useDidShow } from "@tarojs/taro";
 import { useSelector } from 'react-redux'
 import { View, ScrollView, Button } from '@tarojs/components'
 import Layout from '../../layout/index'
@@ -9,11 +9,11 @@ import Guide from '../guide/index'
 import Recommend from '../recommend/index'
 import HouseLIst from '../house/list/index'
 import { AtFloatLayout } from "taro-ui"
+import request from '@/util/request'
 import './index.scss'
 
 const index = (props) => {
 
-  const page = useSelector(state => state.page)
 
   const user = useSelector(state => state.user)
   const [isOpened, setIsOpened] = useState(false)
@@ -22,10 +22,11 @@ const index = (props) => {
   const [list, setList] = useState([])
   const [radioHouseData, setRadioHouseData] = useState()
   const [radioHouseState, setRadioHouseState] = useState(false)
- 
+  console.log(user,'99999999')
   useEffect(() => {
 
-    console.log(page, 'page')
+   
+
     setList([
       {
         name: 'zhou',
@@ -40,8 +41,21 @@ const index = (props) => {
         phone: '177'
       }
     ])
+
+    getHouseList()
   }, [])
 
+  // useDidShow(()=>{
+  //   getHouseList()
+  // })
+
+  const getHouseList=()=>{
+    request({
+      url:'/taHouse',
+      method: 'get',
+    })
+  }
+
 
 
   const handleClose = () => {

src/reducers/guide.js

@@ -1,4 +1,4 @@
-import { ADD, MINUS } from '../constants/user'
+import { LOGIN, MINUS } from '../constants/user'
 
 // landlord: 'landlord',
 //     customer:'customer'
@@ -15,7 +15,7 @@ const INITIAL_STATE = {
 
 export default function counter (state = INITIAL_STATE, action) {
   switch (action.type) {
-    case ADD:
+    case LOGIN:
       return {
         ...state,
         num: state.num + 1

src/reducers/index.js

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

src/reducers/page.js

@@ -1,4 +1,4 @@
-import { ADD, MINUS } from '../constants/user'
+import { LOGIN, MINUS } from '../constants/user'
 
 // landlord: 'landlord',
 //     customer:'customer'
@@ -11,7 +11,7 @@ const INITIAL_STATE = {
 
 export default function counter (state = INITIAL_STATE, action) {
   switch (action.type) {
-    case ADD:
+    case LOGIN:
       return {
         ...state,
         num: state.num + 1

src/reducers/user.js

@@ -1,5 +1,5 @@
 import {
-  ADD,
+  LOGIN,
   MINUS
 } from '../constants/user'
 
@@ -8,23 +8,41 @@ import {
 // adminuser
 const INITIAL_STATE = {
   // role: 'adminuser',
-  // role: 'landlord',
-  role: 'customer'
+  // role:''
+  // role: 'customer'
 }
 
-export default function counter(state = INITIAL_STATE, action) {
+export const login = () => {
+  return {
+    type: LOGIN
+  }
+}
+
+// 异步的action
+export function asyncLogina() {
+  console.log('asyncLogin22')
+  return dispatch => {
+    dispatch({
+      type: 'LOGIN',
+      data: '333'
+    })
+
+  }
+}
+
+export default function user(state = INITIAL_STATE, action) {
+  console.log(state, 'state33')
   switch (action.type) {
-    case ADD:
+    case 'LOGIN': {
+      console.log(state,action, 'state')
       return {
         ...state,
-        num: state.num + 1
+        ...action.user,
+        role: 'landlord',
       }
-      case MINUS:
-        return {
-          ...state,
-          num: state.num - 1
-        }
-        default:
-          return state
+    }
+
+    default:
+      return state
   }
 }

src/util/request.js

@@ -4,11 +4,16 @@ const baseURL = HOST
 
 export default async (options) => {
   const opts = optionBuilder(options)
-  console.log(opts, "optsoptsoptsoptsoptsoptsoptsoptsoptsopts")
 
   return Taro.request(opts[0])
-    .then((res) =>{console.log('3322'); reqSuccess(res, opts)})
-    .catch((err) =>{console.log('333221'); reqFail(err, opts)})
+    .then((res) => {
+      // console.log('3322');
+      return res
+    })
+    .catch((err) => {
+      // console.log('333221');
+      return err
+    })
 }
 
 
@@ -19,19 +24,25 @@ export function optionBuilder(options) {
     method = 'GET',
     showToast = true,
     autoLogin = true,
+    params = {},
     header
   } = options
-//   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
-//   const consultant = Taro.getStorageSync('consultantId') || ''
-//   const recommender = Taro.getStorageSync('recommender') || ''
-
+  //   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
+  //   const consultant = Taro.getStorageSync('consultantId') || ''
+  //   const recommender = Taro.getStorageSync('recommender') || ''
+  let api = `/api/ma${url}`
+  if (method == 'GET' && JSON.stringify(params) != "{}") {
+    api = `${api}?${paramsToString(params)}`
+  }
+  const token = Taro.getStorageSync('token')||''
+  console.log(token,'token')
   return [{
-      url:`${baseURL}${url}`,
+      url: `${baseURL}${api}`,
       method,
       data,
       header: {
         'content-type': 'application/json',
-        // 'authorization': `Bearer ${Taro.getStorageSync('token')}`,
+        'authorization': `X-Authorization-JWT ${token}`,
         // 'appId': appId,
         // 'x-action': 'miniapp',
         // 'x-version': Version,

src/util/userRole.js

@@ -1,5 +1,5 @@
 export default {
     landlord: 'landlord',
     customer:'customer',
-    adminuser:'adminuser'
+    // adminuser:'adminuser'
 }