Merge branch 'feature/v4.9.2' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.9.2

src/web/staticres/common-module/active/202402/202402.js

@@ -261,7 +261,11 @@ var task = new Vue({
       return t < 10 ? ('0' + t) : t
     },
     toLogin: function () {
-      location.href = '/jyapp/free/login?to=back'
+      if (this.platform === 'wx') {
+        utils.toWxGzhProfile()
+      } else {
+        location.href = '/jyapp/free/login?to=back'
+      }
     },
     doCopy: function () {
       var shareText = this.shareInfoPlatform.title || ''

src/web/staticres/common-module/public/js/utils.js

@@ -764,7 +764,11 @@ var utils = {
     } else {
         location.href = '/jyapp/free/customer'
     }
-},
+  },
+  // 去关注微信公众号页面
+  toWxGzhProfile: function () {
+    window.location.href = 'https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzk0MjIyMzY2Nw==&scene=110#wechat_redirect'
+  },
   moneyUnit: function (num, type, lv) {
     if (num === '' || num == null || num == undefined || isNaN(num)) return ''
     var levelArr = ['元', '万元', '亿元', '万亿元']

src/web/templates/pc/invoice.html

@@ -155,7 +155,7 @@
 	                <div class="text"></div>
 	            </div>
 	            <div class="modal-footer">
-	                <button type="button" class="btn btn-default" data-dismiss="modal" onclick="history.back()">我知道了</button>
+	                <button type="button" class="btn btn-default" data-dismiss="modal" id="i-know-btn">我知道了</button>
 	            </div>
 	        </div>
 	    </div>
@@ -251,6 +251,18 @@
           }
         })
         haslogin({{.T.logid}});
+        $('#i-know-btn').on('click', function () {
+            // 新窗口打开
+            // 判断窗口是不是window.open打开的
+            if (window.opener && window.opener !== window) {
+                window.close()
+            } else {
+                if (history.length <= 1) {
+                    window.close()
+                }
+                history.back()
+            }
+        })
       })
 	</script>
 </body>