Merge branch 'master' into feature/v4.8.89

src/web/staticres/common-module/share/js/invite-friends.js

@@ -4,15 +4,15 @@ var confMap = {
         swiperSlideList: [
             {
                 name: '开拓者',
-                url: '/common-module/share/img/explorer.png'
+                url: '/common-module/share/img/explorer.png?v=2024'
             },
             {
                 name: '学习达人',
-                url: '/common-module/share/img/learner.png'
+                url: '/common-module/share/img/learner.png?v=2024'
             },
             {
                 name: '投标达人',
-                url: '/common-module/share/img/master.png'
+                url: '/common-module/share/img/master.png?v=2024'
             },
         ],
     }
@@ -132,7 +132,7 @@ var shareContent = new Vue({
         initWxShare: function () {
           if (!utils.isWeiXinBrowser) { return }
           shareFn.init({
-            title: '「我的剑鱼标讯2022」年度总结已经生成，请查收',
+            title: '「我的剑鱼标讯2023」年度总结已经生成，请查收',
             desc: '点击领取你的年度总结',
             link: this.shareInfo.shareLink,
             imgUrl: 'https://cdn-ali.jianyu360.com/images/appext/share-icon.png'
@@ -233,7 +233,7 @@ var shareContent = new Vue({
             image.src = src
         },
         doAppShare (shareType) {
-          var shareTitle = '「我的剑鱼标讯2022」年度总结已经生成，请查收'
+          var shareTitle = '「我的剑鱼标讯2023」年度总结已经生成，请查收'
           var content = '点击领取你的年度总结'
           var link = this.shareInfo.shareLink + '?source=app_infocontentshare'
           if (shareType === 3) {

src/web/staticres/js/login.js

@@ -844,7 +844,7 @@ var haslogin = function(num,kyorpn,url){
           // 页面专用回调
           loginCallback(data)
         } catch (e) {}
-  
+
         encryptId = data.encryptId
         if(data.s_nickname!=null&&data.s_nickname.length>11){
           data.s_nickname = data.s_nickname.substring(0,11);
@@ -912,6 +912,7 @@ function loginBtnType(){
 ///////////////////////////////
 
 // ajax部分匿名函数自执行，防止泄露全局变量
+window.__wait_listen_modal__ = false
 $(function(){
   function goBackOrigin (cb) {
     var backOrigin = $.cookie('article')
@@ -1288,6 +1289,7 @@ $(function(){
 		$(".login-dig-tabbar-navbar>[name='pass']").click();
 		openLoginDig();
 	}
+  window.__wait_listen_modal__ = true
 	$("#bidLogin").on("show.bs.modal", function () {
         if ($('#bidLogin').attr('data-name') === 'bind-phone') {
             getNewVerify()
@@ -2094,6 +2096,10 @@ function openLoginDig(type, redirectUrl,Logincallback) {
 	        console.log('未初始化百度统计', e);
 	    }
 	}
+  if (!window.__wait_listen_modal__) {
+    var verify_path = "/front/landpage/captcha?v="
+    $("#bidLogin .verify-img").attr("src", verify_path + new Date().getTime());
+  }
   $("#bidLogin").modal("show");
   try {
     var injectLogic = logic

src/web/staticres/share/js/invite-friends.js

@@ -9,15 +9,15 @@ var confMap = {
         swiperSlideList: [
             {
                 name: '开拓者',
-                url: '/share/img/bi-report/explorer.png'
+                url: '/share/img/bi-report/explorer.png?v=2024'
             },
             {
                 name: '学习达人',
-                url: '/share/img/bi-report/learner.png'
+                url: '/share/img/bi-report/learner.png?v=2024'
             },
             {
                 name: '投标达人',
-                url: '/share/img/bi-report/master.png'
+                url: '/share/img/bi-report/master.png?v=2024'
             },
         ],
     }

src/web/templates/common/pc-login-dialog.html

@@ -2,6 +2,7 @@
 <!-- 依赖于pc公共头部样式以及 pc.css、bootstrap.css、bootstrap.js、jquery.js、login.js -->
 <div
   class="modal fade bidLogin"
+  data-name="pc-login-dialog"
   id="bidLogin"
   tabindex="-1"
   role="dialog"
@@ -43,7 +44,7 @@
           <i class="login-dig-icon-guard"></i>
           <input autocomplete="off" name="verify_code" type="text" placeholder="输入图形验证码" maxlength="4" />
           <div class="after-input-box">
-            <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify" />
+            <img data-name="verfiy-login" class="verify-img" src="" alt="verify" />
           </div>
         </div>
         <div class="login-dig-input-box" data-error="短信验证码输入错误">
@@ -173,7 +174,7 @@
           <i class="login-dig-icon-guard"></i>
           <input autocomplete="off" name="register_code" type="text" placeholder="输入图形验证码" maxlength="4" />
           <div class="after-input-box">
-            <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify" />
+            <img data-name="verfiy-login" class="verify-img" src="" alt="verify" />
           </div>
         </div>
         <div class="login-dig-input-box" data-error="短信验证码输入错误">