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

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

@@ -188,7 +188,7 @@ var staticData = [
                 b_content:'根据为您推送的招标项目信息，提供每月的市场（含细分市场）、采购单位、中标单位等多维度分析报告，助您掌握市场发展趋势。'
             },
             {
-                id:18,
+                id:17,
                 b_class:'isgray',
                 url: '/jyapp/front/dataExport/toSieve?source=app_kongkim',
                 dis_url:'javascript:;',

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

@@ -156,7 +156,7 @@
               </div>
               <div class="static-scope">数据统计范围：${statistics.start || '-'}-${statistics.end}</div>
             </div>
-            <div class="jy-empty" v-show="allNot">
+            <div class="jy-empty" v-show="allNot && !getStatus">
                 <div class="jy-empty-img"></div>
                 <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
             </div>

src/web/staticres/css/dev2/newBidSearch.css

@@ -496,6 +496,7 @@
 }
 .file-count-tip .file-count{
   color: #2CB7CA;
+  font-style: normal;
 }
 .file-icon-help{
   margin-left: 8px;
@@ -536,9 +537,15 @@
   border: 0;
   box-sizing: border-box;
 }
-.custom-cancel-btn{
+.custom-cancel-btn,
+.custom-cancel-btn:hover,
+.custom-cancel-btn:focus{
   width: 132px;
   height: 34px;
+  background-color: #fff;
+  border: 1px solid #DCDFE6;
+  color: #686868;
+  font-style: 16px;
 }
 .custom-alert .el-message-box__btns button:nth-child(2){
   margin-left: 32px;

src/web/staticres/frontRouter/pc/seeBuyerHistory/css/index-pc.css

@@ -211,4 +211,47 @@
     color: #FFFFFF;
     margin-top: 32px;
     cursor: pointer;
+}
+.custom-dialog{
+  border-radius: 8px;
+}
+.custom-dialog .el-button--primary,
+.custom-dialog .el-button--primary:hover,
+.custom-dialog .el-button--primary:focus{
+  width: 132px;
+  height: 36px;
+  text-align: center;
+  background: #2CB7CA;
+  border-radius: 6px;
+  font-style: 16px;
+  color: #fff;
+  border: 0;
+}
+.custom-dialog .el-dialog__header{
+  padding: 0;
+}
+.custom-dialog .el-dialog__body{
+  padding: 32px;
+  color: #686868;
+  font-size: 14px;
+  line-height: 22px;
+  text-align: justify;
+}
+.custom-dialog .el-dialog__body i{
+  color: #2CB7CA;
+}
+.custom-dialog .el-button--default,
+.custom-dialog .el-button--default:hover,
+.custom-dialog .el-button--default:focus{
+  width: 132px;
+  height: 36px;
+  text-align: center;
+  background: #fff;
+  border-radius: 6px;
+  font-style: 16px;
+  color: #686868;
+  border: 1px solid #DCDFE6;
+}
+.custom-dialog .el-dialog__footer{
+  padding-bottom: 32px;
 }

src/web/staticres/frontRouter/pc/seeBuyerHistory/js/index-pc.js

@@ -1,131 +1,153 @@
 function getShortName (comName) {
-    var areaMap = chinaMapJSON || []
-    var shortname = comName
-    // 1. 循环省份城市进行替换
-    areaMap.forEach(function (item) {
-        var p = item.name.replace(/[省市]/, '')
-        if (shortname.indexOf(p) !== -1) {
-        shortname = shortname.replace(item.name, '').replace(p, '')
-        console.log(p + ' -> \'\'')
-        }
-        item.city.forEach(function (iitem) {
-        var c = iitem.name.replace(/[省市]/, '')
-        if (shortname.indexOf(c) !== -1) {
-            shortname = shortname.replace(iitem.name, '').replace(c, '')
-            console.log(c + ' -> \'\'')
+  var areaMap = chinaMapJSON || []
+  var shortname = comName
+  // 1. 循环省份城市进行替换
+  areaMap.forEach(function (item) {
+    var p = item.name.replace(/[省市]/, '')
+    if (shortname.indexOf(p) !== -1) {
+      shortname = shortname.replace(item.name, '').replace(p, '')
+      console.log(p + ' -> \'\'')
+    }
+    item.city.forEach(function (iitem) {
+      var c = iitem.name.replace(/[省市]/, '')
+      if (shortname.indexOf(c) !== -1) {
+        shortname = shortname.replace(iitem.name, '').replace(c, '')
+        console.log(c + ' -> \'\'')
+      }
+      iitem.area.forEach(function (iiitem) {
+        if (shortname.indexOf(iiitem) !== -1) {
+          shortname = shortname.replace(iiitem, '')
+          console.log(iiitem + ' -> \'\'')
         }
-        iitem.area.forEach(function (iiitem) {
-            if (shortname.indexOf(iiitem) !== -1) {
-            shortname = shortname.replace(iiitem, '')
-            console.log(iiitem + ' -> \'\'')
-            }
-        })
-        })
+      })
     })
-    var matchRes = shortname.match(/[\u4e00-\u9fa5]{4}/gm)
-    var shortname = matchRes ? matchRes[0] : shortname.slice(0, 4)
-    if (shortname.length < 4) {
-        shortname = shortname.slice(0, 4)
-    }
-    return shortname
+  })
+  var matchRes = shortname.match(/[\u4e00-\u9fa5]{4}/gm)
+  var shortname = matchRes ? matchRes[0] : shortname.slice(0, 4)
+  if (shortname.length < 4) {
+    shortname = shortname.slice(0, 4)
+  }
+  return shortname
 }
 var vm = new Vue({
-    el: '.see-container',
-    delimiters: ['{', '}'],
-    data () {
-        return {
-            working: false,
-            empty: false,
-            dateVal: '',
-            years: '',
-            months: '',
-            points: [],
-            statusEnum: ['存续', '吊销', '注销', '撤销'],
-            statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
-            seeList: {
-                pageNum: 1, // 当前页
-                pageSize: 10, // 每页多少条数据
-                total: 0, // 总页数
-                list: [] // 返回的数据
-            }
+  el: '.see-container',
+  delimiters: ['{', '}'],
+  data () {
+    return {
+      working: false,
+      empty: false,
+      dateVal: '',
+      years: '',
+      months: '',
+      points: {},
+      statusEnum: ['存续', '吊销', '注销', '撤销'],
+      statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
+      seeList: {
+        pageNum: 1, // 当前页
+        pageSize: 10, // 每页多少条数据
+        total: 0, // 总页数
+        list: [] // 返回的数据
+      },
+      tipDialog: false
+    }
+  },
+  computed: {
+    dialogBtnText: function() {
+      if (this.points.provin == -1) {
+        return '联系客服'
+      } else {
+        return '前往升级'
+      }
+    }
+  },
+  created () {
+    this.years = new Date().getFullYear()
+    this.months = parseInt(new Date().getMonth() + 1)
+    this.dateVal = new Date()
+    this.subPoint()
+    this.subRecord()
+  },
+  methods: {
+    showTip () {
+      this.tipDialog = true
+    },
+    goHandle (item) {
+      if (item == '前往升级') {
+        window.open('/swordfish/page_big_pc/free/svip/buy?type=upgrade')
+        this.tipDialog = false
+      } else {
+        $('.open-customer').unbind('click').trigger('click')
+        this.tipDialog = false
+      }
+    },
+    subPoint () {
+      $.ajax({
+        url: '/bigmember/portrait/subVipPortrait/usage?p_type=1',
+        type: 'POST',
+        contentType: 'application/x-www-form-urlencoded',
+        data: '',
+        dataType: 'json'
+      }).done(res => {
+        if (res.error_code == 0) {
+          this.points = res.data
         }
+      })
     },
-    created() {
-        this.years = new Date().getFullYear()
-        this.months = parseInt(new Date().getMonth() + 1)
-        this.dateVal = new Date()
-        this.subPoint()
-        this.subRecord()
+    getDatas () {
+      return {
+        year: this.years,
+        month: this.months,
+        pageSize: this.seeList.pageSize,
+        pageNum: this.seeList.pageNum - 1,
+        p_type: 1
+      }
     },
-    methods: {
-        subPoint() {
-            $.ajax({
-              url: '/bigmember/portrait/subVipPortrait/usage?p_type=1',
-              type: 'POST',
-              contentType: 'application/x-www-form-urlencoded',
-              data: '',
-              dataType: 'json'
-            }).done(res => {
-              if (res.error_code == 0) {
-                this.points = res.data
-              }
-            })
-        },
-        getDatas() {
+    subRecord () {
+      this.working = true
+      this.empty = false
+      $.ajax({
+        url: '/bigmember/portrait/subVipPortrait/record',
+        type: 'POST',
+        contentType: 'application/x-www-form-urlencoded',
+        data: this.getDatas(),
+        dataType: 'json'
+      }).done(res => {
+        var _this = this
+        if (res.error_code === 0) {
+          this.working = false
+          this.empty = true
+          if (res.data.total) {
+            this.seeList.total = res.data.total
+          }
+          if (!res.data.list) {
+            res.data.list = []
+          }
+          this.seeList.list = this.seeList.list.concat(res.data.list.map(function (v) {
             return {
-                year: this.years,
-                month: this.months,
-                pageSize: this.seeList.pageSize,
-                pageNum: this.seeList.pageNum - 1,
-                p_type:1
+              name: v.name,
+              province: v.province,
+              city: v.city,
+              buyerclass: v.buyerclass,
+              checked: false
             }
-        },
-        subRecord() {
-            this.working = true
-            this.empty = false
-            $.ajax({
-                url: '/bigmember/portrait/subVipPortrait/record',
-                type: 'POST',
-                contentType: 'application/x-www-form-urlencoded',
-                data: this.getDatas(),
-                dataType: 'json'
-            }).done(res => {
-                var _this = this
-                if (res.error_code === 0) {
-                    this.working = false
-                    this.empty = true
-                    if (res.data.total) {
-                        this.seeList.total = res.data.total
-                    }
-                    if (!res.data.list){
-                        res.data.list=[]
-                    }
-                    this.seeList.list = this.seeList.list.concat(res.data.list.map(function (v) {
-                        return {
-                            name: v.name,
-                            province: v.province,
-                            city: v.city,
-                            buyerclass: v.buyerclass,
-                            checked: false
-                        }
-                    }))
-                }
-            })
-        },
-        onPageChange(page) {
-            this.seeList.pageNum = page
-            this.seeList.list = []
-            this.subRecord()
-        },
-        dateHandler(val) {
-            this.years = val.getFullYear()
-            this.months = val.getMonth() + 1
-            this.seeList.pageNum = 1
-            this.seeList.list = []
-            this.subRecord()
-        },
-        detailed(ids) {
-            window.open('/swordfish/page_big_pc/unit_portrayal/' + ids, '_blank')
+          }))
         }
+      })
+    },
+    onPageChange (page) {
+      this.seeList.pageNum = page
+      this.seeList.list = []
+      this.subRecord()
+    },
+    dateHandler (val) {
+      this.years = val.getFullYear()
+      this.months = val.getMonth() + 1
+      this.seeList.pageNum = 1
+      this.seeList.list = []
+      this.subRecord()
+    },
+    detailed (ids) {
+      window.open('/swordfish/page_big_pc/unit_portrayal/' + ids, '_blank')
     }
+  }
 })

src/web/staticres/js/superSearch.js

@@ -234,6 +234,7 @@ function getNewBids(pnum){
 				$(".nbnext").removeClass("disabled");
       }
       searchInnerVue.listState.total = Math.ceil(r.count/50)
+      searchInnerVue.checkPageNumAdd1()
 			appendDatas(r.list,false,true);
 		}else{
 			submitflag=true;
@@ -276,6 +277,7 @@ function getNewBiddings(){
       // 计算总页码
       if (currentPage == 1) {
         searchInnerVue.listState.total = Math.ceil(r.count/50)
+        searchInnerVue.checkPageNumAdd1()
       }
 			$(".tabContainer").show();
 			//$(".pagination").show();
@@ -975,6 +977,7 @@ function searchOnsubmit(clickpaging){
       LimitClass.prevNoLimitFlag = false;
       // 重新分页
       searchInnerVue.listState.total = r.totalPage
+      searchInnerVue.checkPageNumAdd1()
 		}else{
 			LimitClass.prevNoLimitFlag = true;
       LimitClass.limitFlag = false;
@@ -1080,6 +1083,7 @@ function afterAjaxReq(r){
     secondList= r.secondList;
     // vue 重置总页数
     searchInnerVue.listState.total = totalPage
+    searchInnerVue.checkPageNumAdd1()
 	}
 	if(secondFlag==""&&typeof(totalPage) != "undefined" && currentPage == 1){
 		if (r.totalPage==1){
@@ -1089,9 +1093,11 @@ function afterAjaxReq(r){
       }
       // vue 重置总页数
       searchInnerVue.listState.total = totalPage
+      searchInnerVue.checkPageNumAdd1()
 		}else{
       totalPage = r.totalPage;
       searchInnerVue.listState.total = totalPage
+      searchInnerVue.checkPageNumAdd1()
 		}
 	}
 }
@@ -1297,18 +1303,20 @@ function collectClick() {
 }
 
 function openBigMemberDialog (str, content) {
-	$('.auth-dialog').show()
-	$('.auth-dialog .dialog-title').text('您暂无使用权限')
-	$('.auth-dialog .dialog-content').html(content ||  '开通大会员,查看更多招标项目,畅享商机不受限!')
-	$('.auth-dialog .default-btn').click(function () {
-		$('.auth-dialog').hide(300)
-	})
-	$('.auth-dialog .confirm-btn').text('免费体验')
-	$('.auth-dialog .confirm-btn').off('click').bind('click',function () {
-		var advName = '招标搜索' + str + '-去开通'
-		baiduEvent(advName) // 点击去开通事件 百度统计
-		// window.open('/swordfish/page_big_pc/free/svip/buy')
-	})
+  $('.auth-dialog').show()
+  $('.auth-dialog .dialog-title').text('您暂无使用权限')
+  $('.auth-dialog .dialog-content').html(content ||  '开通大会员,查看更多招标项目,畅享商机不受限!')
+  $('.auth-dialog .default-btn').click(function () {
+    $('.auth-dialog').hide(300)
+  })
+  $('.auth-dialog .confirm-btn').text('免费体验')
+  $('.auth-dialog .confirm-btn').off('click').bind('click',function () {
+    var advName = '招标搜索' + str + '-去开通'
+    baiduEvent(advName) // 点击去开通事件 百度统计
+    $('.auth-dialog').hide(300)
+    vm.dialogTitle = '免费用户查看超过500条招标搜索结果'
+    vm.isNeedSubmit('jylab_see500_plus', function () {})
+  })
 }
 
 // 开通提醒弹框

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

@@ -170,7 +170,7 @@
               </div>
               <div class="static-scope">数据统计范围：${statistics.start || '-'}-${statistics.end}</div>
           </div>
-          <div class="jy-empty" v-show="allNot">
+          <div class="jy-empty" v-show="allNot && !getStatus">
             <div class="jy-empty-img"></div>
             <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
           </div>

src/web/templates/frontRouter/pc/seeBuyerHistory/sess/index.html

@@ -1,117 +1,125 @@
-
 <html lang="zh-cn">
-	<head>
-		<title>历史查看记录_{{Msg "seo" "qfw.swordfishsl.title"}}</title>
-		<meta name="Keywords" content="{{Msg "seo" "qfw.swordfishsl.key"}}"/>
-		<meta name="Description" content="{{Msg "seo" "qfw.swordfishsl.description"}}"/>
-		<meta name="renderer" content="webkit">
-		<meta content="telephone=no" name="format-detection"/>
-        <meta content="历史查看记录" theme="light" name="enable-header"/>
-		{{include "/common/pnc.html"}}
-		<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
-		<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
-		<link href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
 
-        <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
+<head>
+  <title>历史查看记录_{{Msg "seo" "qfw.swordfishsl.title"}}</title>
+  <meta name="Keywords" content="{{Msg "seo" "qfw.swordfishsl.key"}}" />
+  <meta name="Description" content="{{Msg "seo" "qfw.swordfishsl.description"}}" />
+  <meta name="renderer" content="webkit">
+  <meta content="telephone=no" name="format-detection" />
+  <meta content="历史查看记录" theme="light" name="enable-header" />
+  {{include "/common/pnc.html"}}
+  <link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
+  <link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
+  <link href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" rel="stylesheet" />
 
-        <link href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css" rel="stylesheet" />
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}'>
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/selector/selector.css?v={{Msg "seo" "version"}}'>
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/css/index-pc.css?v={{Msg "seo" "version"}}'>
-	</head>
+  <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
+  <script src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
 
-	<body>
-	{{include "/common/pchead.html"}}
-    <div class="dialog" style="display: none" onclick="closeDialog()">
-        <div class="alertDiv">
-            <div class="content">
-                每购买1个省,每月可查看<i>5个</i>采购单位画像,<i>上限<br>为80个</i>,每月1号上月余额清零重新计算。
-            </div>
-            <div class="iKnowBtn">我知道了</div>
+  <link href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css" rel="stylesheet" />
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}'>
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/selector/selector.css?v={{Msg "seo" "version"}}'>
+  <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/css/index-pc.css?v={{Msg "seo" "version"}}'>
+</head>
+
+<body>
+  {{include "/common/pchead.html"}}
+
+  <section class="see-container" v-cloak>
+    <div class="see-header flex w">
+      <div class="l-tabs flex">
+        <h3 class="tab-title">采购单位画像记录</h3>
+        <div class="tips">
+          当月已使用：<span>{points.usage?points.usage:0}</span>/{points.total?points.total:0}
         </div>
+        <div class="tip" style="cursor: pointer;" @click="showTip"></div>
+      </div>
+      <div class="l-tabs r-tabs">
+        <span class="r-word">选择月份</span>
+        <el-date-picker class="date-class" v-model="dateVal" type="month" format="yyyy年MM月" @change="dateHandler"
+          placeholder="请选择月份" :clearable="false" :editable="false">
+        </el-date-picker>
+        <i class="el-icon-arrow-down r-icons" @click="dateHandler"></i>
+      </div>
     </div>
-	<section class="see-container" v-cloak >
-        <div class="see-header flex w">
-            <div class="l-tabs flex">
-                <h3 class="tab-title">采购单位画像记录</h3>
-                <div class="tips">
-                    当月已使用：<span>{points.usage?points.usage:0}</span>/{points.total?points.total:0}
-                </div>
-                <div class="tip" @click="showTip"></div>
-            </div>
-            <div class="l-tabs r-tabs">
-                <span class="r-word">选择月份</span>
-                <el-date-picker
-                    class="date-class"
-                    v-model="dateVal"
-                    type="month"
-                    format="yyyy年MM月"
-                    @change="dateHandler"
-                    placeholder="请选择月份"
-                    :clearable="false"
-                    :editable="false">
-                </el-date-picker>
-                <i class="el-icon-arrow-down r-icons" @click="dateHandler"></i>
-            </div>
-        </div>
-        <div class="see-content w" v-show="seeList.list.length !== 0 && empty">
-            <div class="lists flex" v-for="item in seeList.list" :key="item._id">
-                <div class="r-conts flex">
-                    <h3 class="flex" @click="detailed(item.name)">{item.name}<span v-show="item.status >= 0" :class="'status-' + item.status">{item.statusWord}</span></h3>
-                    <div class="line">
-                        <div class="cont-tips address"><i class="addr">所在地：</i>
-                            <span v-if="item.province">{item.province}</span>
-                            <span v-if="item.city">{item.city}</span>
-                            <span v-if="!(item.province && item.city)">--</span>
-                        </div>
-                        <div class="cont-tips buyerclass"><i class="buyer">采购单位类型：</i><span>{item.buyerclass || '--'}</span></div>
-                    </div>
-                </div>
-            </div>
-            <div class="el-pagination-container" v-show="seeList.total">
-                <el-pagination
-                    background
-                    layout="prev, pager, next, ->"
-                    :hide-on-single-page="true"
-                    :current-page="seeList.pageNum"
-                    :page-size="seeList.pageSize"
-                    :total="seeList.total"
-                    @current-change="onPageChange"
-                ></el-pagination>
+    <div class="see-content w" v-show="seeList.list.length !== 0 && empty">
+      <div class="lists flex" v-for="item in seeList.list" :key="item._id">
+        <div class="r-conts flex">
+          <h3 class="flex" @click="detailed(item.name)">{item.name}<span v-show="item.status >= 0"
+              :class="'status-' + item.status">{item.statusWord}</span></h3>
+          <div class="line">
+            <div class="cont-tips address"><i class="addr">所在地：</i>
+              <span v-if="item.province">{item.province}</span>
+              <span v-if="item.city">{item.city}</span>
+              <span v-if="!(item.province && item.city)">--</span>
             </div>
+            <div class="cont-tips buyerclass"><i class="buyer">采购单位类型：</i><span>{item.buyerclass || '--'}</span></div>
+          </div>
         </div>
-        <div class="no-data" v-if="working"><el-image src="/images/working.gif"></el-image><div class="tip-text"><p>剑鱼标讯正在努力工作中...</p></div></div>
-        <div class="no-data" v-if="seeList.list == 0 && empty"><el-image src="/images/pc_12.png"></el-image><div class="tip-text"><p>暂无数据</p></div></div>
-    </section>
+      </div>
+      <div class="el-pagination-container" v-show="seeList.total">
+        <el-pagination background layout="prev, pager, next, ->" :hide-on-single-page="true"
+          :current-page="seeList.pageNum" :page-size="seeList.pageSize" :total="seeList.total"
+          @current-change="onPageChange"></el-pagination>
+      </div>
+    </div>
+    <div class="no-data" v-if="working">
+      <el-image src="/images/working.gif"></el-image>
+      <div class="tip-text">
+        <p>剑鱼标讯正在努力工作中...</p>
+      </div>
+    </div>
+    <div class="no-data" v-if="seeList.list == 0 && empty">
+      <el-image src="/images/pc_12.png"></el-image>
+      <div class="tip-text">
+        <p>暂无数据</p>
+      </div>
+    </div>
+    <el-dialog
+      :visible.sync="tipDialog"
+      :show-close="false"
+      custom-class="custom-dialog"
+      width="380"
+      center>
+      <div>
+        每购买1个省,每月可查看<i>5个</i>采购单位画像，<i>上限为80个</i>，您当前订阅了
+        <span v-if="points.provin == -1">全国，查看机会已经消耗完毕，如需要更多服务，请前往联系客服。</span>
+        <span v-else>{points.provin}个省，如需查看更多，前往订阅更多省份。</span>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="tipDialog = false">取 消</el-button>
+        <el-button type="primary" @click.stop="goHandle(dialogBtnText)">{dialogBtnText}</el-button>
+      </div>
+    </el-dialog>
+  </section>
 
-    {{include "/common/pcbottom.html"}}
-    {{include "/common/baiducc.html"}}
+  {{include "/common/pcbottom.html"}}
+  {{include "/common/baiducc.html"}}
 
-    <script>
-        haslogin({{.T.logid}})
-        function baiduEvent(name) {
-          try {
-            console.log(name, 'name')
-            _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
-          } catch (e) {
-            console.log('未初始化百度统计')
-          }
-        }
-    </script>
-    <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
-    <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
-    <script>
-        function closeDialog(){
-            $(".dialog").css("display","none")
-        }
-        function showTip(){
-            $(".dialog").css("display","unset")
-        }
-    </script>
+  <script>
+    haslogin({{.T.logid}})
+
+    function baiduEvent(name) {
+      try {
+        console.log(name, 'name')
+        _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
+      } catch (e) {
+        console.log('未初始化百度统计')
+      }
+    }
+  </script>
+  <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
+  <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
+  <script>
+    function closeDialog() {
+      $(".dialog").css("display", "none")
+    }
+
+    function showTip() {
+      $(".dialog").css("display", "unset")
+    }
+  </script>
+  <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/seeBuyerHistory/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
 </body>
 
 </html>
-

src/web/templates/pc/biddetail_rec.html

@@ -824,11 +824,11 @@
           <span class="slogan-btn more-btn">了解更多></span>
         </span>
 				</div>
-<!--				<div id="tab1">-->
-<!--					<div class="com-detail">-->
-<!--						{{Html (Regexp (Regexp (Regexp (Regexp (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>") "<td>\\s*$" "") "<tr>\\s*$" "") "<tbody>\\s*$" "") "<table>\\s*$" "")}}-->
-<!--					</div>-->
-<!--				</div>-->
+				<div id="tab1">
+					<div class="com-detail">
+						{{Html (Regexp (Regexp (Regexp (Regexp (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>") "<td>\\s*$" "") "<tr>\\s*$" "") "<tbody>\\s*$" "") "<table>\\s*$" "")}}
+					</div>
+				</div>
 			</div>
 			{{end}}
 			{{if .T.obj.projectinfo.attachments}}
@@ -864,7 +864,7 @@
           <span style="font-weight: 400;font-size: 16px">附件下载</span>
           <span class="free-download">免费下载1次</span>
           <span class="super-vip-show" style="display:none;">
-            <span class="file-count-tip">本月剩余:<em class="file-count"></em>次</span>
+            <span class="file-count-tip">本月剩余:<i class="file-count"></i> 次</span>
             <img class="file-icon-help" src="/images/help-b.png" alt="">
             <span class="concat-kf open-customer">联系客服</span>
           </span>
@@ -1185,11 +1185,17 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			entniche = res.data.entniche
 			vip = res.data.vip
 			var subType = {{.T.obj.subtype}}
-			if (subType == '拟建' && !bidmember && !entniche && vip <=0){
-			// if (subType == '拟建' && entniche == false){
-				$('.mask-zz').show()
-			} else {
-				$('.mask-zz').hide()
+			// if (subType == '拟建' && !bidmember && !entniche && vip <=0){
+			// 	$('.mask-zz').show()
+			// } else {
+			// 	$('.mask-zz').hide()
+			// }
+			if(subType == '拟建' || subType == '采购意向'){
+				if (!bidmember && !entniche && vip <=0){
+					$('.mask-zz').show()
+				} else {
+					$('.mask-zz').hide()
+				}
 			}
 		}
 
@@ -3339,15 +3345,18 @@ function fromwhere(text){
             bidVue.$confirm('您本月查看机会已经消耗完毕，如需要更多服务，请前往联系客服。', {
               showClose:false,
               center: true,
-              confirmButtonText: '联系客服',
+              confirmButtonText: '取消',
               customClass: 'custom-alert',
               showCancelButton: true,
-              confirmButtonClass: 'custom-confirm-btn',
-              cancelButtonClass: 'custom-cancel-btn'
+              confirmButtonClass: 'custom-cancel-btn',
+              cancelButtonClass: 'custom-confirm-btn',
+              cancelButtonText: '联系客服'
             }).then(function(data){
+              
+            }).catch(function(){
               $('.open-customer').trigger('click')
               $('body').trigger('click')
-            }).catch(function(){});
+            });
           }
         } else {
           // 老超级订阅用户 提醒升级
@@ -3373,7 +3382,7 @@ function fromwhere(text){
           confirmButtonText: '我知道了',
           customClass: 'custom-alert',
           showCancelButton: true,
-          confirmButtonClass: 'custom-alert-btn'
+          confirmButtonClass: 'custom-confirm-btn'
         });
         return
       }
@@ -3423,6 +3432,7 @@ function fromwhere(text){
             $("#attach-list").css("display","").find(".download-list").html(html)
           }
 			$(".downs").click(function (){
+				checkBigStatus()
 				cjdyDownload()
 			})
 			// $(".downs").click(function (){
@@ -3468,7 +3478,7 @@ function fromwhere(text){
         center: true,
         confirmButtonText: '我知道了',
         customClass: 'custom-alert',
-        confirmButtonClass: 'custom-alert-btn'
+        confirmButtonClass: 'custom-confirm-btn'
       });
     })
     // 免费下载一次点击

src/web/templates/pc/supsearch.html

@@ -281,6 +281,7 @@ function isPower () {
           vipState = true
         } else {
           vipState = false
+          adListInspect()
         }
         isOld = r.data.isOld
       }
@@ -748,40 +749,28 @@ $(function(){
 <script src="/js/superSearch.js?v={{Msg "seo" "version"}}"></script>
 <script language="javascript" type="text/javascript" src="{{Msg "seo" "cdn"}}/My97DatePicker/WdatePicker.js"></script>
 <script type="text/javascript">
-$.ajax({
-  type:'post',
-  url:'/publicapply/bidcoll/power?t=' + Date.now(),
-  success: function(res){
-    if (res.data) {
-      // res.data.entniche = false
-      // res.data.member = false
-      // res.data.vip = 0
-      if(!res.data.entniche && !res.data.member && res.data.vip <= 0) {
-        setTimeout(() => {
-          (window.slotbydup = window.slotbydup || []).push({
-              id: "u6603895",
-              container: "_t3di2018y5",
-              async: true
-          });
-        }, 1000)
-        setTimeout(() => {
-          (window.slotbydup = window.slotbydup || []).push({
-              id: "u6603895",
-              container: "_6omliqck79a",
-              async: true
-          });
-          var frames = document.getElementById("iframeu6603895_0");
-          // console.log(frames, 'frames')
+function adListInspect () {
+  setTimeout(() => {
+    (window.slotbydup = window.slotbydup || []).push({
+        id: "u6603895",
+        container: "_t3di2018y5",
+        async: true
+    });
+  }, 1000)
+  setTimeout(() => {
+    (window.slotbydup = window.slotbydup || []).push({
+        id: "u6603895",
+        container: "_6omliqck79a",
+        async: true
+    });
+    var frames = document.getElementById("iframeu6603895_0");
+    IframeOnClick.track(frames, function() {
+      jQuery(document).click();
+    });
+  }, 1000)
+  getAjaxAdv()
+}
 
-          IframeOnClick.track(frames, function() {
-                  jQuery(document).click();
-          });
-        }, 1000)
-        getAjaxAdv()
-      }
-    }
-  }
-})
 function getAjaxAdv () {
   $.ajax({
     type: 'POST',
@@ -1472,12 +1461,12 @@ var IframeOnClick = {
 			</div>
     </div> -->
     <!-- ${listState.total} ${listState.num} -->
-    <div class="el-pagination-container" v-show="showPage" style="width: 1200px;margin: 0 auto;">
+    <div class="el-pagination-container" ref="pagination" v-show="showPage" style="width: 1200px;margin: 0 auto;">
       <el-pagination
         background
         layout="prev, pager, next"
         :page-size="listState.size"
-        :current-page="listState.num"
+        :current-page.sync="listState.num"
         :page-count="listState.total"
         :hide-on-single-page="true"
         @current-change="onPageChange"
@@ -2165,33 +2154,71 @@ document.querySelector(".searchControl").oncopy = function(){
       return {
         showPage: true,
         listState: {
+          prevPageNum: 1,
           size: pageSize,
           num: currentPage,
           total: totalPage
+        },
+        powerInfo: {
+          entniche: false,
+          member: false,
+          vip: 0
         }
       }
     },
+    computed: {
+      vipState: function () {
+        var entniche = this.powerInfo.entniche
+        var member = this.powerInfo.member
+        var vip = this.powerInfo.vip
+        return entniche || member || vip > 0
+      }
+    },
     watch: {
-      'listState.num' (newVal) {
-        // console.log(newVal, '分页')
-      },
-      'listState.total' (newVal) {
-        // console.log(newVal, '总页码')
+      'listState.num' (newVal, oldVal) {
+        // console.log(JSON.stringify(this.listState))
       }
     },
+    created () {
+      this.getPower()
+    },
     mounted () {
       console.log('总页码：' + totalPage + ',当前页：' + currentPage + ',一页数量：' + pageSize + ',总条数：' + totalCount)
     },
     methods: {
+      getPower: function () {
+        var _this = this
+        $.ajax({
+          type:'post',
+          url:'/publicapply/bidcoll/power?t=' + Date.now(),
+          success: function(r){
+            if (r.data) {
+              _this.powerInfo.entniche = r.data.entniche
+              _this.powerInfo.member = r.data.member
+              _this.powerInfo.vip = r.data.vip
+
+              _this.checkPageNumAdd1()
+            }
+          }
+        })
+      },
+      checkPageNumAdd1: function () {
+        if (this.vipState) return
+        if (this.listState.total === 10) {
+          this.listState.total++
+        }
+      },
       onPageChange (p) {
+        // TODO 免费用户搜索结果查看大于11页时弹窗提示
+        if (!vipState && p > 10) {
+          openBigMemberDialog('招标搜索500条限制')
+          this.listState.num = this.listState.prevPageNum
+          return 
+        }
 
-	  	// TODO 免费用户搜索结果查看大于11页时弹窗提示
-	  	if (!vipState && p > 10) {
-	  		return openBigMemberDialog('招标搜索500条限制')
-	  	}
+        currentPage = this.listState.num
+        this.listState.prevPageNum = this.listState.num
 
-        currentPage = p
-        this.listState.num = p
         $(".tabContainer").hide();
         $(".working").show();
         $(window).scrollTop(0);