Merge branch 'master' of http://git.hhrchina.com/root/digital_park_static

digital-park-web/digital-park/src/views/investment-service/property-detail/PropertyDetail.vue

@@ -329,7 +329,7 @@ export default {
             }
             if (type == "image") {
                 if (
-                    !/(.*)\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(
+                    !/(.*)\.(gif|jpg|jpeg|png|GIF|JPG|PNG|webp)$/.test(
                         fileValueSuffix
                     )
                 ) {

digital-park-web/digital-park/src/views/my-related/business/Business.vue

@@ -329,7 +329,7 @@ export default {
                                 claimState &&
                                 claimState.text == "已认领";
                             // 主图
-                            this.mainImg = logo ? JSON.parse(logo)[0] : "";
+                            this.mainImg = logo ? logo[0] : "";
                             // 标签
                             this.comanyTags = enterpriseLabel
                                 ? enterpriseLabel.text