Kaynağa Gözat

Merge branch 'master' into feature/v4.8.46

lianbingjie 2 yıl önce
ebeveyn
işleme
1486988b46

+ 40 - 0
src/web/staticres/common-module/message-tip/css/index.css

@@ -0,0 +1,40 @@
+/* 模态提示框  css*/
+
+.text-overflow100 .weui-toast {
+  margin-left: 0;
+  width: 4.5rem;
+  min-height: .42rem;
+  font-size: 20px;
+  /* -webkit-transform: translateX(-50%);
+          transform: translateX(-50%); */
+    transform: translate(-50%, -30%);
+
+  }
+  .text-overflow100 .weui-icon_toast {
+    margin: 0;
+  }
+
+
+  .j-toast .weui-toast {
+    font-size: 0.3rem;
+    padding: 0.15rem 0.2rem;
+    max-width: 6rem;
+    min-height: 0;
+    width: auto;
+    height: auto;
+    top: 45%;
+    left: 50%;
+    margin-left: 0;
+    transform: translate(-50%, -50%);
+    background-color: rgba(0, 0, 0, 0.72) !important;
+    border-radius: 8px;
+  }
+
+  .j-toast .weui-icon_toast {
+    display: none;
+  }
+
+  .j-toast .weui-toast__content {
+    margin: 0;
+    color: #FFFFFF;
+  }

+ 178 - 0
src/web/staticres/common-module/message-tip/js/index.js

