Merge branch 'release/v4.8.90' into dev/v4.8.90_zsy

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

@@ -1265,17 +1265,18 @@ cursor: pointer;
 }
 
 #close2x {
-  width: 30px;
-  height: 30px;
+  width: 24px;
+  height: 24px;
   position: absolute;
   left: 50%;
   bottom: -40px;
-  margin-left: -15px;
+  margin-left: -12px;
   cursor: pointer;
   display: none;
   z-index: 1000;
 }
 
+
 .tans {
   position: fixed;
   top: 0;
@@ -1300,11 +1301,37 @@ cursor: pointer;
   z-index: 1001;
 }
 
+/* 支持全屏 */
+.pc_tc_master.support-full {
+  width: 100%;
+  min-width: 1200px;
+}
+.pc_tc_master.support-full .f-img {
+  max-width: 100%;
+  height: auto;
+  max-height: 800px;
+}
+.pc_tc_master.support-full #close2x {
+  top: -40px;
+  right: 200px;
+  left: unset;
+  bottom: unset;
+}
+.pc_tc_master.support-full .tc_master {
+  width: 100% !important;
+  height: auto !important;
+  background-image: unset !important;
+}
+.pc_tc_master.support-full {
+  top: unset;
+  bottom: 0;
+  left: 0;
+  margin: 0 !important;
+}
 /*主弹窗*/
 .tc_master {
   width: 621px;
   height: 209px;
-  background: url();
   background-size: cover;
   border-radius: 8px;
   cursor: pointer;

src/web/templates/pc/template/index/activity-dialog.html

@@ -3,7 +3,7 @@
     <div id="index_tc_svga"></div>
     <div class="tc_button"></div>
   </div>
-  <img src="/images/pc/close2x.png" id="close2x">
+  <img src="/images/pc/close-icon.png" id="close2x">
 </div>
 <div class="tans"></div>
 <div class="live_preheat">
@@ -76,12 +76,25 @@
         }
         if (adv_img!=""){
           $(".tc_button").remove();
+          let isSupportFull = false
+          try {
+            isSupportFull = parseInt(AD.o_extend.theme) === 1
+          } catch (e) {
+            console.warn(e)
+          }
           $("#pc-index-alert").removeClass("pc_tc").addClass("pc_tc_master").css({"margin-top":"-"+adv_margin_top+"px","margin-left":"-"+adv_margin_left+"px"});
           $("#index_tc").removeClass("tc").addClass("tc_master").css({
             "width":adv_width+"px",
             "height":adv_height+"px",
             // "background":"url('"+adv_img+"')",
             "background-size":"cover"}).attr("dataurl",adv_url);
+          if (isSupportFull) {
+            $("#pc-index-alert").addClass('support-full')
+            $("#pc-index-alert #index_tc").append('<img class="f-img" src="'+adv_img+'">')
+            $("#close2x").css({
+              bottom: adv_height+'px'
+            })
+          }
           // SVGA 动画支持
           if (adv_img.indexOf('.svga') !== -1) {
             $('#index_tc_svga').css({