Merge remote-tracking branch 'origin/feature/v4.9.40' into feature/v4.9.40

src/web/staticres/big-member/js/utils.js

@@ -256,6 +256,44 @@ var utils = {
 
         return true;
     },
+    /**
+ * 应用场景：1.翻页后页面滚动到列表第一条的位置
+ * @param targetEvent 页面要滚动到的目标元素
+ */
+    scrollTargetView (targetEvent, custom) {
+      if (!targetEvent) return
+      let scrollWrapper
+      let targetTop
+      const inWorkSpace = location.href.indexOf('work-bench') > -1
+      if (inWorkSpace) {
+        // 工作桌面内（qiankun、iframe）
+        const offsetHeight = document.querySelector('.el-header')?.offsetHeight
+        const inApp = window.__POWERED_BY_QIANKUN__
+        if (inApp) {
+          // qiankun
+          const appNode = document.querySelector('#app-container > div').shadowRoot
+          targetTop = appNode?.querySelector(targetEvent)?.offsetTop
+          scrollWrapper = document.querySelector('.el-main')
+          scrollWrapper.scrollTop = targetTop - offsetHeight
+        } else {
+          // iframe
+          const iframeNode = document.querySelector('#work-bench-container iframe')?.contentDocument
+          targetTop = iframeNode.querySelector(targetEvent)?.offsetTop
+          scrollWrapper = iframeNode.body
+        }
+        // console.log(`工作桌面内${inApp ? 'qiankun' : 'iframe'}---滚动元素：${scrollWrapper.className}, 滚动距离：${targetTop}`)
+        scrollWrapper.scrollTop = targetTop - offsetHeight
+      } else {
+        // 非工作桌面
+        targetTop = document.querySelector(targetEvent)?.offsetTop
+        // 因浏览器及模式差异,页面滚动元素存在不同（标准模式：document.documentElement；兼容模式：body）
+        // scrollingElement可获取页面滚动元素
+        console.info(targetTop, 'targetTop');
+        scrollWrapper = document.scrollingElement
+        scrollWrapper.scrollTop = targetTop + custom
+        // console.log(`非工作桌面---滚动元素：${scrollWrapper.className ? scrollWrapper.className : scrollWrapper.tagName}, 滚动距离：${targetTop}`)
+      }
+    },
     // 判断变量是否是数组
     isArray: function (o){
         return Object.prototype.toString.call(o) == '[object Array]';

src/web/staticres/common-module/appPay/css/popup.css

@@ -4,7 +4,7 @@
 .vip-back-tip-wrapper .popupBox {
   width: 6.06rem;
   background-image: url("../img/popup-bg.png");
-  background-size: cover;
+  background-size: contain;
   background-repeat: no-repeat;
   border-radius: 0.24rem;
 }

src/web/staticres/css/ele-reset.css

@@ -67,7 +67,7 @@
     position: absolute;
     right: 16px;
 }
-.el-pagination-container .el-pagination .el-input__suffix {
+.el-pagination .el-input__suffix {
   display: unset!important;
 }
 .el-pagination.is-background .el-pager li {

src/web/staticres/frontRouter/pc/my_data_packet/js/index-pc.js

@@ -147,11 +147,17 @@ var vm = new Vue({
         this.chargeList.pageNum = page
         this.chargeList.list = []
         this.chargeDetail()
+        this.$nextTick(() => {
+          utils.scrollTargetView('.online-recharge', 120)
+        })
       },
       getPageData2(page) {
         this.exportList.pageNum = page
         this.exportList.list = []
         this.exported()
+        this.$nextTick(() => {
+          utils.scrollTargetView('.data-export-record', 120)
+        })
       },
       onSizeChange1: function (val) {
         this.chargeList.list = []

src/web/templates/common/pcbottom.html

@@ -165,7 +165,7 @@
             <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/shangwuhezuo-blue.png?v={{Msg "seo" "version"}}' alt=""></span>
             <p class="desc_text_b">商务合作</p>
             <div class="slidePop">
-                <img src="{{Msg " seo" "cdn" }}/common-module/exhibition/img/qr-code-shichang.png?v={{Msg "seo" "version"}}" alt="">
+                <img src="{{Msg " seo" "cdn" }}/common-module/exhibition/img/qr-code-shichang-new.png?v={{Msg "seo" "version"}}" alt="">
                 <p>微信扫一扫<br>商务合作</p>
             </div>
         </div>

src/web/templates/frontRouter/pc/cooperation/free/index.html

@@ -33,7 +33,8 @@
       <img class="text-partner" src="{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/partner.png" alt="">
       <p class="text-title">聚合百万客户，共同拓展销售商机，领跑市场！</p>
       <button class="btn-join button-blink" onclick="openLink()">邀您加入</button>
-      <img style="width: 184px;margin-top: -82px;margin-left: 272px;" src='{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/qr.png?v={{Msg "seo" "version"}}' alt="联系我们">
+      <img style="width: 90px;margin-top: -82px;margin-left: 272px;" src='{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/qr-banner.png?v={{Msg "seo" "version"}}' alt="联系我们">
+      <img style="width: 90px;margin-top: -84px;margin-left: 362px;" src='{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/qr-banner-right.png?v={{Msg "seo" "version"}}' alt="联系我们">
     </div>
   </div>
   <main class="cooperation-page-join w">

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

@@ -81,10 +81,11 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="up-line up-biao">
+                        <div class="up-line up-biao online-recharge">
                             <h3>线上自助充值明细</h3>
                             <div class="biao-ge" v-if="chargeList.list">
                                 <el-table
+                                    class="online-recharge"
                                     v-loading="dLoading"
                                     :data="chargeList.list"
                                     style="width: 100%;color:#1d1d1d"
@@ -138,6 +139,7 @@
                         <div class="up-biao">
                             <div class="biao-ge">
                                 <el-table
+                                    class="data-export-record"
                                     v-loading="isLoading"
                                     :data="exportList.list"
                                     style="width: 100%;color:#1d1d1d;cursor: pointer;"
@@ -226,6 +228,7 @@
     </script>
     <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
     <script src=//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.13-rc/lib/index.js></script>
+    <script src="{{Msg "seo" "cdn"}}/big-member/js/utils.js"></script>
     <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/my_data_packet/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
 </body>
 

src/web/templates/pc/myOrder.html

@@ -668,6 +668,7 @@
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
 <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/big-member/js/utils.js"></script>
 <script src="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.13-rc/lib/index.js"></script>
 <script>
   var myPageNavIsNormal = true
@@ -1798,6 +1799,9 @@
             tabIndex: $Index,
             pageNum: this.pageNum,
           })
+          this.$nextTick(() => {
+            utils.scrollTargetView('.order_content')
+          })
         },
         onSizeChange: function(size) {
           this.pageNum = 1