@@ -0,0 +1,178 @@
+/**
+ * 获取动态广告栏属性
+ * @param type
+ * @returns {Object|*}
+ */
+
+// url转base64 方法
+// base64 编码
+function getBase64Image(img) {
+  var canvas = document.createElement('canvas')
+  canvas.width = img.width
+  canvas.height = img.height
+  var ctx = canvas.getContext('2d')
+  ctx.drawImage(img, 0, 0, img.width, img.height)
+  var dataURL = canvas.toDataURL('image/png')
+  return dataURL
+}
+
+function getImage64Url(url, ref) {
+
+  // var that = this
+  var image = document.createElement('img')
+  image.setAttribute('crossorigin', 'anonymous')
+  image.src = url + '?v=' + Math.random() // 处理缓存
+  image.crossOrigin = 'anonymous'
+  image.onload = function () {
+    var base64 = getBase64Image(image)
+    console.log(base64);
+  }
+}
+
+// var ua = window.navigator.userAgent
+// let _isIOS     = -1;
+// function isIOS() {
+//   if (_isIOS === -1) {
+//     _isIOS = /iPhone|iPod|iPad/i.test(ua) ? 1 : 0;
+//   }
+//   return _isIOS === 1;
+// }
+
+
+var getActive = {
+  // 版本号
+  version: '0.0.1',
+  drawBase64Image: function (img) {
+    var canvas = document.createElement('canvas')
+    canvas.width = img.width
+    canvas.height = img.height
+    var ctx = canvas.getContext('2d')
+    ctx.drawImage(img, 0, 0, img.width, img.height)
+    var dataURL = canvas.toDataURL('image/png')
+    return dataURL
+
+  },
+  /**
+   * 获取后台广告方法
+   * @param {Array|String} active_codes_map 广告id标识符--数组集合["jy-wx-course-pay-success"]
+   * @param {String} active_tip_group 展示广告的容器demo节点
+   * @param {String} isAppsion 请求环境、app、weixin、pc
+   * @returns {Object|Array}
+   */
+  getActiveInfo: function (active_codes_map,isAppsion) {
+    // 如果执行环境是app
+    var isAppsionApp = isAppsion === 'App'
+    $.ajax({
+      url: '/publicapply/free/getJyAdList',
+      type: 'POST',
+      dataType: "json",
+      traditional: true,
+      //强制请求头数据格式 'application/json'
+      headers: {'Content-Type': 'application/json'},
+      data:active_codes_map,
+        // JSON.stringify({codes:["jy-wx-course-pay-success","jy-pc-dataPackage-pay-success"] })
+        // JSON.stringify()
+    }).done(function (res) {
+      // res.error_code =1
+      // Object.value 兼容处理
+      Object.values = function (obj) {
+        return Object.keys(obj).map(function(e) {
+          return obj[e]
+        })
+      }
+      if (res.error_code === 0 && res.data && Object.values(res.data)[0] && Object.values(res.data)[0] !=null && Object.values(res.data)[0][0]) {
+        // weixin、pc环境
+        var img = new Image()
+        var imgsrcArr = Object.values(res.data)[0][0]
+        img.src = imgsrcArr.s_pic
+         img.onload= function() {
+          $(".active-tip-group").show()
+        }
+        $(".active-tip-group img").attr('src', imgsrcArr.s_pic + '?v=' + Math.random())
+
+        // 如果是app环境 ,调用原生方法、执行保存
+        // var isAppsionType = isAppsionApp || utils.isIos || utils.isAndroid
+        var that = this
+        var isAppsionType = isAppsionApp
+        if (isAppsionType) {
+
+          // APP 保存图片
+          $('.active-tip-group').off('click').on('click', function () {
+            if(!window.picImgUrl) {
+                html2canvas(document.querySelector('.active-tip-group'), {
+                    // allowTaint: true,
+                    useCORS: true,
+                    backgroundColor: null,
+                    scale: 3,
+                    imageTimeout: 30000,
+                    allowTaint: true, // 允许跨域图片
+                }).then(function(canvas) {
+                    var imgUrl = imgsrcArr.base64 || canvas.toDataURL('image/png')
+                    console.log(imgUrl)
+                    // $(".active-tip-group img").attr('src', imgUrl)
+                    imgUrl = imgUrl.replace('data:image/png;base64,', '')
+                    // console.log(imgUrl)
+                    window.picImgUrl = imgUrl
+                    try {
+                      window.JyObj.savePic(imgUrl)
+
+                      setTimeout(function() {
+                          weui.toast('图片已保存,快去扫码识别吧', {
+                            duration: 800,
+                            className: 'text-overflow100'
+                          })
+                        }, 2300)
+
+                    } catch (e) {
+                      weui.toast('保存失败', {
+                        duration: 800,
+                        className: 'j-toast'
+                      })
+                      console.log(e)
+                      // location.href=imgsrcArr.s_link
+                    }
+                })
+            }else {
+                window.JyObj.savePic(window.picImgUrl)
+                setTimeout(function() {
+                  weui.toast('图片已保存,快去扫码识别吧', {
+                    duration: 800,
+                    className: 'text-overflow100'
+                  })
+                }, 2300)
+            }
+         })
+        } // App打开新窗口等 用 @param {String} isAppsion === 'Applink'
+        else if ((isAppsion === 'Applink') && imgsrcArr.o_extend && imgsrcArr.o_extend.linktype === 'abroad') {
+          $(".active-tip-group").on('click', function () {
+            try {
+              JyObj.openExternalLink(imgsrcArr.s_link, imgsrcArr.o_extend.title || '剑鱼标讯');
+            } catch (e) {
+              console.log(e);
+            }
+          })
+          if (isIOS()) {
+            $('.rules').css('margin-top', '0.28rem')
+          }
+        } else {
+          // weixin、pc环境 直接跳转
+          if (imgsrcArr.s_link) {
+            $(".active-tip-group").on('click', function () {
+              try {
+                location.href=imgsrcArr.s_link
+              } catch (e) {
+                console.log(e);
+              }
+            })
+          }
+        }
+      } else {
+        $('.rules').css('margin-top', '0.8rem')
+        $('.ad_space').hide()
+        $('.login-dig-box').css('left', 'calc(50vw - 181px)')
+      }
+    })
+  }
+}
+
+

