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

@@ -416,10 +416,10 @@ var vNode = {
         type: 'POST',
         success: function (res) {
           if (res.error_code === 0) {
-            res.data.groupUseArr.forEach(function (item) {
+            res.data.groupUserArr.forEach(function (item) {
               item.name = item.s_name
             })
-            _this.groupingList = res.data.groupUseArr || []
+            _this.groupingList = res.data.groupUserArr || []
           }
         }
       })
@@ -894,7 +894,7 @@ var vNode = {
         data: {
           entId: _this.entInfo.id
         },
-        timeout: 6000,
+        // timeout: 6000,
         success: function (res) {
           if (res.error_code == 0) {
             if (res.data && Object.keys(res.data).length !== 0) {

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

@@ -395,10 +395,10 @@ var vNode = {
         type: 'POST',
         success: function (res) {
           if (res.error_code === 0) {
-            res.data.groupUseArr.forEach(function (item) {
+            res.data.groupUserArr.forEach(function (item) {
               item.name = item.s_name
             })
-            _this.groupingList = res.data.groupUseArr || []
+            _this.groupingList = res.data.groupUserArr || []
           }
         }
       })

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

@@ -78,8 +78,8 @@ var mobilePortrayalFooter = {
       default: false
     },
     entInfo: { // 监控分组
-      type: String,
-      default: ''
+      type: Object,
+      default: {}
     },
     customMonitor:{ // 是否自定义监控点击
       type: Boolean,

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

@@ -702,7 +702,7 @@
       :source-limit-map="sourceLimitMap"
       :source-map="sourceMap"
       :monitorshow="entInfo.followSearchFinish && entInfo.entExist"
-      :followed-group="entInfo.followedGroup"
+      :ent-info="entInfo"
       :allpower="powerInfo" 
       :monitor="!!entInfo.follow" 
       @change="changeGroupState"