Merge branch 'dev4.6.3.14' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.14

src/jfw/modules/app/src/web/templates/common/js.html

@@ -5,5 +5,21 @@
   if (localStorage.getItem('env') !== 'development') {
       console.log = function () {}
   }
+  // 全局模版变量
+  window.goTemplateData = {
+    params: {{.T}},
+    session: {
+      s_avatar: {{session "s_avatar"}},
+      s_headimageurl: {{session "s_headimageurl"}},
+
+      phone: {{session "phone"}},
+      s_nickname: {{session "s_nickname"}},
+      app_name: {{session "app_name"}},
+      nickname: {{session "nickname"}},
+      user: {{session "user"}},
+    },
+    version: {{Msg "seo" "version"}},
+    cdn: {{Msg "seo" "cdn"}}
+  }
 </script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1248,15 +1248,15 @@
     $('.free-btn-reword').on('click', function() {
         var subType = {{.T.obj.subtype}}
         var sourceKey = 'article_slogan'
+        if(!canRead) {
+          sourceKey ="jyarticle_see3_plus_app"
+        }
         if (subType == '拟建') {
             sourceKey = 'article_proposed_project'
         }
         if (subType == '采购意向') {
             sourceKey = 'article_purchase_intention'
         }
-        if(!canRead) {
-            sourceKey ="jyarticle_see3_plus_app"
-        }
         //  留资判断
         location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + sourceKey
     })

src/web/staticres/js/pc-collect-user-info.js

@@ -473,14 +473,14 @@ var vm = new Vue({
         }
       }
       // 判断收藏留资显示
-      if (this.source == "article_collection"  ){
+      if (this.source == "article_collection"){
         for (var k in this.moduleShow) {
           this.moduleShow[k] = false
         }
 
       }
       //  判断阅读原文留资显示
-      if (vm.source = "article_original"  ){
+      if (vm.source = "article_original"){
         for (var k in vm.moduleShow) {
           vm.moduleShow[k] = false
         }

src/web/staticres/public-pc/js/article-content.js

@@ -468,17 +468,15 @@ function recoveryerr(ts,dcd,name){
 $('.detail-nj-btn').click(function(){
   var subType = goTemplateData.params.obj.subtype
   var sourceKey = 'article_slogan'
+  if(!canRead){
+    sourceKey="jyarticle_see3_plus_pc"
+  }
   if (subType == '拟建') {
     sourceKey = 'article_proposed_project'
   }
   if (subType == '采购意向') {
     sourceKey = 'article_purchase_intention'
   }
-  if( canRead){
-    $(".tabfat").remove()
-		$(".recoveryfat").remove()
-    sourceKey="jyarticle_see3_plus_pc"
-  }
   bidVue.sourceLogAjax(sourceKey)
   vm.isNeedSubmit(sourceKey,function(){
     vm.showSuccess = true

src/web/templates/pc/biddetail_rec.html

@@ -1348,7 +1348,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 	<script type="text/javascript">
 		var canRead = {{.T.canRead}}
     // 免费用户每日查看三次
-    if(!canRead) {
+    if(!(goTemplateData.params.obj.subtype == '采购意向' || goTemplateData.params.obj.subtype == '拟建') && !canRead) {
       $('#tip-title').text('免费查看更多公告')
       $(".tip-box .tip-text").eq(0).text('请完善个人信息，获取更多免费查看公告权限')
       $(".tip-box .tip-text").eq(1).text('')
@@ -1357,6 +1357,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
       $(".recoveryfat").hide()
       $("#attach-list").hide()
     }
+
 		//是否显示遮罩层
 		function checkShowDialog (res) {
 			var bidmember = false
@@ -1366,31 +1367,33 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			entniche = res.data.entniche
 			vip = res.data.vip
       privatedata = res.data.privatedata
-			var subType = {{.T.obj.subtype}}
+			var subType = goTemplateData.params.obj.subtype
 
 			// if(subType == '采购意向' && !bidmember && !entniche && vip <=0){
 			// 	$(".com-prebuilt").removeClass("hidden");
 			// }
+      // 免费用户每日查看三次
 			if (subType == '采购意向') {
 				$('#tip-title').text('想中标？提前介入很关键！')
 				$(".tip-box .tip-text").eq(0).text('采购意向项目全公开,抢先获知采购项目需求,')
 				$(".tip-box .tip-text").eq(1).text('提前主动介入,中标几率更高!')
 			}
-			if(subType == "拟建项目") {
+			if(subType == "拟建") {
 				$('#tip-title').text('拟建项目抢先获知')
 				$(".tip-box .tip-text").eq(0).text('提前获取正在审批中的新项目,比招标信息更超前!')
 				$(".tip-box .tip-text").eq(1).text('助您提前了解项目信息,把握重要商机!')
 			}
-			// 免费用户每日查看三次
-			if(!canRead) {
-				$('#tip-title').text('免费查看更多公告')
-				$(".tip-box .tip-text").eq(0).text('请完善个人信息，获取更多免费查看公告权限')
-				$(".tip-box .tip-text").eq(1).text('')
-				$(".tip-box .detail-nj-btn").text('立即解锁')
+
+      if(!(goTemplateData.params.obj.subtype == '采购意向' || goTemplateData.params.obj.subtype == '拟建') && !canRead) {
+        $('#tip-title').text('免费查看更多公告')
+        $(".tip-box .tip-text").eq(0).text('请完善个人信息，获取更多免费查看公告权限')
+        $(".tip-box .tip-text").eq(1).text('')
+        $(".tip-box .detail-nj-btn").text('立即解锁')
         $(".tabfat").remove()
         $(".recoveryfat").remove()
         $("#attach-list").remove()
-			}
+      }
+
 			if ((subType == '拟建' || subType == '采购意向' || !canRead) && !bidmember && !entniche && vip <=0 && !privatedata){
 				$(".com-prebuilt").removeClass("hidden");
 				$(".com-prebuilt").css('height', '408px')

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1658,15 +1658,15 @@ function checkShowDialog () {
 $('.free-btn-reword').on('click', function() {
 	var subType = {{.T.obj.subtype}}
 	var sourceKey = 'article_slogan'
+  if(!canRead) {
+    sourceKey = "jyarticle_see3_plus_wx"
+  }
 	if (subType == '拟建') {
 		sourceKey = 'article_proposed_project'
 	}
 	if (subType == '采购意向') {
 		sourceKey = 'article_purchase_intention'
 	}
-	if(!canRead) {
-    sourceKey = "jyarticle_see3_plus_wx"
-  }
 	//  留资判断
 	location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=' + sourceKey
 })