Dosya farkı çok büyük olduğundan ihmal edildi
+ 292 - 0
src/web/staticres/common-module/message-tip/js/msgbuoy.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
src/web/staticres/public-pc/js/detection-min.js


+ 10 - 2
src/web/staticres/public-pc/js/detection.js

@@ -3,9 +3,9 @@
     try {
       Sentry.init({
         dsn: "https://ea0521e5b3584ca1879b940c165916e4@jysentry.jydev.jianyu360.cn/3",
-        release: "v8.8.48.2",
+        release: "v8.9.45.4",
         environment: "produce",
-        sampleRate: 0.01
+        sampleRate: 0.02
       });
       Sentry.setTag("url", location.href);
       var id = document.cookie.match(/(^|;)\s*ud_safe\s*=\s*([^;]+)/);
@@ -187,6 +187,13 @@
       margin: 6px;
       cursor: pointer;
     }
+    .cdn-tip--dialog .close-tip--dialog {
+      position: absolute;
+      cursor: pointer;
+      right: 0;
+      top: 0;
+      padding: 8px;
+    }
   </style>
 `
     document.head.appendChild(cdnStyle)
@@ -194,6 +201,7 @@
     const cdnNode = document.createElement('div')
     cdnNode.innerHTML = `
     <div class="cdn-tip--dialog show ${confirm ? '' : 'action-tip'}" id="cdn-tip">
+      <div class="close-tip--dialog" onclick="document.querySelector('#cdn-tip').remove();">关闭</div>
       <p>
         ${content}
       </p>

+ 3 - 3
src/web/templates/common/pchead.html

@@ -1,5 +1,5 @@
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/public-pc/css/header-nav.css?v={{Msg "seo" "version"}}">
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/common-module/ad/css/index.css?v={{Msg "seo" "version"}}">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/common-module/message-tip/css/index.css?v={{Msg "seo" "version"}}">
 {{$TopMenu := JyTopMenu .Request.URL.Path}}
 <section class="public-nav" id="public-nav" style="display: none">
   <div class="advertising_position">
@@ -164,14 +164,14 @@
 <script src='{{Msg "seo" "cdn"}}/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/message.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/public-pc/js/header-nav.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}'></script>
 
 <!-- 产品介绍弹窗 -->
 {{include "/common/guide-intro-dialog.html"}}
 
 <!-- 浮漂消息公共js方法 -->
 <!-- defer表示最后执行 -->
-<script defer src='{{Msg "seo" "cdn"}}/common-module/ad/js/msgbuoy.js?v={{Msg "seo" "version"}}'></script>
+<script defer src='{{Msg "seo" "cdn"}}/common-module/message-tip/js/msgbuoy.js?v={{Msg "seo" "version"}}'></script>
 <script>
   var Activedatastring = 'register'
   var ActivedataType = 'jy-pc-'+ Activedatastring+ '-login'

+ 1 - 1
src/web/templates/course/pc/paySuccess.html

@@ -259,7 +259,7 @@
 		{{include "/common/baiducc.html"}}
     </body>
 	<!-- 广告位加载 公共js方法 -->
-	<script src="{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}"></script>
+	<script src="{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}"></script>
 	<script>
 		// 根据支付订单类型 加载广告位
     // 超级订阅、数据流量包、数据导出(线上支付方式)、课程产品

+ 2 - 2
src/web/templates/course/weixin/paySuccess.html

@@ -196,7 +196,7 @@
 	{{include "/common/baiducc.html"}}
 </body>
 <!-- 广告位加载 公共js方法 -->
-<script src="{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}"></script>
 <script>
 
     // 根据支付订单类型 加载广告位
@@ -218,4 +218,4 @@
 
     // }
 </script>
-</html>
+</html>

+ 1 - 1
src/web/templates/order/pc/paySuccess.html

@@ -158,7 +158,7 @@
 
 <script src='{{Msg "seo" "cdn"}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}'></script>
 <!-- 广告位加载 公共js方法 -->
