Переглянути джерело

feat:公告留资判断调整

malin 3 роки тому
батько
коміт
c8e74e8b90

+ 2 - 2
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1225,11 +1225,11 @@
             $('#dialog-tip-title').text('想中标?提前介入很关键!')
             $(".dialog-tip-text").html('采购意向项目全公开,抢先获知采购项目需求,<br> 提前主动介入,中标几率更高!')
         }
-        if (canRead){
+        if (canRead== false){
             $('#dialog-tip-title').text('免费查看更多公告')
             $(".dialog-tip-text").html('请完善个人信息,获取更多免费查看公告权限')
         }
-        if (subtype == '拟建'||subtype == '采购意向' || canRead) {
+        if (subtype == '拟建'||subtype == '采购意向' || canRead== false) {
             $(".prebuilt").remove()
             $(".mask-zz").removeClass("hidden");
         } else {

+ 18 - 13
src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js

@@ -61,8 +61,6 @@ var temp = `
                       </el-option>
                     </el-select>
                   </el-form-item>
-                </div>
-                <div class="long-control" v-show="showBranch">
                   <el-form-item label="部门 :" prop="branch">
                     <el-select v-model="form.branch" placeholder="请选择部门" data-short-input clearable>
                       <el-option v-for="item in branchData" :key="item.value" :label="item.label" :value="item.value">
@@ -70,6 +68,8 @@ var temp = `
                     </el-select>
                   </el-form-item>
                 </div>
+                  
+                
               </div>
             </div>
             <div class="dialog-footer">
@@ -235,16 +235,20 @@ var vm = new Vue({
       }
     }
     var validBranch = function(rule,value,callback) {
-      if(this.form.job.indexOf('总裁') > -1 || this.form.job.indexOf('总经理') > -1){
-        this.from.branch = ""
-        return true
-      } else {
-        if(value === '') {
-          return callback(new Error('部门不能为空'));
-        } else  {
-            callback();
-         }
-      }
+      if(value === '') {
+        return callback(new Error('部门不能为空'));
+      } else  {
+          callback();
+       }
+      // if(this.form.job.indexOf('总裁') > -1 || this.form.job.indexOf('总经理') > -1){
+      //   this.from.branch = ""
+      // } else {
+      //   if(value === '') {
+      //     return callback(new Error('部门不能为空'));
+      //   } else  {
+      //       callback();
+      //    }
+      // }
      }
     return {
       dialogTitle: '为给您匹配精准的推荐信息,请完善个人信息',
@@ -311,7 +315,8 @@ var vm = new Vue({
         branch: [
           {
             required: true,
-            validator: validBranch
+            validator: validBranch,
+            trigger: 'blur'
           }
         ]
       },

+ 3 - 0
src/web/staticres/public-pc/js/article-content.js

@@ -474,6 +474,9 @@ $('.detail-nj-btn').click(function(){
   if (subType == '采购意向') {
     sourceKey = 'article_purchase_intention'
   }
+  if( canRead== false){
+    sourceKey="jyarticle_see3_plus_pc"
+  }
   bidVue.sourceLogAjax(sourceKey)
   vm.isNeedSubmit(sourceKey,function(){
     vm.showSuccess = true

+ 3 - 2
src/web/templates/pc/biddetail_rec.html

@@ -1366,11 +1366,12 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 				$(".tip-box .tip-text").eq(1).text('提前主动介入,中标几率更高!')
 			}
 			// 免费用户每日查看三次
-			if(canRead = false) {
+			if(canRead == false) {
 				$('#tip-title').text('免费查看更多公告!')
 				$(".tip-box .tip-text").eq(0).text('请完善个人信息,获取更多免费查看公告权限')
+				$(".tip-box .tip-text").eq(1).text('')
 			}
-			if ((subType == '拟建' || subType == '采购意向' || canRead) && !bidmember && !entniche && vip <=0 && !privatedata){
+			if ((subType == '拟建' || subType == '采购意向' || canRead==false) && !bidmember && !entniche && vip <=0 && !privatedata){
 				$(".com-prebuilt").removeClass("hidden");
 				$(".com-prebuilt").css('height', '408px')
 				$('.original-text').remove()

+ 2 - 2
src/web/templates/weixin/wxinfocontent_rec.html

@@ -1638,7 +1638,7 @@ function checkShowDialog () {
             $('#dialog-tip-title').text('免费查看更多公告')
             $(".dialog-tip-text").html('请完善个人信息,获取更多免费查看公告权限')
         }
-	if (subtype == '拟建'||subtype == '采购意向'|| canRead) {
+	if (subtype == '拟建'||subtype == '采购意向'|| canRead==false) {
 		$(".prebuilt").remove()
 		$(".mask-zz").removeClass("hidden");
     $(".reward").hide();
@@ -1657,7 +1657,7 @@ $('.free-btn-reword').on('click', function() {
 	if (subType == '采购意向') {
 		sourceKey = 'article_purchase_intention'
 	}
-	if( canRead) {
+	if( canRead==false) {
             location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=jyarticle_see3_plus_wx'
         }
 	//  留资判断