Merge branch 'release4.7.33' of http://192.168.3.207:8080/qmx/jy into release4.7.33

src/jfw/front/shorturl.go

@@ -287,7 +287,8 @@ func (s *Short) Article(stype, id string) error {
 		obj := wxvisitD(sid, userId, myopenid, stype, (isVip && isOldVip) || isMember || isEntniche)
 		canRead := false
 		if ((isVip && isOldVip) || isMember || isEntniche) || //老版本vip、大会员、商机管理
-			((isVip && !isOldVip) && (!(util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向"))) { //新超级订阅非采购意向”和“拟建项目”
+			((isVip && !isOldVip) && (!(util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向"))) || //新超级订阅非采购意向”和“拟建项目”
+			stype == "mailprivate" || stype == "indexcontent" { //邮箱推送
 			canRead = true
 		} else {
 			canRead = SeeDetailLimit(obj, userId, sid)

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

@@ -42,8 +42,7 @@
                     <span class="down-report active" @click="downReport('app')">下载项目报告</span>
                     <span class="toVip" @click="openVip()" v-if="!this.$data.isPayedUser">开通</span>
                 </div>
-                <div class="forecast" @click="goAiAdd()"
-                     v-if="this.$data.prodetail.bidtype=='招标'||this.$data.prodetail.bidtype=='询价'">
+                <div class="forecast" @click="goAiAdd()" v-if="aiFloatShow">
                     <span class="j-icon icon-face"></span>
                     <span class="for_text">中标预测</span>
                 </div>
@@ -155,7 +154,7 @@
             <div class="cement_title" style="display: flex;align-items: center;justify-content: space-between;">
                 <h2 class="title_h2">项目公告</h2>
                 <div @click="goAnalysis" class="bid-dec-in"
-                     v-if="this.$data.prodetail.bidtype !=='中标' && this.$data.prodetail.bidtype !=='成交' && this.$data.prodetail.bidtype !=='合同'">
+                     v-if="analysisFloatShow">
                     <em class="dec-icon"></em>
                     投标决策分析
                 </div>
@@ -311,6 +310,22 @@
             }
             this.getProDetail()
         },
+        computed: {
+            aiFloatShow: function () {
+                if (this.bigstatus <= 0) {
+                    return this.prodetail.bidtype == '招标' || this.prodetail.bidtype == '询价'
+                } else {
+                    return false
+                }
+            },
+            analysisFloatShow: function () {
+                if (this.bigstatus <= 0) {
+                    return this.prodetail.bidtype !== '中标' && this.prodetail.bidtype !== '成交' && this.prodetail.bidtype !== '合同'
+                } else {
+                    return false
+                }
+            }
+        },
         methods: {
             goAnalysis: function () {
                 sessionStorage.removeItem('big-analysis_filter')