-<script src="{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}"></script>
 
 <script type="text/javascript">
     var myPageNavIsNormal = true;

+ 2 - 2
src/web/templates/site/common/pc-help-center-head.html

@@ -1,5 +1,5 @@
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/site/common/css/pc-help-center-head.css?v={{Msg "seo" "version"}}'>
-<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/ad/css/index.css?v={{Msg "seo" "version"}}'>
+<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/message-tip/css/index.css?v={{Msg "seo" "version"}}'>
 
 <section class="public-nav" id="public-nav" style="display: none">
   <div class="iner">
@@ -162,7 +162,7 @@
 <script src='{{Msg "seo" "cdn"}}/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/message.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/site/common/js/pc-help-center-head.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}'></script>
 
 <script>
   var Activedatastring = 'register'

+ 3 - 3
src/web/templates/site/common/pc-school-head.html

@@ -1,5 +1,5 @@
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/site/common/css/pc-school-head.css?v={{Msg "seo" "version"}}'>
-<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/ad/css/index.css?v={{Msg "seo" "version"}}'>
+<link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/message-tip/css/index.css?v={{Msg "seo" "version"}}'>
 
 <section class="public-nav" id="public-nav" style="display: none">
   <div class="iner">
@@ -71,7 +71,7 @@
 <script src='{{Msg "seo" "cdn"}}/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/message.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/site/common/js/pc-school-head.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}'></script>
 
 <script>
   var Activedatastring = 'register'
@@ -188,7 +188,7 @@
           return
         case 'doc':
           $('.school-head-input').attr('placeholder', '海量文档,供您搜索')
-          return 
+          return
         default:
           $('.school-head-input').attr('placeholder', '想看什么?搜一搜')
           return

+ 1 - 1
src/web/templates/weixin/commonPay/paySuccess.html

@@ -140,7 +140,7 @@
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}"></script>
 <!-- 广告位加载 公共js方法 -->
-<script src="{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}"></script>
 <script>
   var nowType = {{.T.doType}}
   var orderType = {{.T.doType}}

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_paySuccess.html

@@ -131,7 +131,7 @@
 {{include "/common/baiducc.html"}}
 </body>
 <!-- 广告位加载 公共js方法 -->
-<script src="{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}"></script>
 <script>
 
     var orderType = {{.T.orderType}}

+ 2 - 2
src/web/templates/weixin/me/account/phone_bind.html

@@ -11,7 +11,7 @@
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href="/big-member/css/public.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" href="/big-member/css/j-icons.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" href="/common-module/ad/css/index.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href="/common-module/message-tip/css/index.css?v={{Msg "seo" "version"}}" />
    {{include "/common/weixin.html"}}
     <style>
         textarea {
@@ -209,7 +209,7 @@
     <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
     <script src='/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
     <script src='/me/js/phone_bind.js?v={{Msg "seo" "version"}}'></script>
-    <script src='/common-module/ad/js/index.js?v={{Msg "seo" "version"}}'></script>
+    <script src='/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}'></script>
     <!--S 加载荟聚SDK初始化及剑鱼自定义埋点注入 -->
     <script src='{{Msg "seo" "cdn"}}/common-module/public/fotter.js?v={{Msg "seo" "version" }}'></script>
     <!--E 加载荟聚SDK初始化及剑鱼自定义埋点注入 -->

+ 1 - 1
src/web/templates/weixin/vipsubscribe/vip_pay_success.html

@@ -75,7 +75,7 @@
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 
 <!-- 广告位加载 公共js方法 -->
-<script src="{{Msg "seo" "cdn"}}/common-module/ad/js/index.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/common-module/message-tip/js/index.js?v={{Msg "seo" "version"}}"></script>
 <script>
   var title = {{.T.title}}
 //   if (title.indexOf('超级订阅') !== -1) {

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor