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

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.105:7080"',
+    // HOST: '"http://192.168.31.68:7080"',
+    // HOST: '"http://192.168.211.181:7080"',
  
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     // OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",

config/prod.js

@@ -3,6 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
+    HOST: '"https://sgl.njyunzhi.com"'
   },
   mini: {},
   h5: {

src/compents/tab/index.jsx

@@ -28,6 +28,7 @@ const tab = (props) => {
     useEffect(() => {
 
     }, [])
+    
     //  &-on{
     //     color: #fed12f;
     // }${props.className}

src/pages/house/list/index.jsx

@@ -13,7 +13,7 @@ let house = (props, ref) => {
   const [list, setList] = useState([])
   const [radioHouse, setRadioHouse] = useState()
   const [width, setWidth] = useState()
-  // const [height, setHeight] = useState()
+  const [height, setHeight] = useState()
   const [queryParams, setQueryParams] = useState({pageNum: 1, pageSize: 10})
   const [total, setTotal] = useState(0)
 
@@ -72,6 +72,25 @@ let house = (props, ref) => {
             // setHeight(res[0].height)
           }
         }).exec()
+        
+      Taro.createSelectorQuery()
+        .selectAll('.tab')
+        .boundingClientRect(res => {
+          let found = false
+          if (res) {
+            for (let item of res) {
+              if (item.height) {
+                found = true
+                setHeight(Taro.getSystemInfoSync().safeArea.height - item.height - 50)
+                break
+              }
+            }
+          }
+
+          if (!found) {
+            setHeight(500)
+          }
+        }).exec()
     })
 
   }, [])
@@ -80,9 +99,9 @@ let house = (props, ref) => {
     getHouseList()
   }, [queryParams])
 
-  useDidShow(() => {
-    setQueryParams({ ...queryParams })
-  })
+  // useDidShow(() => {
+  //   setQueryParams({ ...queryParams })
+  // })
 
   return (
     <View className='houselist'>
@@ -90,7 +109,7 @@ let house = (props, ref) => {
         (!list || !list.length) && < View className='nodata'> 暂无数据</View>
       }
       <RecycleList
-        height={508}
+        height={height}
         width={width}
         list={list}
         total={total}

src/pages/share/index.jsx

@@ -134,14 +134,13 @@ const Index = () => {
                 <View style={{textAlign: 'center'}}>
                     <Loading size='48px' />
                 </View>
-                <View style={{marginTop: '2em', textAlign: 'center'}}>正在生成分享内容, 请稍后...</View>
+                <View style={{marginTop: '2em', textAlign: 'center'}}>正在生成分享内容, 请稍候...</View>
             </AtModalContent>
         </AtModal>
         <AtModal isOpened={showShareModal}>
             <AtModalHeader>分享到微信</AtModalHeader>
             <AtModalAction>
-                <Button onClick={() => setShowShareModal(false)}>取消</Button>
-                <Button open-type='share' onClick={() => setShowShareModal(false)}>确定</Button>
+                <Button open-type='share' onClick={() => setShowShareModal(false)}>去分享</Button>
             </AtModalAction>
         </AtModal>
     </View>