Merge branch 'master' into feature/v4.8.67

src/jfw/front/pcIndex.go

@@ -91,10 +91,20 @@ func (m *PcIndex) NewSordfish(flag string) error {
 	m.T["shareid"] = se.EncodeString(shareid)
 	m.T["activestart"] = config.ActiveConfig.DoubleEleven.Active_Start
 	m.T["activeend"] = config.ActiveConfig.DoubleEleven.Active_End
+	m.T["userCard"] = "f"
 	regex, _ := regexp.Compile("(Android|Mobile)")
 	var isLogin bool
 	if util.ObjToString(m.GetSession("userId")) != "" {
 		isLogin = true
+		userPower := jy.GetBigVipUserBaseMsg(m.Session(), *config.Middleground)
+		switch {
+		case userPower.Status > 0:
+			m.T["userCard"] = "m"
+		case userPower.VipStatus > 0:
+			m.T["userCard"] = "v"
+		case userPower.EntnicheStatus > 0:
+			m.T["userCard"] = "e"
+		}
 	}
 	if ispc == 0 && len(regex.FindAllString(m.Header("User-Agent"), -1)) > 0 {
 		m.T["s_m_openid"] = util.ObjToString(m.GetSession("s_m_openid"))

src/web/staticres/css/pc/index.css

@@ -1856,6 +1856,9 @@ text-align: center;
   margin-top: 10px;
   height: 22px;
 }
+.jy-index .jy-index-strategy .strategy-content .strate_content .strate_c_list a {
+  font-size: 14px;
+}
 .jy-index-strategy .strategy-content .strate_content .strate_c_list a{
   color: #686868;
   text-decoration: none;
@@ -1863,6 +1866,9 @@ text-align: center;
 .jy-index-strategy .strategy-content .strate_content .strate_c_list a:hover{
   color: #2CB7CA;
 }
+.jy-index .jy-index-strategy .strategy-content .strate_content .strate_l_r_c_date {
+  font-size: 12px;
+}
 .jy-index-strategy .strategy-content .strate_content .strate_l_r_c_date{
   color: #999999;
   min-width: 50px;

src/web/templates/pc/index.html

@@ -598,10 +598,12 @@
           <div class="app-btn" id="app-btn">立即预约演示</div>
         </div>
       </div>
+      {{ if ne .T.userCard "m"}}
       <!-- 底部广告位 -->
       <div class="pc-index-bottom">
         <img class="bottom-member-ad" adv_name="PC首页广告位-底部" src="" alt="底部广告位">
       </div>
+      {{ end }}
       {{include "/common/friend-link.html"}}
       {{include "/common/pcbottom.html"}}
 		</section>
@@ -1037,24 +1039,24 @@
   {{end}}
 
   // 首页活动弹窗迁移至工作桌面首页，此处活动弹窗不再展示
-  // var showDay = localStorage.tc;
-  // if(adv_img!=""){
-  //   if(localStorage.tc === undefined){
-  //     $("#index_tc").css("display","block");
-  //     $("#close2x").css("display","block");
-  //     $(".tans").css("display","block");
-  //   }else{
-  //     if(showDay != day){
-  //       $("#index_tc").css("display","block");
-  //       $("#close2x").css("display","block");
-  //       $(".tans").css("display","block");
-  //     }else{
-  //       $("#index_tc").css("display","none");
-  //       $("#close2x").css("display","none");
-  //       $(".tans").css("display","none");
-  //     }
-  //   }
-  // }
+  var showDay = localStorage.tc;
+  if(adv_img!=""){
+    if(localStorage.tc === undefined){
+      $("#index_tc").css("display","block");
+      $("#close2x").css("display","block");
+      $(".tans").css("display","block");
+    }else{
+      if(showDay != day){
+        $("#index_tc").css("display","block");
+        $("#close2x").css("display","block");
+        $(".tans").css("display","block");
+      }else{
+        $("#index_tc").css("display","none");
+        $("#close2x").css("display","none");
+        $(".tans").css("display","none");
+      }
+    }
+  }
 
   // 首页底部广告位
   {{$bottom:=(Ad "jy_pc_index_bottom" -1 .Host)}}