fix

config/dev.js

@@ -6,8 +6,8 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://localhost:7080"',
     // HOST: '"https://sgl.ycjcjy.com"',
-    HOST: '"http://192.168.31.211:7080"',
-    // HOST: '"http://192.168.211.105: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.scss

@@ -65,5 +65,5 @@ page {
 
 
  .scrol{
-  height: calc(100vh - 173.33px)
+  height: calc(100vh - 85px)
  }

src/compents/tab/index.scss

@@ -3,10 +3,10 @@
     position:absolute;
     bottom: 0;
     width: 100%;
-    height: 173.33px;
-    border-radius:40px 40px 0 0;
+    height: 85px;
+    border-radius:30px 30px 0 0;
     text-align: center;
-    line-height: 173px;
+    line-height: 85px;
     z-index:999;
     &-btn{
         line-height: unset;
@@ -14,14 +14,14 @@
 
     .tab1 {
         background-color: #274291;
-        font-size: 44px;
+        font-size: 40px;
         font-weight: 600;
         letter-spacing: 14px;
     }
 
     .tab2 {
         background-color: #ffffff;
-        font-size: 34px;
+        font-size: 30px;
         color: #d2d2d2;
         font-weight: 500;
        

src/pages/recommend/index.jsx

@@ -1,78 +1,117 @@
-import React, { useEffect, useState } from 'react'
-import Taro from '@tarojs/taro'
-import { View, Text, Image, Button } from '@tarojs/components'
-import ContainerLayout from '../../compents/container/index'
-import more from '../../assets/more.png'
-import deleteicon from '../../assets/deleteicon.png'
-import userRloe from '../../util/userRole'
-import './index.scss'
-import { useSelector } from 'react-redux'
-import { AtFab } from 'taro-ui'
-import request from '../../util/request'
-
-const recommend = (props) => {
-
-    const user = useSelector(state => state.user)
-
-    const { value, houseId,...prop } = props
-
-    // const [state, setState] = useState(1)
-    const [list, setList] = useState([])
-    const [id, setId] = useState()
-
-    // let list = props.dataSource || []
-
-    useEffect(() => {
-        setList(props.dataSource || [])
-    }, [props.dataSource])
-
-    // const getImageList=()=>{
-    //     request({url:'/taHouseSurround',params:{houseId:houseId}}).then((res)=>{
-    //         const {records,...page} =res.data.data  
-    //         setList(records)
-    //     })
-    // }
-
-
-    // 
+import React, { useEffect, useState } from "react";
+import Taro from "@tarojs/taro";
+import { View, Text, Image, Button } from "@tarojs/components";
+import ContainerLayout from "../../compents/container/index";
+import more from "../../assets/more.png";
+import deleteicon from "../../assets/deleteicon.png";
+import userRloe from "../../util/userRole";
+import "./index.scss";
+import { useSelector } from "react-redux";
+import { AtFab } from "taro-ui";
+import request from "../../util/request";
+
+const ImageCard = props => {
+  const { image,onDelete } = props;
+  const user = useSelector(state => state.user);
+  const [isopen, setIsOpen] = useState(false);
+
+  return  (
+    <View
+      className="recommend-view-card"
+      style={
+
+          { height: !isopen?'330rpx':undefined, overflow: "hidden"}
+         
+      }
+    >
+      <Image className="recommend-view-img" mode="widthFix" src={image} onClick={() => setIsOpen(!isopen)}></Image>
+
+      {userRloe.customer == user.role ? undefined : (
+        <Image
+          className="icon"
+          src={deleteicon}
+          mode="widthFix"
+          style={{ width: "40rpx" }}
+          onClick={() => onDelete()}
+        ></Image>
+      )}
+    </View>
+  )
+//   : (
+//     <View>
+//       <Image className="recommend-view-img" mode="widthFix" src={image} onClick={() => setIsOpen(!isopen)}></Image>
+//     </View>
+//   );
+};
 
-    const onClick = (item) => {
-        if (user.role == userRloe.customer) {
-            setId(item.surroundId)
-        }
-        else {
-
-           
-            Taro.showModal({
-                title: '确定删除该图片吗？',
-                content: '确定后，相关房东推荐会即时更新',
-                cancelColor: '#d2d2d2',
-                confirmColor: "#274191",
-                success: function (res) {
-                    if (res.confirm) {
-                        console.log('用户点击确定')
-                        request({url: `/taHouseSurround/${item.surroundId}`, method: 'DELETE'}).then((res)=>{
-                            setList(list.filter((x)=>x.surroundId!=item.surroundId))
-                        })
-                       
-
-                    } else if (res.cancel) {
-                        console.log('用户点击取消')
-                    }
-                }
-            })
+const recommend = props => {
+  const user = useSelector(state => state.user);
+
+  const { value, houseId, ...prop } = props;
+
+  // const [state, setState] = useState(1)
+  const [list, setList] = useState([]);
+  const [id, setId] = useState();
+
+  // let list = props.dataSource || []
+
+  useEffect(() => {
+    setList(props.dataSource || []);
+  }, [props.dataSource]);
+
+  // const getImageList=()=>{
+  //     request({url:'/taHouseSurround',params:{houseId:houseId}}).then((res)=>{
+  //         const {records,...page} =res.data.data
+  //         setList(records)
+  //     })
+  // }
+
+  //
+
+  const onClick = item => {
+    if (user.role == userRloe.customer) {
+      setId(item.surroundId);
+    } else {
+      Taro.showModal({
+        title: "确定删除该图片吗？",
+        content: "确定后，相关房东推荐会即时更新",
+        cancelColor: "#d2d2d2",
+        confirmColor: "#274191",
+        success: function(res) {
+          if (res.confirm) {
+            console.log("用户点击确定");
+            request({
+              url: `/taHouseSurround/${item.surroundId}`,
+              method: "DELETE"
+            }).then(res => {
+              setList(list.filter(x => x.surroundId != item.surroundId));
+            });
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
         }
-
+      });
     }
-   
-
-    return <View className='recommend'>
-      {user.role == userRloe.landlord && <Button onClick={()=>Taro.navigateTo({url:`/pages/material/index?houseId=${houseId}`})}>添加图片</Button>}
-        {
-            true && list.map((x) => {
-                return <View className='recommend-view'>
-                    <ContainerLayout className='recommend-view-layout'  >
-                        {id != x.surroundId ? <View className='recommend-view-card' style={userRloe.customer == user.role ? { height: "300rpx",overflow:'hidden' }:''}>
+  };
+
+  return (
+    <View className="recommend">
+      {user.role == userRloe.landlord && (
+        <Button
+          onClick={() =>
+            Taro.navigateTo({ url: `/pages/material/index?houseId=${houseId}` })
+          }
+        >
+          添加图片
+        </Button>
+      )}
+      {true &&
+        list.map(x => {
+          return (
+            <View className="recommend-view">
+              <ContainerLayout className="recommend-view-layout">
+                <ImageCard image={x.image} onDelete={()=>onClick(x)}/>
+                {/* {id != x.surroundId ? <View className='recommend-view-card' style={userRloe.customer == user.role ? { height: "300rpx",overflow:'hidden' }:''}>
 
                             <Image className='recommend-view-img' mode='widthFix' src={x.image} ></Image>
 
@@ -87,16 +126,15 @@ const recommend = (props) => {
                                 <Image className='recommend-view-img' mode='widthFix' src={x.image}></Image>
 
                             </View>
-                        }
-                    </ContainerLayout>
-
-                </View>
-            })
-        }
-        
-        {list.length==0&& < View className='nodata'> 暂无数据</View>}
+                        } */}
+              </ContainerLayout>
+            </View>
+          );
+        })}
 
+      {list.length == 0 && <View className="nodata"> 暂无数据</View>}
     </View>
+  );
 };
 
-export default recommend
+export default recommend;

src/pages/recommend/index.scss

@@ -6,11 +6,12 @@
     &-card{
       width: 100%;
       // height: 420px;
+      border-radius: 30px;
     }
     &-img{
       width: 100%;
       height:  100%;
-      border-radius: 40px;
+      border-radius: 30px;