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

src/pages/project/detail/index.js

@@ -1047,9 +1047,14 @@ export default class Index extends Component {
   }
   pointItemCilck() {
     const { projectDetail } = this.props
-    Taro.navigateTo({
-      url: `/pages/project/detail/highLight?type=${projectDetail.highlightsType}&link=${encodeURIComponent(projectDetail.highlightsLink)}&content=${encodeURIComponent(projectDetail.highlights)}`
-    })
+    if (projectDetail.highlightsLink || projectDetail.highlights) {
+      Taro.navigateTo({
+        url: `/pages/project/detail/highLight?type=${projectDetail.highlightsType}&link=${encodeURIComponent(projectDetail.highlightsLink)}&content=${encodeURIComponent(projectDetail.highlights)}`
+      })
+    } else {
+      return
+    }
+
   }
 
   renderPoints() {
@@ -1519,7 +1524,7 @@ export default class Index extends Component {
                     </View>
                   </View>
                   {/* 项目亮点 */}
-                  {projectDetail.highlightsType && this.renderPoints()}
+                  {projectDetail.highlightsCover && this.renderPoints()}
                   {/* 项目顾问 */}
                   {this.renderConsuler()}
                   {/* 周边 */}

src/pages/project/index.js

@@ -130,19 +130,16 @@ export default class Index extends Component {
         const newArr = [];
         iconList.forEach(item => {
           menus.forEach(menu => {
-            if (menu.code == item.code) {
+            if (menu.iconCode == item.iconCode) {
               newArr.push(menu);
             }
           })
         })
         const { userInfo: { person: { personType } } } = this.props
         this.setState({
-          menusList: personType == ROLE_CODE['CONSULTANT'] ? newArr.filter(item => item.code != 'refercustomers') : newArr
+          menusList: personType == ROLE_CODE['CONSULTANT'] ? newArr.filter(item => item.iconCode != 'refercustomers') : newArr
         })
       }
-
-
-
     })
   }