Pārlūkot izejas kodu

Merge branch 'dev4.4' of ssh://192.168.3.207:10022/qmx/jy into dev4.4

yangfeng 4 gadi atpakaļ
vecāks
revīzija
c727bb686c

+ 8 - 4
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -98,7 +98,7 @@ var vNode = {
             initEchartsOptions: {
                 renderer: 'svg'
             },
-            svip: false
+            svip: false, // 判断是否是超级订阅的企业画像
         }
     },
     created: function () {
@@ -119,9 +119,13 @@ var vNode = {
             this.getPowerInfo()
             // 获取企业基本信息
             this.getEntBaseInfo()
-            if (this.svip) {
-                this.entInfo.followSearchFinish = true
-                this.entInfo.entExist = false
+            if (this.powerInfo.memberStatus < 0) {
+                if (this.svip || this.powerInfo.viper) {
+                    this.entInfo.followSearchFinish = true
+                    this.entInfo.entExist = false
+                } else {
+                    this.getEntFollowState()
+                }
             } else {
                 this.getEntFollowState()
             }

+ 7 - 1
src/web/staticres/digital_expo/css/index.css

@@ -178,7 +178,8 @@ p.text--y {
     color:#FFFFFF;
 }
 .list-info {
-    margin:0.24rem 0.64rem;
+    position: relative;
+    padding :0.24rem 0.64rem;
 }
 .title-box h3 {
     font-weight:bold;
@@ -299,6 +300,11 @@ p.text--y {
 .play-icon-box p {
     margin-left:0.08rem;
 }
+.fixed-play.play-icon-box {
+    position: absolute;
+    right: 0;
+    bottom: 1.12rem;
+}
 .play-icon-box {
     width:1.6rem;
     height:0.8rem;

+ 8 - 4
src/web/templates/active/digital/index.html

@@ -172,6 +172,10 @@
                         <p>创建跟踪列表,追踪结果及时结果反馈</p>
                     </div>
                 </div>
+                <div class="flex-r-c center play-icon-box fixed-play" data-media="1">
+                    <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    <p>介绍<br>视频</p>
+                </div>
             </div>
 
             <div class="flex-c-c center data-info">
@@ -217,10 +221,10 @@
                         <p>企业情报监控</p>
                         <span>商业情报,一手掌控</span>
                     </div>
-                    <div class="flex-r-c center play-icon-box" data-media="1">
-                        <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
-                        <p>介绍<br>视频</p>
-                    </div>
+<!--                    <div class="flex-r-c center play-icon-box" data-media="1">-->
+<!--                        <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">-->
+<!--                        <p>介绍<br>视频</p>-->
+<!--                    </div>-->
                 </div>
                 <div class="flex flex-r-c wrap center left m-t-24 circle-text-group p-32 wrap-list">
                     <div class="flex-r-c center left circle-text-box">