feats

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8088"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8088"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',

package.json

@@ -38,27 +38,28 @@
   "dependencies": {
     "@babel/runtime": "^7.7.7",
     "@tarojs/components": "3.2.8",
+    "@tarojs/react": "3.2.8",
     "@tarojs/runtime": "3.2.8",
     "@tarojs/taro": "3.2.8",
-    "redux-logger": "^3.0.6",
-    "redux-thunk": "^2.3.0",
-    "redux": "^4.0.0",
-    "react-redux": "^7.2.0",
+    "classnames": "^2.3.1",
+    "react": "^17.0.0",
     "react-dom": "^17.0.0",
-    "@tarojs/react": "3.2.8",
-    "react": "^17.0.0"
+    "react-redux": "^7.2.0",
+    "redux": "^4.0.0",
+    "redux-logger": "^3.0.6",
+    "redux-thunk": "^2.3.0"
   },
   "devDependencies": {
-    "@types/webpack-env": "^1.13.6",
-    "@types/react": "^17.0.2",
-    "@tarojs/mini-runner": "3.2.8",
     "@babel/core": "^7.8.0",
+    "@tarojs/mini-runner": "3.2.8",
     "@tarojs/webpack-runner": "3.2.8",
+    "@types/react": "^17.0.2",
+    "@types/webpack-env": "^1.13.6",
     "babel-preset-taro": "3.2.8",
-    "eslint-config-taro": "3.2.8",
     "eslint": "^6.8.0",
-    "eslint-plugin-react": "^7.8.2",
+    "eslint-config-taro": "3.2.8",
     "eslint-plugin-import": "^2.12.0",
+    "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "stylelint": "9.3.0"
   }

src/app.jsx

