Merge branch 'dev4.5.8.9' of http://192.168.3.207:8080/qmx/jy into dev4.5.8.9

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

@@ -211,15 +211,14 @@ var vNode = {
     },
     // 查看次数为零，显示遮罩
     getStatus: function () {
-      console.log((!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts))
-      return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts)
+      return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts && !this.entvisit.visited)
     },
     isMember () {
       return this.powerInfo.memberStatus <= 0 || !this.conf._4
     },
     isShowUpTip () {
       // 出现升级提醒 是新超级订阅买的不是全国、次数已用完 、不是大会员
-      return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip && this.powerInfo.memberStatus <= 0
+      return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited
     },
     surplus: function () {
       return this.entvisit.total > this.entvisit.usage
@@ -320,7 +319,7 @@ var vNode = {
         urls = '/bigmember/portrait/winner/getData'
       } else if (_this.powerInfo.memberStatus > 2) {
         if ( _this.isVip) { // 超级订阅
-          if(_this.entvisit.total <= _this.entvisit.usage) {
+          if(_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
             urls = '/bigmember/portrait/winner/getData'
           } else {
             urls = '/bigmember/portrait/subVipPortrait/winner'
@@ -385,8 +384,9 @@ var vNode = {
           if (res.error_code == 0) {
             if (res.data) {
               // res.data.provin = 1
-              res.data.total = 1
-              res.data.usage = 2
+              // res.data.total = 1
+              // res.data.usage = 2
+              // res.data.visited = false
               _this.entvisit = res.data
             }
           }
@@ -413,7 +413,7 @@ var vNode = {
       } else if (_this.powerInfo.memberStatus > 2) {
         if (_this.isVip) {
           console.log(_this.entvisit.total,_this.entvisit.usage)
-          if (_this.entvisit.total <= _this.entvisit.usage) {
+          if (_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
             urls = '/bigmember/portrait/winner/getNewMsg'
           } else {
             urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'

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

@@ -209,13 +209,13 @@ var vNode = {
         },
         // 查看次数为零，显示遮罩
         getStatus: function () {
-            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts)
+            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts && !this.entvisit.visited)
         },
         isMember () {
           return this.powerInfo.memberStatus <= 0 || !this.conf._4
         },
         isShowUpTip () {
-          return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip
+          return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited
         },
         surplus: function () {
             return this.entvisit.total > this.entvisit.usage
@@ -321,7 +321,7 @@ var vNode = {
               urls = '/bigmember/portrait/winner/getData'
             } else if (_this.powerInfo.memberStatus > 2) {
               if ( _this.isVip) { // 超级订阅
-                if(_this.entvisit.total <= _this.entvisit.usage) {
+                if(_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
                   urls = '/bigmember/portrait/winner/getData'
                 } else {
                   urls = '/bigmember/portrait/subVipPortrait/winner'
@@ -405,7 +405,7 @@ var vNode = {
               urls = '/bigmember/portrait/winner/getNewMsg'
             } else if (_this.powerInfo.memberStatus > 2) {
               if (_this.isVip) {
-                if (_this.entvisit.total <= _this.entvisit.usage) {
+                if (_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
                   urls = '/bigmember/portrait/winner/getNewMsg'
                 } else {
                   urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'

src/web/staticres/common-module/collection/js/vip-dialog.js

@@ -103,7 +103,7 @@ var vipComponent = {
             textMap.btnText = this.type === 'item_1' ? '去升级' : '免费体验'
           } else if(this.entvisit.provin == -1) {
             textMap.titleText = '超级订阅'
-            textMap.btnText = '联系客服'
+            textMap.btnText = this.type === 'item_1' ? '联系客服' : '免费体验'
           }
         } else {
           if (this.type === 'item_1') {