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

src/jfw/front/shorturl.go

@@ -447,14 +447,14 @@ func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bo
 	}
 	userPower := jy.GetBigVipUserBaseMsg(s.Session(), *config.Middleground)
 	var (
-		isEntnicheNew bool = userPower.EntIsNew                                                           //新版超级订阅
-		isOldVip      bool = false                                                                        //新购超级订阅不能查看拟建项目详情页
-		isVip         bool = userPower.VipStatus > 0                                                      //超级订阅
-		isMember      bool = userPower.Status > 0                                                         //大会员
-		isEntniche    bool = userPower.EntnicheStatus > 0                                                 //商机管理
-		privatedata   bool = userPower.PrivateGD                                                          //广东移动DICT 用户
-		isEntService  bool = userPower.Data.Ent.PowerSource > 0 && userPower.Data.Entniche.IsEntPower > 0 //商机管理服务
-		newCanRead         = false
+		isEntnicheNew = userPower.EntIsNew                                                           //新版超级订阅
+		isOldVip      = false                                                                        //新购超级订阅不能查看拟建项目详情页
+		isVip         = userPower.VipStatus > 0                                                      //超级订阅
+		isMember      = userPower.Status > 0                                                         //大会员
+		isEntniche    = userPower.EntnicheStatus > 0                                                 //商机管理
+		privatedata   = userPower.PrivateGD                                                          //广东移动DICT 用户
+		isEntService  = userPower.Data.Ent.PowerSource > 0 && userPower.Data.Entniche.IsEntPower > 0 //商机管理服务
+		newCanRead    = false
 	)
 	if res != nil && len(*res) > 0 {
 		if isVip && util.Int64All((*res)["l_vip_starttime"]) < util.Int64All(config.Sysconfig["contextOldVipLimit"]) {
@@ -1077,7 +1077,7 @@ func (s *Short) Qr(t, id string) error {
 		param += "&industry=" + industry
 	}
 	///article/bdprivate/BXXXX 详情页
-	if strings.HasPrefix(id, "B") {
+	if strings.Contains(s.Refer(), "bdprivate") {
 		bdprivateId := encrypt.CommonEncodeArticle("content", encrypt.CommonDecodeArticle("bdprivate", id)[0])
 		if bdprivateId != "" {
 			id = bdprivateId
@@ -1492,7 +1492,7 @@ func baseInfo(obj map[string]interface{}) string {
 		if obj["winnerMap"] != nil {
 			info += "，中标单位："
 			i := 0
-			for k, _ := range *util.ObjToMap(obj["winnerMap"]) {
+			for k := range *util.ObjToMap(obj["winnerMap"]) {
 				i++
 				info += k
 				if i != len(*util.ObjToMap(obj["winnerMap"])) {

src/jfw/modules/app/src/web/staticres/jyapp/me/js/account.js

@@ -31,7 +31,28 @@ var account = {
                     if(r.data.showWxBind) {
                         // 手机号用户
                         $('#wxInfo').hide();
-                        $('#bindWX').show();
+                        if (utils.$envs.inApp) {
+                          // 判断APP版本
+                          // 如果app版本号大于等于3.1.2则展示
+                          var currentVersion = ''
+                          var targetVersion = '3.1.2'
+                          try {
+                            currentVersion = JyObj.getVersion()
+                            if (currentVersion) {
+                              var c = compareVersion(currentVersion, targetVersion)
+                              this.fastButtonShow(!c)
+                              if (c) {
+                                $('#bindWX').show();
+                              }
+                            }
+                          } catch (error) {
+                            console.log(error)
+                          }
+                        } else {
+                          $('#bindWX').show();
+                        }
+
+
                         $('#bindPhone').show();
                         $('#phoneInfo').hide();
                     } else {
@@ -167,7 +188,7 @@ var account = {
                                             }
                                         });
                                     }else{
-                                        weui.toast(r.error_msg,{ 
+                                        weui.toast(r.error_msg,{
                                             duration: 2000,
                                             className: 'j-toast',
                                         });
@@ -244,7 +265,7 @@ function loginByWeixinCallBack(wxSign) {
                     }
                 }
             } else {
-                weui.toast('您选择的微信号已被绑定，请更换后重试',{ 
+                weui.toast('您选择的微信号已被绑定，请更换后重试',{
                     duration: 2000,
                     className: 'j-toast',
                 });
@@ -252,23 +273,23 @@ function loginByWeixinCallBack(wxSign) {
         },
         error: function(){
             loading.hide()
-            weui.toast('登录超时',{ 
+            weui.toast('登录超时',{
                 duration: 2000,
                 className: 'j-toast',
             });
         }
     });
 }
-$(function () {   
+$(function () {
     var u = navigator.userAgent;
     var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-    var isPageHide = false;   
-    window.addEventListener('pageshow', function () {   
-        if (isPageHide && isiOS) {   
-        window.location.reload();   
-        }   
-    });   
-    window.addEventListener('pagehide', function () {   
-        isPageHide = true;   
+    var isPageHide = false;
+    window.addEventListener('pageshow', function () {
+        if (isPageHide && isiOS) {
+        window.location.reload();
+        }
+    });
+    window.addEventListener('pagehide', function () {
+        isPageHide = true;
     });
-}) 
+})

src/jfw/modules/app/src/web/templates/me/account.html

@@ -77,7 +77,7 @@
                             </div>
                             <i class="van-icon van-icon-arrow van-cell__right-icon"></i>
                         </div>
-                        <div role="button" class="van-cell van-cell--clickable van-cell--center" id="bindWX">
+                        <div role="button" class="van-cell van-cell--clickable van-cell--center" id="bindWX" style="display: none">
                             <div class="weixin">
                                 <span class="wx-img"></span>
                             </div>

src/jfw/modules/app/src/web/templates/me/login.html

@@ -195,9 +195,9 @@
 	    <div class="footer-container">
         <div class="third-and-fast-login-container">
             <div class="fast-login-item">
-              <a href="javascript:void(0)" class="fast-login-open-link" style="display: none;">本机号码一键登录</a>
+              <a href="javascript:void(0)" class="fast-login-open-link no-right-line" style="display: none;">本机号码一键登录</a>
             </div>
-            <div class="fast-login-item wx">
+            <div class="fast-login-item wx" style="display: none;">
               <div class=" third_wx">
                 <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/me/images/login_wx.png?v={{Msg "seo" "version"}}">
               </div>
@@ -294,8 +294,23 @@
 
     function showWxLoginIcon(f) {
       if (f) {
-        $('.wx').show()
-        $('.fast-login-open-link').removeClass('no-right-line')
+        // 判断APP版本
+        // 如果app版本号大于等于3.1.2则展示
+        var currentVersion = ''
+        var targetVersion = '3.1.2'
+        try {
+          currentVersion = JyObj.getVersion()
+          if (currentVersion) {
+            var c = compareVersion(currentVersion, targetVersion)
+            this.fastButtonShow(!c)
+            if (c) {
+              $('.wx').show()
+              $('.fast-login-open-link').removeClass('no-right-line')
+            }
+          }
+        } catch (error) {
+          console.log(error)
+        }
       } else {
         $('.wx').hide()
         $('.fast-login-open-link').addClass('no-right-line')

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

@@ -1,62 +1,4 @@
 ;(function() {
-  function loadJS (url, success, inject) {
-    var scripts = document.getElementsByTagName('script')
-    for (var i = 0; i < scripts.length; i++) {
-      if (scripts[i].src && scripts[i].src.indexOf(url) > -1) {
-        if (success) success();
-        return;
-      }
-    }
-    var domScript = document.createElement('script');
-    domScript.src = url;
-    typeof inject === 'function' ? inject(domScript) : null;
-    success = success || function () {};
-    domScript.onload = domScript.onreadystatechange = function () {
-      if (!this.readyState || 'loaded' === this.readyState || 'complete' === this.readyState) {
-        success();
-        this.onload = this.onreadystatechange = null;
-        //this.parentNode.removeChild(this);
-      }
-    }
-    document.getElementsByTagName('head')[0].appendChild(domScript);
-  }
-  
-  function injectDevTools () {
-  
-    const devToolsAssets = [
-      'https://pagespy.jydev.jianyu360.com/page-spy/index.min.js',
-      'https://pagespy.jydev.jianyu360.com/plugin/data-harbor/index.min.js',
-      'https://pagespy.jydev.jianyu360.com/plugin/rrweb/index.min.js',
-    ]
-    const waitStates = [false, false, false]
-    function checkLoadState () {
-      const result = !waitStates.some(v => !v)
-      if (result) {
-        console.log('注入远程调试依赖成功')
-        window.$harbor = new DataHarborPlugin();
-        window.$rrweb = new RRWebPlugin();
-  
-        [window.$harbor, window.$rrweb].forEach(p => {
-          PageSpy.registerPlugin(p)
-        })
-  
-        window.$pageSpy = new PageSpy();
-      }
-    }
-    function loadToolsSuccess (i) {
-      waitStates[i] = true
-      checkLoadState()
-    }
-    for (let i = 0; i < devToolsAssets.length; i++) {
-      loadJS(devToolsAssets[i], () => {
-        loadToolsSuccess(i)
-      }, (scriptDom) => {
-        scriptDom.crossorigin = 'anonymous'
-      })
-    }
-  }
-  
-  injectDevTools();
   var host = location.host
   var hm = document.createElement("script");
   // 去除query后的location

src/web/templates/frontRouter/wx/activity/free/20250421.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="zh-CN" style="font-size: 50px;">
+
+<head>
+    <title>免费查看对接人联系方式</title>
+
+    {{include "/big-member/wx/meta.html"}}
+
+    <!--S-当前页面的css资源-->
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/weixin/css/public.css?v={{Msg "seo" "version"}}'>
+    <script src='{{Msg "seo" "cdn"}}/big-member/js/rem.js?v={{Msg "seo" "version"}}'></script>
+    <!--E-当前页面的css资源-->
+    <style>
+      body, main {
+        width: 100%;
+        height: 100%;
+      }
+      .h5-img {
+        display: block;
+        width: 100%;
+        min-height: 100%;
+        -webkit-user-drag: none;
+      }
+    </style>
+</head>
+
+<body>
+    <main>
+      <img class="h5-img" src="{{Msg "seo" "cdn"}}/frontRouter/wx/active/img/0421.jpg?v={{Msg "seo" "version"}}" alt="活动图片">
+    </main>
+
+    {{include "/big-member/commonjs.html"}}
+    {{include "/common/baiducc.html"}}
+</body>
+
+</html>

src/web/templates/pc/template/index/data-service-module.html

@@ -61,7 +61,7 @@
           </div>
         </footer>
         <header class="hot-industry-chart-header industry-report-header">
-          <h3 class="title-left-line">行业分析简报</h3>
+          <h3 class="title-left-line">行业分析报告</h3>
           <a href="/hybg/" target="_blank">查看更多</a>
         </header>
         <main class="industry-report-main">