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

src/pages/activity/detail/index.js

@@ -69,7 +69,7 @@ export default class Detail extends Component {
         isSaved,
         isSign,
         loaded: true,
-        selector: times(res.maxEnlistByPerson || 1).map((_, i) => `${i+1}`),
+        selector: times(res.maxEnlistByPerson || 1).map((_, i) => `${i + 1}`),
       }, () => {
 
         const { detail } = this.state
@@ -318,10 +318,10 @@ export default class Detail extends Component {
                 scrollY
                 className="detail-wrap">
                 <View className="detail">
-                  {(detail.enlisted == 0 || !detail.enlisted) &&
+                  {detail.isEnlist == 0 &&
                     <View className="detail-sign__num">不需要报名</View>
                   }
-                  {detail.enlisted > 0 &&
+                  {detail.isEnlist != 0 &&
                     <View className="detail-sign__num">{detail.enlisted || 0}人已报名</View>
                   }
                   <View class="detail-title">{detail.title}</View>

src/pages/project/index.js

@@ -259,7 +259,7 @@ export default class Index extends Component {
     this.redirectTo(item)
   }
 
-  redirectTo({contentId, contentType, buildingId} = {}) {
+  redirectTo({ contentId, contentType, buildingId } = {}) {
     switch (contentType) {
       // 项目
       case 'project':
@@ -281,21 +281,21 @@ export default class Index extends Component {
           url: '/pages/activity/detail/assistance?id=' + contentId
         })
         return;
-      
+
       // 拼团
       case 'group':
         Taro.navigateTo({
           url: '/pages/activity/detail/assemble?id=' + contentId
         })
         return;
-      
+
       // 资讯
       case 'news':
         Taro.navigateTo({
           url: 'pages/news/detail/index?id=' + contentId
         })
         return;
-      
+
       // 其他
       case 'others':
       default:
@@ -491,11 +491,11 @@ export default class Index extends Component {
                 </View>
                 <View className="top-box">
                   <View className="search" onClick={this.handleToHouseList}>
-                    <Text className="search-icon icon-sousuo iconfont"></Text>
-                    <Input className="search-input" placeholder="输入你想查询的楼盘"></Input>
+                    <Image className="search-icon" src={require('@assets/search.png')} />
+                    <Input className="search-input" placeholder-style="color:#fff" placeholder="输入你想查询的楼盘"></Input>
                   </View>
                   <View className="location" onClick={this.handleLocationClick}>
-                    <Text className="location-icon iconfont icon-daohangdizhi"></Text>
+                    <Image className="location-icon" src={require('@assets/map.png')} />
                     <Text className="location-text">{curCity.id ? curCity.name : '正在定位'}</Text>
                   </View>
                 </View>

src/pages/project/index.scss

@@ -24,25 +24,24 @@
   .location {
     @extend .flex;
     justify-content: center;
-    padding: 13px 14px;
-    background:rgba(161,161,161,0.2);
+    padding: 0 12px;
+    background:rgba(0,0,0,0.2);
     border-radius:12px;
+    height: 60px;
+    line-height: 60px;
     
-  
     &-text {
       font-size: 25px;
       padding-left: 13px;
-      color: rgba(255, 255, 255, 1);
+      color: #fff;
       @include text-ellipsis; 
       width: 100px;
+      text-align: center;
     }
   
     &-icon {
-      color: rgb(209, 204, 204);
-      font-size: 16px;
-      font-weight: bold;
-      display: block;
-      margin-top: 10px;
+      width: 14px;
+      height: 20px;
       animation: bigger 1s ease 3 both;
     }
   }
@@ -50,7 +49,8 @@
   .search {
 
     height: 60px;
-    background:rgba(161,161,161,0.2);
+    line-height: 60px;
+    background:rgba(0,0,0,0.2);
     -webkit-box-pack: start;
     -webkit-justify-content: flex-start;
     -ms-flex-pack: start;
@@ -60,17 +60,15 @@
     width: 440px;
   
     &-icon {
-      font-size: 24px;
-      color: rgb(209, 204, 204);
-      font-weight: bold;
-      margin: 0 10px 0 10px;
+    width: 26px;
+    height: 26px;
+    margin: 0 16px 0 20px ;
     }
-  
     &-input {
       font-size: 24px;
-      line-height: 60px;
-      color: #A2A2A2;
+      color: #fff;
     }
+
   }
 }