From b3e1a0be01bd5e3603a7a848f766f4be19f6bb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 17 Oct 2021 23:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E7=89=88=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/tools/UserMenu.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/components/tools/UserMenu.vue b/jshERP-web/src/components/tools/UserMenu.vue
index 6f125fd3..069e1009 100644
--- a/jshERP-web/src/components/tools/UserMenu.vue
+++ b/jshERP-web/src/components/tools/UserMenu.vue
@@ -2,7 +2,8 @@
   <div class="user-wrapper" :class="theme">
     <span class="action" v-if="showAd">
       <a class="ad_title" target="_blank" :href="payFeeUrl">
-        <a-icon type="cloud" theme="filled" style="color: yellow; font-size: 16px; line-height: 16px;" /><span> 华夏ERP网络版99元起</span>
+        <a-icon type="cloud" theme="filled" style="color: yellow; font-size: 16px; line-height: 16px;" />
+        <span> 华夏ERP网络版99元起</span>
       </a>
     </span>
     <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
@@ -196,12 +197,23 @@
       // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
       /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
       isShowAd() {
+        //只有配置了租户续费地址和试用租户才显示广告
         getPlatformConfigByKey({"platformKey": "pay_fee_url"}).then((res)=> {
           if (res && res.code === 200) {
             let payFeeUrl = res.data.platformValue
             if(payFeeUrl) {
-              this.showAd = true
-              this.payFeeUrl = payFeeUrl
+              getAction("/user/infoWithTenant",{}).then(res=> {
+                if (res && res.code === 200) {
+                  let tenant = res.data
+                  if(tenant && tenant.type === '0') {
+                    if(!this.isMobile()) {
+                      //pc端才显示
+                      this.showAd = true
+                      this.payFeeUrl = payFeeUrl
+                    }
+                  }
+                }
+              })
             }
           }
         })