style

config/dev.js

@@ -4,8 +4,8 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://www.newhousehold.cn"',
-    HOST: '"http://192.168.89.147:8081"',
+    HOST: '"https://www.newhousehold.cn"',
+    // HOST: '"http://192.168.89.147:8081"',
 
     // WSS_HOST: '"wss://www.newhousehold.cn"',
     WSS_HOST: '"wss://xlk.njyz.tech"',

src/components/BuildingSelect/index.jsx

@@ -1,12 +1,12 @@
 
 import Taro from '@tarojs/taro'
-import { View, Button, RadioGroup, Label, Radio, ScrollView } from '@tarojs/components'
+import { View, Button, RadioGroup, Label, Radio } from '@tarojs/components'
 import { API_GET_AGENT_BUILDINGS, API_ITEMS_LIST } from '@/constants/api'
 import { ROLE_CODE } from '@/constants/user'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
 
-import { useState, useEffect, useRef } from 'react'
+import { useState, useEffect, useMemo } from 'react'
 import './style.css'
 
 const wrapAnimate = 'wrap wrapAnimate'
@@ -20,15 +20,18 @@ export default (props) => {
   const [dicts, setDicts] = useState([])
   const [visible, setVisible] = useState(false)
   const [loading, setLoading] = useState(false)
-  const [val, setVal] = useState({ buildingName: '意向楼盘' })
-  const [buildingTitle, setBuildingTitle] = useState({ buildingName: '意向楼盘' })
+  // const [val, setVal] = useState({ buildingName: '意向楼盘' })
+  // const [buildingTitle, setBuildingTitle] = useState({ buildingName: '意向楼盘' })
+  const [current, setCurrent] = useState({ buildingName: '意向楼盘' })
+
+  const buildingProp = useMemo(
+    () => (dicts || []).filter(x => x.buildingId === value)[0] || { buildingName: '请选择' },
+    [value, dicts]
+  )
 
   useEffect(() => {
-    if (dicts) {
-      const building = dicts.filter(x => x.buildingId === value)[0] || { buildingName: '请选择' }
-      setVal(building)
-    }
-  }, [value, dicts])
+    setCurrent(buildingProp)
+  }, [buildingProp])
 
   useEffect(() => {
     setLoading(true)
@@ -50,15 +53,19 @@ export default (props) => {
     const buildingId = e.detail.value
     const building = dicts.filter(x => x.buildingId === buildingId)[0] || { buildingName: '意向楼盘' }
 
-    setBuildingTitle(building)
-
+    // setBuildingTitle(building)
+    setCurrent(building)
   }
   const handleSubmit = (e) => {
     e.stopPropagation()
     setVisible(false)
-    setVal(buildingTitle)
 
-    onChange(val.buildingId, val)
+    onChange(current.buildingId, current)
+  }
+
+  const handleCancel = () => {
+    setVisible(false)
+    setCurrent(buildingProp)
   }
 
   return (
@@ -66,12 +73,12 @@ export default (props) => {
       {
         visible ? (
           < >
-            <view onClick={() => setVisible(false)} className={wrapAnimate}></view>
+            <view onClick={handleCancel} className={wrapAnimate}></view>
             <view className={frameAnimate} catchMove>
               <view className='frame'>
                 {/* 标题  */}
                 <view className='title-wrapper'>
-                  <view>{buildingTitle.buildingName}</view>
+                  <view>{current.buildingName}</view>
                 </view>
                 {/* 内容 */}
                 <view style='overflow-x: hidden;'>
@@ -91,7 +98,7 @@ export default (props) => {
                                   <Label catchMove className='radio-list__label' for={`rdo-${i}`} key={i}>
                                     <view className='radio-list__text'>{item.buildingName}</view>
 
-                                    <Radio id={`rdo-${i}`} catchMove className='radio-list__radio' value={item.buildingId} checked={item.buildingId === val.buildingId}></Radio>
+                                    <Radio id={`rdo-${i}`} catchMove className='radio-list__radio' value={item.buildingId} checked={item.buildingId === current.buildingId}></Radio>
 
                                   </Label>
                                 )
@@ -105,11 +112,11 @@ export default (props) => {
 
                   {/* <view className='bottom-text' onClick={handleTextNext}> */}
                   <view style={{ display: 'flex', margin: '2em auto' }}>
-                    <Button className='checkBtn' onClick={() => setVisible(false)}  >取消</Button>
-                    <Button className='okBtn' disabled={!buildingTitle.buildingId} onClick={handleSubmit}> 确定</Button>
+                    <Button className='checkBtn' onClick={handleCancel}  >取消</Button>
+                    <Button className='okBtn' disabled={!current.buildingId} onClick={handleSubmit}> 确定</Button>
                   </view>
                   {/* <view className='Btn'>
-                    <Button onClick={() => setVisible(false)} >取消</Button>
+                    <Button onClick={handleCancel} >取消</Button>
                     <Button disabled={!val.buildingId} onClick={handleSubmit}>确定</Button>
                   </view> */}
                 </view>
@@ -117,7 +124,7 @@ export default (props) => {
             </view>
           </>
         ) :
-          <View onClick={() => setVisible(true)}>{val.buildingName}</View>
+          <View onClick={() => setVisible(true)}>{buildingProp.buildingName}</View>
       }
     </view>
 

src/pages/mine/addCustomer/index.jsx

@@ -118,7 +118,9 @@ export default withLayout((props) => {
   }
 
   const handleBuildingSelect = (bid, building) => {
+    console.log("🚀 ~ file: index.jsx ~ line 121 ~ handleBuildingSelect ~ building", building)
     setBuildingId(bid)
+    // setBuildingId(building.buildingId)
   }
 
   return (
@@ -155,7 +157,7 @@ export default withLayout((props) => {
             <view className='flex-item'>
               {/* <BuildingPicker change={BuildingChange} value={buildingId} type={personType} /> */}
               {/* <View onClick={() => setShowFrame(true)} >{buildingName}</View> */}
-              <BuildingSelect onChange={handleBuildingSelect} role={personType} />
+              <BuildingSelect value={buildingId} onChange={handleBuildingSelect} role={personType} />
             </view>
           </view>