1007395918@qq.com 5 years ago
parent
commit
04a8c0904d

+ 1
- 1
src/pages/person/index.js View File

203
         <Notice></Notice>
203
         <Notice></Notice>
204
         <View className="info">
204
         <View className="info">
205
           <Image className="bg" src={transferImage('https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/mine/background.png')} mode='widthFix'>
205
           <Image className="bg" src={transferImage('https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/mine/background.png')} mode='widthFix'>
206
-            <Image className="logo" src={transferImage(waterMark || require('@/assets/logo.png'))} mode='widthFix'></Image>
206
+            {waterMark ? <Image className="logo" src={transferImage(waterMark)} mode='widthFix'></Image> : <Image className="logo" src={transferImage(require('@/assets/logo.png'))} mode='widthFix'></Image>}
207
           </Image>
207
           </Image>
208
 
208
 
209
           <View className="content">
209
           <View className="content">

+ 1
- 1
src/pages/person/myShare/index.js View File

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

+ 3
- 3
src/pages/person/myShare/index.scss View File

27
       left: 240px;
27
       left: 240px;
28
       top: 50px;
28
       top: 50px;
29
       color: #333;
29
       color: #333;
30
-      font-size: 32px;
30
+      font-size: 28px;
31
       max-width: 190px;
31
       max-width: 190px;
32
       @include text-ellipsis;
32
       @include text-ellipsis;
33
     }
33
     }
35
       position: absolute;
35
       position: absolute;
36
       right: 0px;
36
       right: 0px;
37
       top: 50px;
37
       top: 50px;
38
-      font-size: 32px;
38
+      font-size: 26px;
39
       color: #FF2359;
39
       color: #FF2359;
40
-      max-width: 260px;
40
+      max-width: 276px;
41
       @include text-ellipsis;
41
       @include text-ellipsis;
42
     }
42
     }
43
     .num{
43
     .num{

+ 2
- 2
src/pages/project/detail/index.js View File

813
                           <Text className='row-txt black'>{item.buildingTypeName || ' '}</Text>
813
                           <Text className='row-txt black'>{item.buildingTypeName || ' '}</Text>
814
                         </View>
814
                         </View>
815
                         <View className='row'>
815
                         <View className='row'>
816
-                          <Text className='row-label'>项目参考价格:</Text>
816
+                          <Text className='row-label'>参考价格:</Text>
817
                           {
817
                           {
818
-                            item.price ? <Text className='row-txt'>约{item.price}{item.priceType == 'total' ? '万元/套' : '元/m²'}</Text> : <Text className='row-txt'>待定</Text>
818
+                            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>
819
                           }
819
                           }
820
                         </View>
820
                         </View>
821
                         <View className='row'>
821
                         <View className='row'>

+ 2
- 3
src/pages/project/index.scss View File

85
     text-align: center;
85
     text-align: center;
86
     width: 25%;
86
     width: 25%;
87
     .icon{
87
     .icon{
88
-      width:80px;
89
-      height:80px;
90
-
88
+      width:84px;
89
+      height:84px;
91
     }
90
     }
92
   }
91
   }
93
 }
92
 }