Merge branch 'dev/v4.8.23.2_yf' of qmx/jy into hotfix/v4.8.23.2

src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html

@@ -561,16 +561,17 @@
             } else {
                 this.isAddClass = true
             }
-            if (utils.getParam('fid')) {
-                this.fid = utils.getParam('fid')
+            // utils.getParam('fid') 社交分享版本发现的问题（fid有时为空且不同人打开分享链接fid不是自己的）fid不从url和缓存中取  获取从detail接口取
+            if (utils.getParam('sid')) {
+                // this.fid = utils.getParam('fid')
                 this.sid = utils.getParam('sid')
                 var objId = {
-                    fid: utils.getParam('fid'),
+                    // fid: utils.getParam('fid'),
                     sid: utils.getParam('sid')
                 }
                 sessionStorage.setItem('bigvip-fid', JSON.stringify(objId))
             } else {
-                this.fid = JSON.parse(sessionStorage.getItem('bigvip-fid')).fid
+                // this.fid = JSON.parse(sessionStorage.getItem('bigvip-fid')).fid
                 this.sid = JSON.parse(sessionStorage.getItem('bigvip-fid')).sid
             }
             this.getProDetail()
@@ -1148,7 +1149,7 @@
                     url: '/bigmember/follow/project/detail',
                     data: {
                         sid: _this.sid,
-                        fid: _this.fid
+                        // fid: _this.fid
                     },
                     success: function (res) {
                         if (res.error_code == 0) {
@@ -1158,6 +1159,7 @@
                             _this.prolist = projectInfos
                             _this.projectname = projectInfos.projectname
                             _this.sid = resdata.sid
+                            _this.fid= resdata.fid
                             _this.careShow = resdata.isfollow
                             // 地区显示
                             var getAreas = ['北京', '天津', '重庆', '上海']

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

@@ -197,16 +197,17 @@ var vNode = {
         } else {
             this.isAddClass = true
         }
-        if (utils.getParam('fid')) {
-            this.fid = utils.getParam('fid')
+        // utils.getParam('fid') 社交分享版本发现的问题（fid有时为空且不同人打开分享链接fid不是自己的）fid不从url和缓存中取  获取从detail接口取
+        if (utils.getParam('sid')) {
+            // this.fid = utils.getParam('fid')
             this.sid = utils.getParam('sid')
             var objId = {
-                fid: utils.getParam('fid'),
+                // fid: utils.getParam('fid'),
                 sid: utils.getParam('sid')
             }
             sessionStorage.setItem('bigvip-fid', JSON.stringify(objId))
         } else {
-            this.fid = JSON.parse(sessionStorage.getItem('bigvip-fid')).fid
+            // this.fid = JSON.parse(sessionStorage.getItem('bigvip-fid')).fid
             this.sid = JSON.parse(sessionStorage.getItem('bigvip-fid')).sid
         }
         this.getProDetail()
@@ -792,7 +793,7 @@ var vNode = {
                 url: url,
                 data: {
                     sid: _this.sid,
-                    fid: _this.fid
+                    // fid: _this.fid
                 },
                 success: function (res) {
                     if (res.error_code == 0) {
@@ -802,6 +803,7 @@ var vNode = {
                         _this.prolist = projectInfos
                         _this.projectname = projectInfos.projectname
                         _this.sid = resdata.sid
+                        _this.fid= resdata.fid
                         _this.careShow = resdata.isfollow
                         // 地区显示
                         var getAreas = ['北京', '天津', '重庆', '上海']

src/web/templates/big-member/wx/page_pro_follow_detail.html

@@ -558,16 +558,17 @@
             } else {
                 this.isAddClass = true
             }
-            if (utils.getParam('fid')) {
-                this.fid = utils.getParam('fid')
+            // utils.getParam('fid') 社交分享版本发现的问题（fid有时为空且不同人打开分享链接fid不是自己的）fid不从url和缓存中取  获取从detail接口取
+            if (utils.getParam('sid')) {
+                // this.fid = utils.getParam('fid')
                 this.sid = utils.getParam('sid')
                 var objId = {
-                    fid: utils.getParam('fid'),
+                    // fid: utils.getParam('fid'),
                     sid: utils.getParam('sid')
                 }
                 sessionStorage.setItem('bigvip-fid', JSON.stringify(objId))
             } else {
-                this.fid = JSON.parse(sessionStorage.getItem('bigvip-fid')).fid
+                // this.fid = JSON.parse(sessionStorage.getItem('bigvip-fid')).fid
                 this.sid = JSON.parse(sessionStorage.getItem('bigvip-fid')).sid
             }
             this.getCanBiaoInfo()
@@ -1181,7 +1182,7 @@
                     url: '/bigmember/follow/project/detail',
                     data: {
                         sid: _this.sid,
-                        fid: _this.fid
+                        // fid: _this.fid
                     },
                     success: function (res) {
                         if (res.error_code == 0) {
@@ -1191,6 +1192,7 @@
                             _this.prolist = projectInfos
                             _this.projectname = projectInfos.projectname
                             _this.sid = resdata.sid
+                            _this.fid = resdata.fid
                             _this.careShow = resdata.isfollow
                             // 地区显示
                             var getAreas = ['北京', '天津', '重庆', '上海']