Merge branch 'dev/v4.9.50_zsy' of qmx/jy into feature/v4.9.50

src/web/staticres/js/guide-intro-dialog.js

@@ -19,10 +19,10 @@ function GuideIntroDialog () {
                 contentType: 'application/json',
                 data: JSON.stringify(params),
                 success: function (r) {
-                    if (r.error_code === 0 && r.data && r.data["pc-guide"] && $.isArray(r.data[_this.ad]) && r.data["pc-guide"].length > 0) {
+                    if (r.error_code === 0 && r.data && r.data["pc-guide"] && $.isArray(r.data["pc-guide"]) && r.data["pc-guide"].length > 0) {
                         _this.$dialog.find('.content-iframe').attr('src', _this.iframeUrl)
                         _this.$dialog.modal('show')
-                        window.onload = function() {
+                        document.getElementById('guide-intro-image-iframe').onload = function() {
                           var list = r.data["pc-guide"]
                           var iframeWindow = document.getElementById('guide-intro-image-iframe').contentWindow
                           iframeWindow.guideContent.getActivityInfo(list) // 调用子页面的函数传递变量

src/web/staticres/public-pc/js/header-nav.js

@@ -395,13 +395,14 @@ function showGuideDialog () {
     window.guideIntroDialog = new GuideIntroDialog()
   }
 }
-
+// P599需求：登陆之后在哪个页面，就展示在哪个页面
 $(function () {
   var guideTimer = null
   if(guideTimer) clearTimeout(guideTimer)
   guideTimer = setTimeout(function () {
     if(loginflag && location.href.indexOf('/page_workDesktop/') < 0) {
       showGuideDialog()
+      if(guideTimer) clearTimeout(guideTimer)
     }
   }, 1000)
 })

src/web/templates/frontRouter/pc/pure/sess/guide-intro-dialog-content.html

@@ -113,25 +113,29 @@
                 this.getActivityInfo()
             },
             methods: {
+              //P599需求该引导广告，每个用户每月只会展示一次，服务端会标记次数，超过1次会返回空，注意多次调用pc-guide引发的问题
                 getActivityInfo: function (list) {
-                  this.imageList = list
-                    // var _this = this
-                    // var codes = [this.ad]
-                    // var params = {
-                    //     codes: codes
-                    // }
-                    // $.ajax({
-                    //     type: 'post',
-                    //     url: '/publicapply/free/getJyAdList',
-                    //     contentType: 'application/json',
-                    //     data: JSON.stringify(params),
-                    //     success: function (r) {
-                    //         if (r.error_code === 0 && r.data && $.isArray(r.data[_this.ad]) && r.data[_this.ad] && r.data[_this.ad].length > 0) {
-                    //             var adList = r.data[_this.ad]
-                    //             _this.imageList = adList
-                    //         }
-                    //     }
-                    // })
+                  if(list) {
+                    this.imageList = list
+                    return
+                  }
+                  var _this = this
+                  var codes = [this.ad]
+                  var params = {
+                    codes: codes
+                 }
+                 $.ajax({
+                    type: 'post',
+                    url: '/publicapply/free/getJyAdList',
+                    contentType: 'application/json',
+                    data: JSON.stringify(params),
+                    success: function (r) {
+                        if (r.error_code === 0 && r.data && $.isArray(r.data[_this.ad]) && r.data[_this.ad] && r.data[_this.ad].length > 0) {
+                            var adList = r.data[_this.ad]
+                            _this.imageList = adList
+                        }
+                    }
+                  })
                 }
             }
         })