From 0f409b25f91717e00e10c37738740b22583cb4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 五月 2024 09:00:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaInsuranceApplyShopWindow.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyShopWindow.vue b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
index 8632eff..76923bc 100644
--- a/company/src/components/business/OperaInsuranceApplyShopWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
@@ -399,7 +399,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType == 1 ? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1 || activity.creatorType == 2) ? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
@@ -449,7 +449,7 @@
import { mapState } from 'vuex'
export default {
- name: 'OperaInsuranceApplyWindow1',
+ name: 'OperaInsuranceApplyShopWindow',
extends: BaseOpera,
components: {
GlobalWindow,
--
Gitblit v1.9.3