curCity priceType

src/pages/person/myShare/index.js

@@ -118,7 +118,7 @@ export default class Person extends Taro.Component {
               <View className="share-item" key={item.targetId + 'share'} onClick={this.handleItemClick.bind(this, item)}>
                 <Image className="img" mode="aspectFill" src={transferImage(item.activityImg || emptyImg)}></Image>
                 <View className={item.eventType == 'project' ? 'building' : 'name'}>{item.activityName || ''}</View>
-                {item.eventType == 'project' && <View className="price"> {item.price ? '均价' + item.price + '元/m²' : '暂无均价'} </View>}
+                {item.eventType == 'project' && <View className="price"> {item.price ? <View>约{item.price}{item.priceType == 'total' ? '万元/套' : '元/m²'}</View> : '暂无均价'} </View>}
 
                 {item.eventType == 'h5' && <View className="num"> {item.drainageShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'project' && <View className="num"> {item.buildingNum || '0'}人查看了分享 </View>}

src/pages/project/item/index.js

@@ -32,7 +32,7 @@ export default class Index extends Component {
             <View className='item__right__title'>{data.name}</View>
             <View className='item__right__price row'>
               {
-                data.price ? <Text className='price__txt'>均价{data.price}{data.priceType == 'total' ? '万元/套' : '元/m²'}</Text> : <Text className='price__txt'>待定</Text>
+                data.price ? <Text className='price__txt'>约{data.price}{data.priceType == 'total' ? '万元/套' : '元/m²'}</Text> : <Text className='price__txt'>待定</Text>
               }
             </View>
           </View>

src/utils/login.js

@@ -36,11 +36,11 @@ export default function (payload, callback) {
 
         console.log(curCity, "curCity")
 
-        // if (!curCity) {
+        if (!curCity || Object.keys(curCity).length == 0) {
           if (city) {
             dispatchCitySelected(city)(dispatch)
           }
-        // }
+        }
 
         // // 用户信息已授权获取成功
         // if (miniAuthorized || avatarAuth) {