Merge branch 'dev/v4.9.6_cyl' of qmx/jy into feature/v4.9.6

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_buyer_project_news.js

@@ -328,6 +328,8 @@ var vConfig = {
                         loading.clear()
                         if (res.data === 'success' || res.data.status) {
                             _this.entInfo.follow = !_this.entInfo.follow
+                        } else {
+                            _this.showToast(res.error_msg || '监控失败')
                         }
                     } else {
                         _this.showToast(res.error_msg)

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_follow_search.js

@@ -110,6 +110,8 @@ var vNode = {
                         loading.clear()
                         if (res.data === 'success' || res.data.status) {
                             item.follow = !item.follow
+                        } else {
+                            _this.showToast(res.error_msg || '监控失败')
                         }
                     } else {
                         _this.showToast(res.error_msg)

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -976,6 +976,8 @@ var vNode = {
             loading.clear()
             if (res.data === 'success' || res.data.status) {
               _this.entInfo.follow = !_this.entInfo.follow
+            } else {
+              return _this.showToast(res.error_msg || '监控失败')
             }
             if(_this.entInfo.follow) {
               _this.pointsTaskSuccessTip()

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/potential_cor_list.js

@@ -345,6 +345,8 @@ var vConfig = {
                                 _this.showToast('已添加至企业情报内')
                             }
                             item.follow = !item.follow
+                        } else {
+                            _this.showToast(res.error_msg || '监控失败')
                         }
                     } else {
                         _this.showToast(res.error_msg)

src/web/staticres/big-member/js/ent_portrait.js

@@ -476,6 +476,8 @@ var vNode = {
                         loading.clear()
                         if (res.data === 'success' || res.data.status) {
                             _this.entInfo.follow = !_this.entInfo.follow
+                        } else {
+                            return _this.showToast(res.error_msg || '监控失败')
                         }
 
                         if (!_this.entInfo.follow) {

src/web/staticres/common-module/big-member/js/buyer_project_news.js

@@ -506,6 +506,8 @@ var vConfig = {
                         loading.clear()
                         if (res.data === 'success' || res.data.status) {
                             _this.entInfo.follow = !_this.entInfo.follow
+                        } else {
+                            return _this.showToast(res.error_msg || '监控失败')
                         }
                     } else {
                         _this.showToast(res.error_msg)

src/web/staticres/common-module/big-member/js/ent_project_news.js

@@ -528,6 +528,8 @@ var vConfig = {
                         loading.clear()
                         if (res.data === 'success' || res.data.status) {
                             _this.entInfo.follow = !_this.entInfo.follow
+                        } else {
+                            return _this.showToast(res.error_msg || '监控失败')
                         }
                     } else {
                         _this.showToast(res.error_msg)

src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -947,6 +947,8 @@ var vNode = {
             loading.clear()
             if (res.data === 'success' || res.data.status) {
               _this.entInfo.follow = !_this.entInfo.follow
+            } else {
+              return _this.showToast(res.error_msg || '监控失败')
             }
             if(_this.entInfo.follow) {
               _this.pointsTaskSuccessTip()

src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -615,13 +615,13 @@ var vNode = {
       this.signId = decodeURIComponent(utils.getParam('signId'))
     }
     this.sourceLogAjax(this.ajaxParams.source)
-    this.checkLabels()
     this.notit_group_init()
   },
   mounted: function () {
     // app头部默认隐藏检查
     this.checkHeaderShow()
     this.ajaxGetEchoInfo()
+    this.checkLabels()
     this.bigDocAjax('ICRP') // 进入留资页面埋点
     // this.fromBuyerAjax('isICRP') // 采购单位画像、企业画像进来埋点
     if (utils.isWeiXinBrowser) {
@@ -923,7 +923,8 @@ var vNode = {
           }
         default: {
           // 标书制作或者三方认证(case语句满足不了条件，放default中做更多判断)
-          if (source === 'bid_document_Introduction_page' || source.indexOf('certificateServices') > -1) {
+          var biaoshu = source === 'bid_document_Introduction_page' || source.indexOf('article_BidPreparation') > -1
+          if (biaoshu || source.indexOf('certificateServices') > -1) {
             this.hideLabel(['email', 'class', 'position', 'workScope', 'partnerNeeds', 'agree'])
             break
           }
@@ -1010,7 +1011,8 @@ var vNode = {
         if (r && r.error_msg === '' && r.data) {
           this.setEchoInfo(r.data)
           var requiredKeys = []
-          if (this.ajaxParams.source === 'bid_document_Introduction_page' || this.ajaxParams.source.indexOf('certificateServices') > -1) {
+          var biaoshu = source === 'bid_document_Introduction_page' || source.indexOf('article_BidPreparation') > -1
+          if (biaoshu || this.ajaxParams.source.indexOf('certificateServices') > -1) {
             // 标书制作或者三方认证(case语句满足不了条件，放default中做更多判断)
             requiredKeys = ['name', 'phone', 'company','companyType']
           } else {
@@ -1659,8 +1661,9 @@ var vNode = {
                   break
                 }
               default: {
+                var biaoshu = source === 'bid_document_Introduction_page' || source.indexOf('article_BidPreparation') > -1
                 // 标书制作或者三方认证(case语句满足不了条件，放default中做更多判断)
-                if (source === 'bid_document_Introduction_page' || source.indexOf('certificateServices') > -1 || source === 'telecom_solution') {
+                if (biaoshu || source.indexOf('certificateServices') > -1 || source === 'telecom_solution') {
                   _this.bidShow = true
                   break
                 }