Merge branch 'dev/v4.9.93_tsz' of qmx/jy into feature/v4.9.93

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

@@ -417,7 +417,7 @@ var vNode = {
         success: function (res) {
           if (res.error_code === 0) {
             res.data.groupUserArr.forEach(function (item) {
-              item.name = item.s_name
+              item.s_name = item.name
             })
             _this.groupingList = res.data.groupUserArr || []
           }
@@ -1225,12 +1225,12 @@ var vNode = {
                 })
                 return
               }
-              if(!_this.powerInfo.isFree && !res.data.msg_open && res.data.status){
+              if(!res.data.msg_open && res.data.status){
                 _this.$dialog({
                   width: 303,
                   className: 'monitor-dialog',
                   title: '监控成功',
-                  message: '您可前往“工作台-商机-业主监控”查看业主最新招标动态。为保证您能及时获取新增监控信息推送，请前往开启推送提醒。',
+                  message: '您可前往“工作台-商机-企业情报监控”查看企业最新动态。为保证您能及时获取新增监控信息推送，请前往开启推送提醒。',
                   messageAlign:'center',
                   confirmButtonText: '去开启',
                   confirmButtonColor: '#2ABED1',
@@ -1243,10 +1243,10 @@ var vNode = {
                   window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=4'
                 })
         
-              } else if(!_this.powerInfo.isFree && res.data.msg_open && res.data.status){
+              } else if(res.data.msg_open && res.data.status){
                 _this.$toast({
                   duration: 2000,
-                  message: '监控成功，您可前往“工作台-商机-业主监控”查看'
+                  message: '监控成功，您可前往“工作台-商机-企业情报监控”查看'
                 })
         
               }
@@ -1820,7 +1820,6 @@ var vNode = {
         svipBuyset: this.svipBuyset,
         bidcollPowerInfo: this.bidcollPowerInfo,
         scrollTop: this.scrollTop + scrollTopOffset,
-        showGroupingDialog: this.showGroupingDialog,
         gotTab2: this.gotTab2
       }
       sessionStorage.setItem(this.sessKey, JSON.stringify(data))

src/jfw/modules/followent/src/web/templates/weixin/list.html

@@ -201,7 +201,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
                 sessionStorage.version="0";
             }
             $(this).find(".redspot").remove();
-            window.location.href = "/jylab/followent/detail/"+$(this).attr("data-id");
+            window.location.href = "/jylab/followent/detail/"+$(this).attr("data-id") + '?entId=' + $(this).attr("ent-id");
         });
 
         var flag = {{.T.flag}};

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

@@ -396,7 +396,7 @@ var vNode = {
         success: function (res) {
           if (res.error_code === 0) {
             res.data.groupUserArr.forEach(function (item) {
-              item.name = item.s_name
+              item.s_name = item.name
             })
             _this.groupingList = res.data.groupUserArr || []
           }
@@ -1175,12 +1175,12 @@ var vNode = {
                 })
                 return
               }
-              if(!_this.powerInfo.isFree && !res.data.msg_open && res.data.status){
+              if(!res.data.msg_open && res.data.status){
                 _this.$dialog({
                   width: 303,
                   className: 'monitor-dialog',
                   title: '监控成功',
-                  message: '您可前往“工作台-商机-业主监控”查看业主最新招标动态。为保证您能及时获取新增监控信息推送，请前往开启推送提醒。',
+                  message: '您可前往“工作台-商机-企业情报监控”查看企业最新动态。为保证您能及时获取新增监控信息推送，请前往开启推送提醒。',
                   messageAlign:'center',
                   confirmButtonText: '去开启',
                   confirmButtonColor: '#2ABED1',
@@ -1193,10 +1193,10 @@ var vNode = {
                   window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=4'
                 })
         
-              } else if(!_this.powerInfo.isFree && res.data.msg_open && res.data.status){
+              } else if(res.data.msg_open && res.data.status){
                 _this.$toast({
                   duration: 2000,
-                  message: '监控成功，您可前往“工作台-商机-业主监控”查看'
+                  message: '监控成功，您可前往“工作台-商机-企业情报监控”查看'
                 })
         
               }
@@ -1753,7 +1753,6 @@ var vNode = {
         svipBuyset: this.svipBuyset,
         bidcollPowerInfo: this.bidcollPowerInfo,
         scrollTop: this.scrollTop + scrollTopOffset,
-        showGroupingDialog: this.showGroupingDialog,
         gotTab2: this.gotTab2
       }
       sessionStorage.setItem(this.sessKey, JSON.stringify(data))

src/web/staticres/common-module/mobile-portrayal-footer/js/mobile-portrayal-grouping.js

@@ -62,7 +62,7 @@ var mobilePortrayalGroupingScript = {
     },
     showGroupingDialog: {
       type: Boolean,
-      default: true
+      default: false
     },
     groupingList: {
       type: Array,

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -705,7 +705,9 @@
       :ent-info="entInfo"
       :allpower="powerInfo" 
       :monitor="!!entInfo.follow" 
+      @lookmore="lookMore"
       @change="changeGroupState"
+      @lookdynamic="lookDynamic"
       @monitorclick="changeFollowState"
       :downshow="true"
       :islogin="isLogin"