Merge branch 'feature/v4.7.16' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.16

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

@@ -305,6 +305,9 @@
         delimiters: ['${', '}'],
         el: '#v-pro',
         data: {
+            powerInfo: {
+                viper: false
+            },
             bigstatus: 0,//大会员状态
             isPayedUser: false,//是否是付费用户
             careShow: false,
@@ -734,14 +737,14 @@
                 $.ajax({
                     type: 'POST',
                     url: '/bigmember/use/isAdd',
-                    data: {},
                     success: function (res) {
-                        console.log(res)
-                        // res.data.memberStatus = 0
                         _this.bigstatus = res.data.memberStatus
                         _this.power = res.data.power
                         _this.isPayedUser = res.data.memberStatus > 0 || res.data.vipStatus || res.data.entniche
                         _this.entIsNew = res.data.entIsNew
+                        if (res.data) {
+                            Object.assign(_this.powerInfo, res.data)
+                        }
                     },
                     error: function (err) {
                         console.log(err)
@@ -754,12 +757,7 @@
                     anchor: '采购单位全景分析',
                     landname: this.prolist.buyer
                 }
-                if (this.bigstatus <= 0 || this.bigstatus == 3) {
-                    sessionStorage.setItem('landinfo', JSON.stringify(landinfo))
-                    location.href = './landingPage'
-                } else {
-                    location.href = "./unit_portrayal?entName=" + encodeURIComponent(this.prolist.buyer)
-                }
+                location.href = "./unit_portrayal?entName=" + encodeURIComponent(this.prolist.buyer)
             },
             // 中标预测跳转
             goAiAdd: function () {

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

@@ -218,6 +218,9 @@ var vNode = {
         contentType: 'application/json;charset=utf-8',
         data: JSON.stringify(params),
         success: function(res){
+          if (params.pageNum === 1) {
+            _this.listState.list = []
+          }
           if (res.error_code == 0) {
             if (res.data && res.data.res && $.isArray(res.data.res)) {
               try {

src/web/staticres/pccss/pur-search-index-pc.css

@@ -457,7 +457,7 @@
 .search-content .indus-card {
     padding-bottom: 3px;
 }
-  
+
 .search-content .industry span {
     float: left;
     padding: 4px 7px;
@@ -545,7 +545,7 @@
 }
 .search-content .tit-r {
     display: flex;
-    justify-content: right;
+    justify-content: flex-end;
     margin-bottom: 9px;
 }
 .search-content .tit-r .mesg-box {
@@ -866,7 +866,7 @@
   .tag-label em {
     font-style: normal;
   }
-  
+
   .add-tag-button {
     margin-left: 16px;
     color: #2cb7ca;
@@ -984,4 +984,4 @@
 .selector-content .all.active {
     color: #fff;
     background: #2CB7CA;
-}
+}

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

@@ -630,12 +630,7 @@
                     anchor: '采购单位全景分析',
                     landname: this.prolist.buyer
                 }
-                if (this.bigstatus <= 0 || this.bigstatus == 3) {
-                    sessionStorage.setItem('landinfo', JSON.stringify(landinfo))
-                    location.href = './landingPage'
-                } else {
-                    location.href = "./unit_portrayal?entName=" + encodeURIComponent(this.prolist.buyer)
-                }
+                location.href = "./unit_portrayal?entName=" + encodeURIComponent(this.prolist.buyer)
             },
             // 中标预测跳转
             goAiAdd: function () {