Merge branch 'master' of http://192.168.18.147:9000/root/digital_park_static

digital-park-web/digital-park/src/views/park-enterprises/Detail.vue

@@ -68,7 +68,7 @@
                                 </template>
                                 <span
                                     class="pointer"
-                                    v-if="canEdit==0 && companyInfo.claimState.text == '未认领'"
+                                    v-if="!canEdit && companyInfo.claimState.text === '未认领'"
                                     @click="setClaimDialog"
                                 >
                                     <img src="@assets/image/company/icon_claim.png" alt="认领" />
@@ -377,6 +377,7 @@ export default {
         }
     }
     .top_box {
+        width: 100%;
         @include flex(row, space-between, center, nowrap);
         .company_img_box {
             @include size(220px, 200px);

digital-park-web/digital-park/src/views/park-enterprises/components/OtherInfo.vue

@@ -141,11 +141,13 @@ export default {
     //生命周期 - 创建完成（可以访问当前this实例）
     created() {
         this.uploadFileList = JSON.parse(this.companyInfo.enterpriseFeatures);
-        this.uploadFileList.forEach(item => {
-            this.fileList.push({
-                url: item,
+        if (this.companyInfo.enterpriseFeatures) {
+            this.uploadFileList.forEach(item => {
+                this.fileList.push({
+                    url: item,
+                });
             });
-        });
+        }
     },
     //生命周期 - 挂载完成（可以访问DOM元素）
     mounted() {},