fix

config/dev.js

@@ -4,10 +4,10 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"http://localhost:7080"',
+    // HOST: '"http://localhost:7080"',
     // HOST: '"https://sgl.ycjcjy.com"',
-    // HOST: '"http://192.168.31.68:7080"',
-    // HOST: '"http://192.168.211.181:7080"',
+    HOST: '"http://192.168.31.211:7080"',
+    // HOST: '"http://192.168.211.105:7080"',
  
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     // OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",

src/app.js

@@ -19,19 +19,28 @@ class App extends Component {
   componentDidMount() {}
 
   onLaunch () {
+  
+  }
+
+  componentDidShow() {
     wx.login({
       success (res) {
         if (res.code) {
           //发起网络请求
 
           request({url:`/login?code=${res.code}`,method:"post"}).then((res)=>{
+            console.log(res,'22222222222')
             try {
               Taro.setStorageSync('token', res.data.data.token)
               store.dispatch({type:'LOGIN',user:res.data.data})
             } catch (e) { }
             
             
+          }).catch(err=>{
+            console.log(err,'3333333333')
           })
+
+          
         } else {
           console.log('登录失败！' + res.errMsg)
         }
@@ -39,8 +48,6 @@ class App extends Component {
     })
   }
 
-  componentDidShow() {}
-
   componentDidHide() {}
 
   componentDidCatchError() {}

src/compents/tab/index.jsx

@@ -21,7 +21,7 @@ const tab = (props) => {
 
     const user = useSelector(state => state.user)
 
-    const { value, openType, pageState, formType, color, ...prop } = props
+    const { value, openType, pageState, formType, color, styleType='', ...prop } = props
 
     const [state, setState] = useState(1)
     console.log(props, openType, 'formType')
@@ -33,20 +33,34 @@ const tab = (props) => {
     //     color: #fed12f;
     // }${props.className}
     return <View className='tab'>
-        {value.length == 1 && 
+        {
+        value.length == 1 && 
         <>
-        {openType &&  <button openType="share" className={`tab,tab1,${props.className}`} style={{ backgroundColor: getColor(user.role), color }} onClick={() => props.onClick('2')}>{value[0]}</button>}
-        {!openType && <View className={`tab,tab1,${props.className}`} style={{ backgroundColor: getColor(user.role), color }} onClick={() => props.onClick('2')}>{value[0]}</View>}
+            {openType &&  <button openType="share" className={`tab,tab1,${props.className}`} style={{ backgroundColor: getColor(user.role), color }} onClick={() => props.onClick('2')}>{value[0]}</button>}
+            {!openType && <View className={`tab,tab1,${props.className}`} style={{ backgroundColor: getColor(user.role), color }} onClick={() => props.onClick('2')}>{value[0]}</View>}
         </>
         }
-        {value.length == 2 && <View className={`tab,tab2,${props.className}`} style={{ display: 'flex', }}>
-            <View style={{ width: '50%' }} style={pageState == '2' ? { color: getColor(user.role), width: '50%' } : { width: '50%' }} onClick={props.onClick[0]}>{value[0]}</View>
-            {formType && <Button className='tab-btn' formType="submit" plain={true} style={pageState == '3' ? { color: getColor(user.role), width: '50%', border: 'none' } : { width: '50%', border: 'none' }}>{value[1]}</Button>}
-            {openType && <button className='tab-btn' openType="share" plain={true} style={pageState == '3' ? { color: getColor(user.role), width: '50%', border: 'none' } : { width: '50%', border: 'none' }}>{value[1]}</button>}
-            {!formType&&!openType &&
-                <View style={{ width: '50%' }} style={pageState == '3' ? { color: getColor(user.role), width: '50%' } : { width: '50%' }} onClick={props.onClick[1]}>{value[1]}</View>
-            }
-        </View>}
+        {
+            value.length == 2 && <View className={`tab,tab2,${props.className}`} style={{ display: 'flex', }}>
+            <View style={{ width: '50%' }} style={pageState == '2'&&styleType!='tab' ? { color: getColor(user.role), width: '50%' } : { color:pageState != '2'&&styleType=='tab'?getColor(user.role):undefined, width: '50%' }} onClick={props.onClick[0]}>{value[0]}</View>
+                {formType && 
+                <Button className='tab-btn' 
+                    formType="submit" 
+                    plain={true} 
+                    style={pageState == '3' &&styleType!='tab'? { color: getColor(user.role), width: '50%', border: 'none' } : { width: '50%', border: 'none' }}
+                >{value[1]}
+                </Button>}
+                {openType && 
+                <button className='tab-btn' 
+                    openType="share" plain={true} style={pageState == '3'&&styleType!='tab' ? { color: getColor(user.role), width: '50%', border: 'none' } : { width: '50%', border: 'none' }}>{value[1]}</button>}
+                {!formType&&!openType &&
+                    <View style={{ width: '50%' }} 
+                    style={pageState == '3'&&styleType!='tab' ? { color: getColor(user.role), width: '50%' } : { color:pageState != '3'&&styleType=='tab'?getColor(user.role):undefined, width: '50%' }} 
+                    onClick={props.onClick[1]}
+                >{value[1]}</View>
+                }
+            </View>
+        }
 
     </View>
 };

src/pages/house/addnewhouse/index.jsx

@@ -69,42 +69,36 @@ const index = (props) => {
             desc:imgUrl,
         }
         console.log(data,e.detail.value,'formSubmit')
-        request({ url: '/taHouse', method: 'post', data }).then((res) => {
+        request({ url: '/taHouse', method: 'post', data:{...data} }).then((res) => {
             if (res.data.code == 1000)
                 Taro.navigateBack({
                     delta: 1
                 })
         })
 
-        // {shopId,
-
-        //     "address": "string",
-
-        //     "lngLat": "string",
-        //     "parkLngLat": "string",
-        //     "parking": "string",
-
-        //     "surroundList": [
-        //       {
-        //         "createDate": "2020-12-29T15:38:53.177Z",
-        //         "houseId": "string",
-        //         "image": "string",
-        //         "imageId": "string",
-        //         "sortNo": 0,
-        //         "status": 0,
-        //         "surroundId": "string"
-        //       }
-        //     ],
-        //     "title": "string",
-        //     "wifiName": "string",
-        //     "wifiPassword": "string"
-        //   }
     }
 
     const formReset = () => {
         console.log('formReset')
     }
 
+    const onAdderssChange = (e) => {
+        console.log(e,'formReset')
+        setAddress({
+            ...address,
+            address:e.detail.value
+        })
+    }
+
+    const onParkingAdderssChange = (e) => {
+        console.log(e,'formReset')
+        setParking({
+            ...address,
+            parking:e.detail.value
+        })
+    }
+    
+
     return <View className='addnewhouse'>
 
         <Form onSubmit={formSubmit} onReset={formReset}>
@@ -144,7 +138,7 @@ const index = (props) => {
                 <View className='inputstyle-view'>
                     <Text className='title'>具体地址</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input name='address' value={address.address} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                        <Input name='address' value={address.address} onInput={onAdderssChange} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
                 <View className='inputstyle-view'>
@@ -155,7 +149,7 @@ const index = (props) => {
 
                         </Container>
                         <Container className='map-view-icon' onClick={() => onChooseLocation('parking')}>
-                            <Image className='icon' mode='widthFix' style={{ width: '100%' }} style={{ width: '40rpx' }} src={locationicon} />
+                            <Image className='icon' mode='widthFix'  style={{ width: '100%' }} style={{ width: '40rpx' }} src={locationicon} />
 
                         </Container>
                     </View>
@@ -163,7 +157,7 @@ const index = (props) => {
                 <View className='inputstyle-view'>
                     <Text className='title'>具体地址</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input name='parking' value={parking.address} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                        <Input name='parking' value={parking.address} onInput={onParkingAdderssChange} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
                 <View className='inputstyle-view'>

src/pages/house/index.jsx

@@ -79,7 +79,7 @@ const house = (props) => {
                 {pageState == '2' && <Guide houseId={houseId} dataSource={dataSource}></Guide>}
                 {pageState == '3' && <Recommend houseId={houseId} dataSource={imgSource}></Recommend>}
             </Layout>
-            {pageState != '1' && <Tab value={['入住指引', '房东推荐']} pageState={pageState} onClick={[(e) => setPageState('2'), (e) => setPageState('3')]}></Tab>}
+            {pageState != '1' && <Tab styleType='tab' value={['入住指引', '房东推荐']} pageState={pageState} onClick={[(e) => setPageState('2'), (e) => setPageState('3')]}></Tab>}
 
         </View>
 

src/util/request.js

@@ -1,5 +1,7 @@
 import Taro from '@tarojs/taro'
-import { useSelector } from 'react-redux'
+import {
+  useSelector
+} from 'react-redux'
 import user from '../reducers/user'
 
 const baseURL = HOST
@@ -9,12 +11,34 @@ export default async (options) => {
 
   return Taro.request(opts[0])
     .then((res) => {
-      // console.log('3322');
-      return res
+      const {
+        data,
+        code,
+        message
+      } = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
+      if (code == '1000') {
+        return res
+      } else if (code === 1005) {
+        Taro.showToast({
+          title: message,
+          icon: 'none'
+        })
+        throw res
+      } else {
+        throw res
+      }
     })
     .catch((err) => {
-      // console.log('333221');
-      return err
+      console.log(err, '111111111111');
+      if (err.errMsg === "request:fail ") {
+        Taro.showToast({
+          title: "请检查网络",
+          icon: 'none'
+        })
+        throw err
+      }
+
+      throw err
     })
 }
 
@@ -38,7 +62,7 @@ export function optionBuilder(options) {
     api = `${api}?${paramsToString(params)}`
   }
   // user.user?.token||
-  const token = Taro.getStorageSync('token')||''
+  const token = Taro.getStorageSync('token') || ''
   // console.log(token,'token')
   return [{
       url: `${baseURL}${api}`,
@@ -46,7 +70,7 @@ export function optionBuilder(options) {
       data,
       header: {
         'content-type': 'application/json',
-      'X-Authorization-JWT': `${token}`,
+        'X-Authorization-JWT': `${token}`,
         // 'appId': appId,
         // 'x-action': 'miniapp',
         // 'x-version': Version,
@@ -63,13 +87,13 @@ export function optionBuilder(options) {
 }
 
 
-export const uploadFiles = async (files,url) => {
+export const uploadFiles = async (files, url) => {
   const uploads = []
-  const token = Taro.getStorageSync('token')||''
+  const token = Taro.getStorageSync('token') || ''
   for (var i = 0; i < files.length; i++) {
     uploads[i] = new Promise((resolve, reject) => {
       Taro.uploadFile({
-        url:  url||`${baseURL}/api/ma/image`,
+        url: url || `${baseURL}/api/ma/image`,
         filePath: files[i],
         header: {
           'authorization': `X-Authorization-JWT ${token}`,
@@ -110,4 +134,4 @@ function paramsToString(params) {
 function composeKeyValue(k, v, encode) {
 
   return encode === false ? `${k}=${v}` : `${encodeURIComponent(k)}=${encodeURIComponent(v)}`
-}
+}