Merge remote-tracking branch 'origin/dev4.6.3.14' into dev4.6.3.14

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

@@ -505,13 +505,14 @@ var vNode = {
       var _this = this
       var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
       var data = {
-        entId: _this.entInfo.id,
+        entId: this.entInfo.id,
         pageNum: 1,
-        pageSize: _this.topProject.pageSize
+        pageSize: this.topProject.pageSize
       }
+      var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
       $.ajax({
         type:'POST',
-        url: '/bigmember/portrait/winner/winnerNewMsgExport',
+        url: '/bigmember/portrait/' + (reqSign === 'svip' ? 'subVipPortrait' : 'winner') + '/winnerNewMsgExport',
         data: storageSet ? Object.assign(data, storageSet) : data,
         timeout: 8000,
         success:function(res) {

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

@@ -474,7 +474,7 @@
                   </div>
                 </li>
                 <li class="show-more clickable"
-                    v-if="topProject.count > 3"
+                    v-if="topProject.showGetNextButton && (isMemberAndSvip || canFreeTrial) && topProject.count > 3"
                     @click="goToFilterProjectNews">查看更多
                 </li>
               </ul>

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

@@ -259,13 +259,13 @@ var vConfig = {
         onExport(){
           var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
           var data = {
-            entId: _this.entInfo.id,
+            entId: this.entInfo.eid,
             pageNum: 1,
-            pageSize: _this.topProject.pageSize
+            pageSize: this.listState.pageSize
           }
           $.ajax({
             type:'POST',
-            url: '/bigmember/portrait/winner/winnerNewMsgExport' ,
+            url: '/bigmember/portrait/' + (this.reqSign === 'svip' ? 'subVipPortrait' : 'winner') + '/winnerNewMsgExport' ,
             data: storageSet ? Object.assign(data, storageSet) : data,
             timeout: 8000,
             success:function(res) {

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

@@ -523,13 +523,14 @@ var vNode = {
       var _this = this
       var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
       var data = {
-        entId: _this.entInfo.id,
+        entId: this.entInfo.id,
         pageNum: 1,
-        pageSize: _this.topProject.pageSize
+        pageSize: this.topProject.pageSize
       }
+      var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
       $.ajax({
         type:'POST',
-        url: '/bigmember/portrait/winner/winnerNewMsgExport',
+        url: '/bigmember/portrait/' + (reqSign === 'svip' ? 'subVipPortrait' : 'winner') + '/winnerNewMsgExport',
         data: storageSet ? Object.assign(data, storageSet) : data,
         timeout: 8000,
         success:function(res) {

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

@@ -453,7 +453,7 @@
                             </li>
                             <li
                                 class="show-more clickable"
-                                v-if="topProject.showGetNextButton && isMemberAndSvip && topProject.count > 3"
+                                v-if="topProject.showGetNextButton && (isMemberAndSvip || canFreeTrial) && topProject.count > 3"
                                 @click="goToFilterProjectNews">查看更多</li>
                         </ul>
                     </div>