@@ -14,7 +14,7 @@ class App extends Component {
 
   componentDidShow (options) {
     // 保留初始场景
-    Taro.setStorage('scene', options.scene)
+    Taro.setStorage({ key: 'scene', data: options.scene })
   }
 
   componentDidHide () {}

src/constants/api.js

@@ -13,7 +13,7 @@ export const pathname = '/api/wx'
 const resolvePath = api => `${host + pathname}/${api}`
 
 // 特价房源
-export const API_SPECIAL_ROOM_LIST = resolvePath('specialRoomList') // 特价房源列表
+export const API_SPECIAL_ROOM_LIST = resolvePath('buildingSpecialRoom') // 特价房源列表
 
 // 项目动态
 export const API_PROJECT_TREND_LIST = resolvePath('trendList') // 项目动态

src/pages/index/buildingDetail/components/BasicInfo/index.jsx

@@ -1,10 +1,47 @@
-
-import '@/assets/css/iconfont.css'
+import { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
+import classNames from 'classnames'
+import { favorProject, cancelFavorProject } from '@/services/item'
+import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function BasicInfo (props) {
   const { Info = {} } = props
+  const { buildingId, isSave } = Info
+
+  const [isSaved, setIsSaved] = useState(false)
+
+  useEffect(() => { setIsSaved(isSave) }, [isSave])
+  
+  const handleFavor = () => {
+    if (isSaved) {
+      cancelFavorProject(buildingId).then(() => {
+        setIsSaved(false)
+        Taro.showToast({
+          title: '已取消收藏',
+          icon: 'none',
+        })
+      })
+    } else {
+      favorProject(buildingId).then(() => {
+        setIsSaved(true)
+        Taro.showToast({
+          title: '收藏成功',
+          icon: 'none',
+        })
+      })
+    }
+    // savePoint({
+    //   event: 'save',
+    //   eventType: 'building',
+    //   propertyName: '项目收藏',
+    //   data: '{}'
+    // }).then(res => {
+    //   console.log('活动项目收藏')
+    // })
+  }
+
   return (
     <view className='components BasicInfo'>
 
@@ -13,9 +50,9 @@ export default function BasicInfo (props) {
         <view className='flex-item'>
           <text>{Info.buildingName}</text>
         </view>
-        <view className='Collect'>
-          <text className='iconfont icon-shoucang'></text>
-          <text>收藏</text>
+        <view className='Collect' onClick={handleFavor}>
+          <text className={classNames(['iconfont icon-shoucang'], { active: isSaved })}></text>
+          <text>{isSaved ? '取消收藏' : '收藏'}</text>
         </view>
       </view>
 

src/pages/index/buildingDetail/components/BasicInfo/index.scss

@@ -17,7 +17,7 @@
       }
     }
     >.Collect {
-      width: 80px;
+      width: 100px;
       >text {
         display: block;
         text-align: center;
@@ -27,6 +27,10 @@
           font-size: 40px;
           line-height: 50px;
         }
+
+        &.active {
+          color: #F6B61D;
+        }
       }
     }
   }

src/pages/index/buildingDetail/components/SpecialPriceHouse/index.jsx

@@ -1,10 +1,32 @@
 import React, { useState, useEffect } from 'react'
-import './index.scss'
-import '../../../../../assets/css/iconfont.css'
+import { API_SPECIAL_ROOM_LIST } from '@/constants/api'
 import { ScrollView, Image } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import '@/assets/css/iconfont.css'
+import './index.scss'
 
 export default function SpecialPriceHouse (props) {
-  const { Data = {} } = props
+  const { Info } = props
+  const { buildingId } = Info || {}
+
+  const [list, setList] = useState([])
+
+  useEffect(() => {
+    if (!buildingId) {
+      setList([])
+      return;
+    }
+
+    fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get', params: { pageSize: 500, buildingId }, showToast: false}).then((res) => {
+      const { records } = res || {}
+      if (records && records.length) {
+        setList(records)
+      } else {
+        setList([])
+      }
+    })
+  }, [buildingId])
+
   return (
     <view className='components SpecialPriceHouse'>
 
@@ -19,7 +41,7 @@ export default function SpecialPriceHouse (props) {
       <view className='List'>
         <ScrollView scroll-x={true}>
           {
-            ['', '', '', '', ''].map((item, index) => (
+            list.map((item, index) => (
               <view className='ListItem' key={`List-${index}`}>
                 <text className='Tips'>省17.8万</text>
                 <view className='Price'>

src/pages/index/buildingDetail/index.jsx

@@ -41,7 +41,6 @@ export default withLayout((props) => {
   useEffect(() => {
     if (PersonId) {
       GetBuildingDetail()
-      GetSpecialRoomList()
       GetProjectTrendList()
       GetActivityList()
       GetLiveList()
@@ -65,12 +64,6 @@ export default withLayout((props) => {
     })
   }
 
-  const GetSpecialRoomList = () => { // 获取特价房源列表
-    fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get' }).then((res) => {
-      console.log(res)
-    })
-  }
-
   const GetProjectTrendList = () => { // 获取项目动态
     fetch({ url: API_PROJECT_TREND_LIST, method: 'get' }).then((res) => {
       console.log(res)
@@ -144,7 +137,7 @@ export default withLayout((props) => {
 
                 {/* 特价房源 */}
                 <view className='SpecialPriceHouse'>
-                  <SpecialPriceHouse></SpecialPriceHouse>
+                  <SpecialPriceHouse Info={DetailInfo}></SpecialPriceHouse>
                 </view>
 
                 {/* 项目动态 */}

src/pages/index/components/Location/index.jsx

@@ -13,7 +13,7 @@ export default function Location (props) {
   }
 
   const ToSearch = () => {
-    Taro.navigateTo({ url: `/pages/index/buildingSearch/index` })
+    Taro.navigateTo({ url: `/pages/index/buildingList/index` })
   }
 
   return (

src/utils/request.js

@@ -67,14 +67,16 @@ export const uploadFiles = async (files) => {
 }
 
 export function optionBuilder(options) {
-  const { url, payload = {}, method = 'GET', showToast = true, autoLogin = true, header } = options
+  const { url, params = {}, payload = {}, method = 'GET', showToast = true, autoLogin = true, header } = options
   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
   const consultant = Taro.getStorageSync('consultantId') || ''
   const recommender = Taro.getStorageSync('recommender') || ''
+  const queryStr = Object.keys(params).map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`).join('&')
+  const apiURL = queryStr ? `${url}${url.indexOf('?') > -1 ? '&' : '?'}${queryStr}` : url
 
   return [
     {
-      url,
+      url: apiURL,
       method,
       data: payload,
       header: {

yarn.lock

@@ -3289,6 +3289,11 @@ classnames@^2.2.5:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
   integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
+classnames@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.npm.taobao.org/classnames/download/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
+  integrity sha1-38+jiR4wbsHa0QXQ6I9EF7hTXo4=
+
 clean-css@4.2.x, clean-css@^4.2.1:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"