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

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

@@ -330,7 +330,6 @@ export default {
                 path: "/company-detail",
                 query: {
                     companyId,
-                    canEdit: 1,
                 },
             });
         },

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

@@ -44,7 +44,9 @@
                             <span>{{ companyInfo.companyName }}</span>
                             <div>
                                 <template v-if="canEdit == 1">
-                                    <template v-if="isEditing && companyInfo.claimState.text === '已认领'">
+                                    <template
+                                        v-if="isEditing && companyInfo.claimState.text === '已认领'"
+                                    >
                                         <span class="pointer" @click="updateCompany">
                                             <img
                                                 src="@assets/image/company/icon_save.png"
@@ -259,6 +261,10 @@ export default {
                     console.log(res.data);
                     if (res.data.status == 0) {
                         this.companyInfo = res.data.data;
+                        this.canEdit =
+                            this.currentAccount && this.companyInfo && this.companyInfo.claimUser
+                                ? this.currentAccount.accountId === this.companyInfo.claimUser.id
+                                : false;
                     } else {
                         this.$message.error(`获取数据失败,请刷新重试！`);
                     }
@@ -309,7 +315,9 @@ export default {
         this.getData();
     },
     //生命周期 - 挂载完成（可以访问DOM元素）
-    mounted() {},
+    mounted() {
+        console.log(this.currentAccount, "this.currentAccount");
+    },
 };
 </script>
 <style lang="scss" scoped>

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

@@ -146,7 +146,7 @@ export default {
         if (this.companyInfo.enterpriseFeatures) {
             this.uploadFileList.forEach(item => {
                 this.fileList.push({
-                    url: item,
+                    url: this.formatImg(item),
                 });
             });
         }