Merge branch 'master' into hotfix/v4.7.49.3

src/web/staticres/dataExport/css/conditions.css

@@ -31,7 +31,8 @@ button.sussecc,
 }
 
 button.u-select {
-  width: 94px;
+  /* width: 94px; */
+  width: 90px;
   height: 36px;
   border: 1px solid #E0E0E0;
   border-radius: 4px;
@@ -55,6 +56,13 @@ button.w100 {
   margin-left: 6px;
 }
 
+.conditions-box,
+.progress_,
+.dataExportFun,
+.inner,
+.dataExport_table{
+  min-width: 1012px;
+}
 /* S-顶部文案-S */
 .conditions-box .dataExportFun{
   position: relative;
@@ -72,6 +80,7 @@ button.w100 {
 }
 .dataExportFun .data_export_right {
   display: flex;
+  z-index: 1;
 }
 .dataExportFun .data_export_right::before{
   content: "";
@@ -88,12 +97,17 @@ button.w100 {
   line-height: 22px;
 }
 .data_export_BG{
+  width: 180px;
+  height: 130px;
   position: absolute;
   right: 0;
+  background: url(/dataExport/image/dataexport-right.png) no-repeat right center;
+  background-size: contain;
+  z-index: 0;
 }
 .data_export_BG .BG_img{
-  width: 180px;
-  height: 130px;
+  /* width: 180px;
+  height: 130px; */
 }
 /* E-顶部文案-E */
 
@@ -104,15 +118,18 @@ button.w100 {
 }
 
 .conditions-box .progress_ {
-  width: 1200px;
+  /* width: 1200px; */
+  width: 100%;
   display: inline-block;
-  padding-left: 95px;
+  padding-left: 30px;
   margin-bottom: 30px;
   box-sizing: border-box;
 }
 
 .conditions-box .progress_ div.pro {
-  width: 300px;
+  /* width: 300px; */
+  min-width: 250px;
+  width: 26%;
   height: 38px;
   line-height: 38px;
   text-align: center;
@@ -227,7 +244,7 @@ button.w100 {
 }
 
 .conditions-box .line-box {
-  width: 1140px;
+  /* width: 1140px; */
   /*border-bottom: 1px solid #E0E0E0;*/
   padding-bottom: 20px;
   box-sizing: border-box;
@@ -252,7 +269,8 @@ button.w100 {
 }
 
 .conditions-box .line-box .right {
-  width: 1047px;
+  /* width: 1047px; */
+  width: calc(100% - 130px);
   margin-left: 15px;
 }
 
@@ -333,7 +351,8 @@ button.w100 {
 }
 
 .select-date {
-  width: 170px;
+  /* width: 170px; */
+  width: 160px;
   height: 36px;
   display: inline-block;
   border: 1px solid #e0e0e0;
@@ -459,7 +478,8 @@ input.sm {
 }
 
 .dialog {
-  width: 1010px;
+  /* width: 1010px; */
+  width: 100%;
   padding: 20px;
   padding-top: 5px;
   box-sizing: border-box;
@@ -780,9 +800,9 @@ input.sm {
 .fixedTr.data_fixed{
   position: fixed;
   top: 0;
-  margin: 114px auto;
   z-index: 11;
-  width: 1200px;
+  /* margin: 114px auto;
+  width: 1200px; */
   overflow-x: auto;
   overflow-y: hidden;
 }
@@ -805,8 +825,8 @@ input.sm {
 .dataExport_table .dataExport_option.data_fixed{
   position: fixed;
   top: 0;
-  margin: 64px auto;
-  width: 1200px;
+  /* margin: 64px auto ;
+  width: 1200px; */ 
   z-index: 11;
 }
 .data_op_left{
@@ -913,14 +933,19 @@ input.sm {
   /* position: fixed;
   bottom: 0; */
   width: 100%;
+  /* width: calc(100% - 48px); */
+  /* padding: 0 24px; */
   height: 68px;
   background: #FFFFFF;
   box-shadow: 0px -4px 8px 1px rgba(0, 0, 0, 0.05);
   z-index: 999;
+  margin: 0 auto;
 }
 .dataExport-footer.bottomfixed {
   position: fixed;
   bottom: 0;
+  /* left: 50%;
+  transform: translateX(-50%); */
 }
 .data-footer-main{
   display: flex;
@@ -957,7 +982,7 @@ input.sm {
   background: #fff
 }
 .dataMore-out{
-  width: 1200px;
+  /* width: 1200px; */
   bottom: 116px;
   background: #fff;
 }

src/web/staticres/dataExport/css/payment_order.css

@@ -7,15 +7,17 @@ body {
 }
 
 #pay .progress_createOrder {
-    width: 1200px;
+    /* width: 1200px; */
+    min-width: 1012px;
     display: inline-block;
-    padding-left: 95px;
+    padding-left: 30px;
     margin-bottom: 30px;
     box-sizing: border-box;
 }
 
 #pay .progress_createOrder div.pro {
-    width: 300px;
+    /* width: 300px; */
+    min-width: 250px;
     height: 38px;
     line-height: 38px;
     text-align: center;

src/web/templates/pc/createOrderPage.html

@@ -86,6 +86,15 @@
         .guige .noactive{
           background-color: #F5F5FB;
         }
+        #pc-coupon-w1200, .pc-coupon-w1200{
+          min-width: unset!important;
+        }
+        #pay{
+          padding: 48px 24px 0;
+        }
+        .inner.all {
+          min-width: 1012px;
+        }
     </style>
 </head>
 <body>
@@ -141,7 +150,7 @@
             <div class="datapackage-buy-tip-group">
                 <span>数据流量包：按条数预充值，即充即导，价格更优！</span>
                 <span class="arrowPC" style="margin-left: 16px;"></span>
-                <a id="buy-data-pack-for-link" href="/front/dataPack/createOrder">立即购买数据流量包</a>
+                <a id="buy-data-pack-for-link" target="_blank" href="/front/dataPack/createOrder">立即购买数据流量包</a>
             </div>
         </div>
         <div id="select-ent-datapack" class="guige" data-show-type="数据流量包">
@@ -373,7 +382,24 @@
 <script src='{{Msg "seo" "cdn"}}/js/coupon/coupon.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/coupon/coupon-usd.js?v={{Msg "seo" "version"}}'></script>
 <script>
-
+    // 嵌套到工作桌面的时候 底部悬浮元素样式单独修改
+    function getStyleFn () {
+      if (goTemplateData && goTemplateData.inIframe) {
+        $('.sticky-footer').css({
+          'left': '24px',
+          'padding': '0px 24px',
+          'width': 'calc(100% - 48px)'
+        })
+        $('.info.pay-info .right .btn_createOrder button').css({
+          'width': '130px'
+        })
+      } else {
+        $('#pay').css({
+          'padding': '106px 0 30px'
+        })
+      }
+    }
+    
     var pageDataMap = {
         isLoadingForRepeat: false,
         isPackLength: 0,
@@ -1335,7 +1361,7 @@
     $("#dataexport-tip .btn").on("click", function () {
         var nowText = $(this).text()
         if (nowText == '立即充值') {
-            location.href ="/front/dataPack/createOrder"
+            window.open("/front/dataPack/createOrder")
             return
         }
         if (nowText == '我知道了') {
@@ -1427,6 +1453,7 @@
 
     // 必须在$(function () {})中调用
     function windowScrollFn () {
+        getStyleFn()
         // refreshStickyInfo()
         // 购买底部固定
         // 判断xx是否处于可视区域
@@ -1527,7 +1554,7 @@
                     sessionStorage.setItem("order_phone" + _id, $(".phone_input").val().replace(/\s*/g, ""));
 
                     history.replaceState({}, '', '/front/dataExport/toOrderDetail/' + res.data.order_code);
-                    window.location.href = "/front/dataexport/orderPay/" + res.data.order_code;
+                    window.open("/front/dataexport/orderPay/" + res.data.order_code);
                 } else {
                   canpay = true;
                   $.confirm({

src/web/templates/pc/dataExport_sieve.html

@@ -16,7 +16,7 @@
     {{include "/common/pnc.html"}}
     <link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/swiper/swiper.min.css?v={{Msg "seo" "version"}}">
+    <!-- <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/swiper/swiper.min.css?v={{Msg "seo" "version"}}"> -->
     <link rel="stylesheet" type="text/css"
     href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}"/>
     <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
@@ -24,7 +24,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/previewData.css?v={{Msg "seo" "version"}}">
     <script src="//cdn-common.jianyu360.com/cdn/lib/html2canvas/1.4.0/dist/html2canvas.js"></script>
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/swiper/swiper.min.js?v={{Msg "seo" "version"}}"></script>
+    <!-- <script src="{{Msg "seo" "cdn"}}/swiper/swiper.min.js?v={{Msg "seo" "version"}}"></script> -->
     <script src="https://cdn.bootcdn.net/ajax/libs/fontfaceobserver/2.1.0/fontfaceobserver.js"></script>
     <script src="//cdn-common.jianyu360.com/cdn/lib/vue-dragscroll/3.0.1/dist/vue-dragscroll.min.js"></script>
     <title>数据导出_拟建项目导出_招标采购数据导出_中标数据导出-剑鱼标讯</title>
@@ -263,7 +263,7 @@
             font-size: 14px;
             line-height: 30px;
             position: absolute;
-            right: 40px;
+            right: 30px;
             top: 0;
             cursor: pointer;
         }
@@ -410,31 +410,36 @@
             color: #1D1D1D;
             font-size: 14px;
         }
-
+        /* .conditions-box{
+          padding: 106px 24px 30px;
+        } */
         .conditions-box .line-box.p20 {
             padding: 14px 0;
         }
 
         .conditions-box .line-box {
-            width: 1200px;
+            /* width: 1200px; */
             /*border-bottom: 1px solid #E0E0E0;*/
             padding-bottom: 15px;
             box-sizing: border-box;
         }
 
         .tro {
-            width: 1010px;
+            position: relative;
+            width: calc(100% - 130px);
             height: 110px;
             background: rgba(254, 254, 254, 1);
             border: 1px dashed rgba(224, 224, 224, 1);
             opacity: 1;
             display: block;
             margin-top: 15px;
+            padding: 16px 0;
         }
 
         .tro img {
-            position: relative;
-            left: -480px;
+            position: absolute;
+            /* left: -480px; */
+            left: 16px;
             top: 15px;
         }
 
@@ -466,7 +471,7 @@
         }
 
         .heng {
-            width: 1140px;
+            /* width: 1140px; */
             height: 1px;
             background: rgba(224, 224, 224, 1);
             opacity: 1;
@@ -564,6 +569,20 @@
           color: transparent !important;
           text-shadow: 0 0 10px rgba(0,0,0,0.5);
         }
+        #swiper1,
+        #swiper1 .swiper-slide{
+          min-width: 1012px;
+        }
+        #swiper1 .swiper-slide > a > img{
+          width: 100%!important;
+          height: auto!important;
+          border-radius: 8px;
+          /* display: block;
+          margin: 0 auto; */
+        }
+        .banner{
+          height: auto!important;
+        }
     </style>
 </head>
 <body>
@@ -571,7 +590,7 @@
 <section id="conditions-box" class="conditions-box w" style="min-height: calc(100vh - 364px);">
     <!-- 数据导出功能文案 -->
     <div class="dataExportFun">
-      <div class="data_export_left data_export_common">
+      <div class="data_export_left data_export_common" style="width: 35%;">
         <div class="data_e_l_top">
           <img class="data_e_img" src='{{Msg "seo" "cdn"}}/dataExport/image/dataexport-text.png' alt="" />
           <div class="data_e_l_bottom" style="width:358px">
@@ -592,7 +611,7 @@
         </div>
       </div>
       <div class="data_export_BG">
-         <img class="BG_img" src='{{Msg "seo" "cdn"}}/dataExport/image/dataexport-right.png' alt="">
+         <!-- <img class="BG_img" src='{{Msg "seo" "cdn"}}/dataExport/image/dataexport-right.png' alt=""> -->
       </div>
     </div>
     <!--指示条-->
@@ -656,7 +675,7 @@
             <div class="left" style="padding-top: 8px">区域</div>
             <div class="right">
                 <div class="del-box float-box" id="area-del"></div>
-                <div class="select-area-box float-box">
+                <div class="select-area-box float-box" style="padding-right: 40px;">
                     <span class="select-area">全国</span><span>A</span><span
                             class="select-area">安徽</span><span class="select-area">澳门</span><span>B</span><span
                             class="select-area">北京</span><span>C</span><span
@@ -667,7 +686,7 @@
                             class="select-area">湖北</span><span class="select-area">黑龙江</span><span
                             class="select-area">海南</span><span class="select-area">河南</span><span
                             class="select-area">湖南</span><span>J</span><span class="select-area">吉林</span><span
-                            class="select-area">江苏</span><span class="select-area" style="margin-right: 40px;">江西</span><span>L</span><span
+                            class="select-area">江苏</span><span class="select-area">江西</span><span>L</span><span
                             class="select-area">辽宁</span><span>N</span><span class="select-area">内蒙古</span><span
                             class="select-area">宁夏</span><span>Q</span><span
                             class="select-area">青海</span><span>S</span><span class="select-area">山西</span><span
@@ -1128,53 +1147,56 @@
       </span>
     </el-dialog>
     <!--底部banner-->
-    <div class="banner" style="height: 120px;margin-top:32px;border-radius: 8px;overflow: hidden;">
+    <div class="banner" style="min-width: 1012px;height: 120px;margin-top:32px;border-radius: 8px;overflow: hidden;">
       <div class="swiper-container lunbo" id="swiper1">
-          <div class="swiper-wrapper">
-              <!--轮播广告-->
+          <!-- <div class="swiper-wrapper">
           </div>
-          <div class="swiper-pagination custorm_dot"></div>
+          <div class="swiper-pagination custorm_dot"></div> -->
       </div>
     </div>
     {{$s_top:=(Ad "dataExport_Sieve_Banner" -1 .Host)}}
     <script>
         var ADTopList ={{$s_top}}
         if (ADTopList != null) {
+          console.log(ADTopList);
             var adhtml = '';
-            for (var i = 0; i < ADTopList.length; i++) {
-                var num = i + 1;
-                adhtml += '<div class="swiper-slide" onclick="adv_statistics(this)"  adv_name="微信搜索页轮播图' + num + '">'
-                if (ADTopList[i]["s_link"]) {
-                    adhtml += '<a dataHref="' + ADTopList[i]["s_link"] + '">'
-                } else {
-                    adhtml += '<a>'
-                }
-                adhtml += '<img src="' + ADTopList[i]["s_pic"] + '" alt="" style="height:125px;width:1200px"></a></div>'
-            }
-            if (ADTopList.length == 1) {
-                $(".swiper-pagination").hide();
-            }
-            if (adhtml != "") {
-                $(".banner .swiper-wrapper").html(adhtml);
-            }
+            // for (var i = 0; i < ADTopList.length; i++) {
+            //     var num = i + 1;
+            //     adhtml += '<div class="swiper-slide" onclick="adv_statistics(this)"  adv_name="微信搜索页轮播图' + num + '">'
+            //     if (ADTopList[i]["s_link"]) {
+            //         adhtml += '<a dataHref="' + ADTopList[i]["s_link"] + '">'
+            //     } else {
+            //         adhtml += '<a>'
+            //     }
+            //     adhtml += '<img src="' + ADTopList[i]["s_pic"] + '" alt="" ></a></div>'
+            // }
+            adhtml += '<img src="' + ADTopList[0]["s_pic"] + '" alt="" style="height:auto;width:100%;"></a></div>'
+            // if (ADTopList.length == 1) {
+            //     $(".swiper-pagination").hide();
+            // }
+            // if (adhtml != "") {
+            //     $(".banner .swiper-wrapper").html(adhtml);
+            // }
+            $(".banner .swiper-container").html(adhtml);
         }
         //dev2.9.7.2
-        var swiper1 = new Swiper('#swiper1', {
-            slidesPerView: 1,
-            spaceBetween: 20,
-            centeredSlides: true,
-            speed: 800,
-            autoplay: {
-                delay: 4000,
-                disableOnInteraction: false,
-            },
-            pagination: {
-                el: '.swiper-pagination',
-            },
-            paginationClickable: true,
-            loop: true,
-        });
-        swiper1.init();
+        // var swiper1 = new Swiper('#swiper1', {
+        //     slidesPerView: 1,
+        //     spaceBetween: 20,
+        //     centeredSlides: true,
+        //     speed: 800,
+        //     autoplay: {
+        //         delay: 500,
+        //         disableOnInteraction: false,
+        //     },
+        //     pagination: {
+        //         el: '.swiper-pagination',
+        //         clickable: true,
+        //     },
+        //     paginationClickable: true,
+        //     loop: true,
+        // });
+        // swiper1.init();
     </script>
 </section>
 <div class="dataExport-footer footer-one" style="display: none;">
@@ -1248,6 +1270,10 @@
         }, 500)
         sessionStorage.removeItem('refresh')
       }
+      var _this = this
+      setTimeout(function() {
+        _this.getStyle()
+      }, 500)
     },
     destroyed () {
       window.removeEventListener('scroll', this.handleScroll, true)
@@ -1283,6 +1309,54 @@
       }
     },
     methods: {
+      getStyle () {
+        // 嵌套到工作桌面的时候 底部悬浮元素样式单独修改
+        // parent.location.pathname.indexOf('/page_workDesktop') > -1
+        console.log(goTemplateData.inIframe, '111');
+        if (goTemplateData.inIframe) {
+          $('.conditions-box .progress_ div.pro').css({
+            'min-width': '250px'
+          })
+          $('.dataExport-footer.footer-one').css({
+              'width': 'calc(100% - 48px)',
+              'padding': '0 24px'
+          })
+          $('.dataExport-footer.footer-two.bottomfixed').css({
+            'left': '24px',
+            'width': 'calc(100% - 48px)',
+            'padding-right': '24px'
+          })
+          $('.data-footer-main').css({
+            'width': 'unset'
+          })
+          $('.fixedTr.data_fixed').css({
+              'margin': '48px auto 114px',
+              'width': 'calc(100% - 48px)'
+          })
+          $('.dataExport_option.data_fixed').css({
+              'margin': '0 auto 64px',
+              'width': 'calc(100% - 48px)'
+          })
+          $('.conditions-box').css({
+            'padding': '42px 24px 30px'
+          })
+        } else {
+          $('.fixedTr.data_fixed').css({
+              'margin': '114px auto',
+              'width': '1200px'
+          })
+          $('.dataExport_option.data_fixed').css({
+              'margin': '64px auto',
+              'width': '1200px'
+          })
+          $('.conditions-box').css({
+              'padding': '106px 0 30px'
+          })
+          $('.conditions-box .progress_ div.pro').css({
+            'min-width': '300px'
+          })
+        }
+      },
       renderImg () {
         var w=$(".d_gj").width();
         var h=$(".d_gj").height();
@@ -1339,15 +1413,24 @@
       },
       // 监听滚动
       handleScroll () {
+        this.getStyle()
         var st =
             window.pageYOffset ||
             document.documentElement.scrollTop ||
             document.body.scrollTop
-            console.log(st)
+            // console.log(st)
         var scrollSt = $(window).scrollTop()
         $bottomHeight = $('.j-bottom').outerHeight()
         var $bottomDom =  $(".j-bottom").offset().top;
-        if ($bottomDom - $bottomHeight > scrollSt + $bottomHeight) {
+        var swiperTop = $('#swiper1').offset().top
+        var swiperHeight = $('#swiper1').outerHeight()
+        var tabTop = 0
+        var tabHeight = 0
+        try {
+            tabTop = $('#dataExport_table').offset().top
+            tabHeight = $('#dataExport_table').outerHeight()
+        } catch (error) {}
+        if (swiperTop - $bottomHeight - swiperHeight > scrollSt) {
           setTimeout(() => {
             $('.footer-two').addClass('bottomfixed')
             $('.footer-one').hide()
@@ -1375,7 +1458,7 @@
             }
           }, 500)
         }
-        st > 1300 ? (this.isfixed = true) : (this.isfixed = false)
+        (st > tabTop && tabTop != 0) && (st <= tabTop + tabHeight && tabHeight != 0) ? (this.isfixed = true) : (this.isfixed = false)
         // 获取表格滚动距离
         // 标准字段包
         let $scrollLeft = document.querySelector('.previewData_bz canvas')

src/web/templates/pc/dataPack/paySuccess.html

@@ -17,7 +17,10 @@
     <link rel="stylesheet" type="text/css"
           href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}"/>
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}23"></script>
-</head>
+      <style>
+        .pay_success{padding-left: 24px;padding-right: 24px;}
+      </style>
+  </head>
 <body>
 <!-- header -->
 {{include "/common/pchead.html"}}
@@ -43,7 +46,7 @@
                 <span>支付方式</span>
                 <span id="payWay">数据流量包扣除</span>
             </p>
-            <a style="padding: 0 20px;width: auto;" class="check_order" href="/front/dataPack/index?type=history">查看数据导出记录</a>
+            <a style="padding: 0 20px;width: auto;" class="check_order" target="_blank" href="/front/dataPack/index?type=history">查看数据导出记录</a>
         </div>
     </div>
 </div>