commit

src/pages/person/index.js

@@ -195,7 +195,7 @@ export default class Person extends Component {
   renderDetail() {
     const { users, menus, roleName } = this.state
     const { user: { userInfo: { person: { org: { waterMark } }, miniApp: { name } } } } = this.props
-
+    
     // const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']
     // const isConsultant = user.personType
@@ -284,6 +284,7 @@ export default class Person extends Component {
     const { phone, tel } = this.state.users
     return (
       <View className='wrap'>
+        {/* {(phone || tel) && this.renderDetail()} */}
         {!phone && !tel ? this.renderLogin() : this.renderDetail()}
       </View>
     )

src/pages/project/detail/index.js

@@ -743,6 +743,22 @@ export default class Index extends Component {
     console.log(this.props.userInfo, "this.props")
     return true
   }
+  getPrice(start, end) {
+
+    if (start) {
+      if (end) {
+        if (start == end) {
+          return start
+        } else {
+          return start + '--' + end
+        }
+      } else {
+        return start
+      }
+    } else {
+      return end
+    }
+  }
 
 
   renderBottomMenu() {
@@ -803,8 +819,8 @@ export default class Index extends Component {
                   buildingProjectType.map((item, index) => (
                     <View className={buildingProjectType.length == 1 ? 'onlyone type-intro__item' : 'type-intro__item'} key={index + 'detailBuildingId'} style={`background: url(${transferImage(buildBg)}) no-repeat center;background-size: 100% 100%;`}>
                       <View >
-                        {marketStatus &&
-                          <Text className='item__status' className={marketStatus == '在售' ? 'item__status sale' : marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{marketStatus}</Text>
+                        {item.marketStatus &&
+                          <Text className='item__status' className={item.marketStatus == '在售' ? 'item__status sale' : item.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{item.marketStatus}</Text>
                         }
                         {/* <Text className='type-status'>{statusOpts[status]}</Text> */}
                         {/* <Icon className="iconfont icon-jinrongxianxingge-" onClick={this.handleToolsClick}></Icon> */}
@@ -815,7 +831,7 @@ export default class Index extends Component {
                         <View className='row'>
                           <Text className='row-label'>参考价格：</Text>
                           {
-                            item.startPrice ? <Text className='row-txt'>约{item.startPrice == item.endPrice ? <Text>{item.startPrice}</Text> : <Text>{item.startPrice}--{item.endPrice}</Text>}{item.priceType == 'total' ? '万元/套' : '元/m²'}</Text> : <Text className='row-txt'>待定</Text>
+                            (item.startPrice || item.endPrice) ? <Text className='row-txt'>约{this.getPrice(item.startPrice, item.endPrice)}{item.priceType == 'total' ? '万元/套' : '元/m²'}</Text> : <Text className='row-txt'>待定</Text>
                           }
                         </View>
                         <View className='row'>

src/pages/project/list/filter/index.js

@@ -144,7 +144,7 @@ export default class Index extends Component {
           value = regVal ? regVal[0] : ''
           // 最小值
           if (index === 1) {
-            return '-' + value
+            return '0-' + value
           }
 
           // 最大值
@@ -166,7 +166,7 @@ export default class Index extends Component {
 
           // 最小值
           if (index === 1) {
-            return '-' + value
+            return '0-' + value
           }
 
           // 最大值

src/reducers/user.js

@@ -61,15 +61,18 @@ export default function user(state = INITIAL_STATE, action) {
     // }
     case UPDATE_USER_INFO: {
       // debugger
-      const { person, extraInfo, miniApp = {} } = state.userInfo
-      
+      // const { person, extraInfo, miniApp = {} } = state.userInfo
+      const { person, extraInfo, miniApp } = action.payload || {}
+      const newPerson = mergeNotNull(state.userInfo.person, person)
+
       return {
         ...state,
         userInfo: {
           extraInfo,
           person: {
-            ...person,
-            ...action.payload
+            ...state.userInfo,
+            ...action.payload,
+            person: newPerson,
           },
           miniApp,
         }