Merge branch 'feature/v4.8.95' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.8.95_wmh

src/web/staticres/js/login.js

@@ -368,11 +368,13 @@ function checkBigStatus () {
         if (res.data.viper) {
           $(".myorderDiv.ent-search").show()
         }
-        if (res.data.power.indexOf(4) == -1 && res.data.vipStatus>0&&res.data.viper) {
-          $(".myorderDiv.entPortraitRecord").show()
-        }
-        if (res.data.power.indexOf(5) == -1 && res.data.vipStatus>0&&res.data.viper) {
-          $(".myorderDiv.buyerPortraitRecord").show()
+        if(res.data.power && res.data.power.length) {
+          if (res.data.power.indexOf(4) == -1 && res.data.vipStatus>0&&res.data.viper) {
+            $(".myorderDiv.entPortraitRecord").show()
+          }
+          if (res.data.power.indexOf(5) == -1 && res.data.vipStatus>0&&res.data.viper) {
+            $(".myorderDiv.buyerPortraitRecord").show()
+          }
         }
 		if (res.data.memberStatus<=0&&res.data.vipStatus>0&&res.data.viper){
 			$(".myorderDiv.portraitRecord").show()

src/web/staticres/js/pur-search-index-pc.js

@@ -164,6 +164,7 @@ var vmPurSearch = new Vue({
             inIframe: false,
             isLogin: false,
             isMember: false,
+            isVip: false,
             isEntService: false,
             isNewEntNiche: false,
             area: {
@@ -176,6 +177,7 @@ var vmPurSearch = new Vue({
               showD1: false,
               showD2: false,
               showD3: false,
+              showD4: false,
               alreadyNum: 0,
               remainNum: 0,
               item: {}
@@ -222,6 +224,7 @@ var vmPurSearch = new Vue({
       this.inIframe = goTemplateData.inIframe
       this.isLogin = params.login && Object.keys(params.login).length > 0
       this.isMember = params.isMember
+      this.isVip = params.isVip
       this.isEntService = params.isEntService
       this.isNewEntNiche = params.isEntnicheNew
       // this.initIndustryMap()
@@ -270,14 +273,22 @@ var vmPurSearch = new Vue({
           window.open('/page_workDesktop/work-bench/app/big/push_setting')
         },
         monitorApply () {
-          if(goTemplateData.params.isVip) {
+          if(this.isVip) {
             vm.isNeedSubmit('pc_buyer_monitor_more')
           } else {
-            this.monitorInfo.showD1 = true
+            this.monitorInfo.showD4 = true
           }
         },
         monitorStatus (data, item) {
-          window.open('/swordfish/page_big_pc/unit_portrayal/' + item.buyer + '?active=2')
+          // 是渠道合作页面需要登录后重定向
+          let url = ''
+          const BIPge = this.getBIParams ? '?resource=BI&active=2' : '?active=2'
+          if (this.isNewEntNiche) {
+            url = '/entpc/unit_portrayal/' + item.buyer + BIPge
+          } else {
+            url = '/swordfish/page_big_pc/unit_portrayal/' + item.buyer + BIPge
+          }
+          window.open(url)
         },
         monitorCancel (data, item) {
           this.monitorInfo.item = item

src/web/templates/pc/pursearchindex.html

@@ -456,6 +456,19 @@
                   <button class="j-t-button cancel" @click="cancelMonitor">确认取消</button>
               </span>
             </el-dialog>
+            <el-dialog
+              title="申请监控更多业主"
+              :visible.sync="monitorInfo.showD4"
+              custom-class="j-el-confirm push-setting-dialog"
+              :show-close="false"
+              top="25vh"
+              width="30%">
+              <span>您可联系客服，申请升级产品套餐，监控更多业主</span>
+              <span slot="footer" class="dialog-footer">
+                  <button class="j-t-button confirm active" @click="concatKf">联系客服</button>
+                  <button class="j-t-button cancel" @click="monitorInfo.showD4=false">确认取消</button>
+              </span>
+            </el-dialog>
         </div>
       </section>
       <!-- 用户留资 -->