Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

src/pages/agent/client/index.js

@@ -125,10 +125,10 @@ export default class Index extends Component {
                       </View>
 
                       <View className='phone'>手机:&emsp;{item.phone}</View>
-                      <View className='phone'>意向楼盘:&emsp;{item.intention ? this.getName(floorList,item.intention):'暂无'}</View>
+                      <View className='phone'>意向楼盘:&emsp;{item.intention ? item.intention:'暂无'}</View>
                      
                     </View>
-                     <View className='time'>{item.createDate}</View>
+                    <View className='time'>{dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}</View>
                   </View>
                 )
               })

src/pages/agent/progress/index.js

@@ -150,7 +150,7 @@ export default class Index extends Component {
       <View className='client__progress'>
         <View className='client__infor'>
           <View className='clieng__name'>{detail.name}</View>
-          <View className='clieng__build'><Image mode="widthFix" className='build__img' src={buildImg}></Image>意向楼盘：{this.getName(floorList,detail.intention,'floor') || '暂无'}</View>
+          <View className='clieng__build'><Image mode="widthFix" className='build__img' src={buildImg}></Image>意向楼盘：{detail.intention || '暂无'}</View>
           <View className='clieng__phone'><Image mode="widthFix" className='phone__img' src={phoneImg}></Image>{detail.phone || '暂无'}</View>
           {/* <Image className='client__img' src={headImg}></Image> */}
         </View>

src/pages/person/myGuest/editGuest/index.js

@@ -142,7 +142,7 @@ export default class editGuest extends Component {
           <View className='col_box'>
               <Text className='star'>*</Text>
               <Text className='col_name1'>意向项目:</Text>
-              <Input disabled className='col_message' value={TaCustomer.intention ? this.getName(floorList,TaCustomer.intention,'intention') :this.getName(floorList,TaCustomer.buildingId,'buildingId') }/>
+              <Input disabled className='col_message' value={TaCustomer.buildingId ? this.getName(floorList,TaCustomer.buildingId,'buildingId') :'暂无' }/>
           </View>
           <View className='col_box'>
               <Text className='star'>*</Text>

src/pages/person/myGuest/index.js

@@ -127,7 +127,7 @@ export default class myGuest extends Component {
                       <View className="col_name">备注信息:{item.describe ? item.describe :'暂无'}</View>
                   </View>
                   <View className="col_bottom1">
-                    <View className="col_name">预约到访时间:{dayjs(item.createDate).format('YYYY-MM-DD hh:mm:ss')}</View>
+                    <View className="col_name">预约到访时间:{dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}</View>
                   </View>
                 </View>
              )

src/pages/project/floor/index.js

@@ -35,7 +35,7 @@ export default class Index extends Component {
           </View>
           <View className='item'>
             <Text className='txt left-txt'>均价</Text>
-            <Text className='txt right-txt'>{projectDetail.price}</Text>
+            <Text className='txt right-txt'>{projectDetail.price ? projectDetail.price :'待定'}</Text>
           </View>
           <View className='item'>
             <Text className='txt left-txt'>销售状态</Text>
@@ -43,7 +43,7 @@ export default class Index extends Component {
           </View>
           <View className='item'>
             <Text className='txt left-txt'>开盘日期</Text>
-            <Text className='txt right-txt'>{projectDetail.openingDate || '暂无'}</Text>
+            <Text className='txt right-txt'>{projectDetail.openingDate ? dayjs(projectDetail.openingDate).format('YYYY-MM-DD HH:mm:ss') : '待定'}</Text>
           </View>
           <View className='item'>
             <Text className='txt left-txt'>楼盘地址</Text>