Merge remote-tracking branch 'origin/dev4.5.2' into dev4.5.2

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -980,8 +980,11 @@ function hasNoData() {
         $(".findnull_").css("display", "none")
     }
     if(!NoDataShow) {
-        $(".findnull_").css("display", "none")
-        $('.findnull-no-key').css("display", "block").siblings('.empty').hide()
+        if(!myInfo.haskey){
+            $('.findnull-no-key').css("display", "block").siblings('.empty').hide()
+        } else {
+            $(".findnull_").css("display", "block").siblings('.empty').hide()
+        }
     }
 }
 

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -1321,7 +1321,7 @@
 					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
 					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
 				</span><br>
-            <div style="display:none;" id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>
+<!--            <div style="display:none;" id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>-->
         </div>
         <div class="text-center" id="feedback" style="width:100%;">
             <div class="jy_sprite_main sprite_jyyjfk" style="transform: scale(1.21);margin-top: 15px;"></div>

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

@@ -240,7 +240,8 @@ var vm = new Vue({
                         this.initSelectTagList()
                         this.resetListState()
                     } else {
-                        this.showToast(res.error_msg)
+                        // this.showToast(res.error_msg)
+                        this.showToast('标签已经存在，无需添加')
                     }
                 }.bind(this)
             })

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

@@ -41,8 +41,8 @@ var vm = new Vue({
             statusEnum: ['存续', '吊销', '注销', '撤销'],
             statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
             seeList: {
-                pageNum: 0, // 当前页
-                pageSize: 50, // 每页多少条数据
+                pageNum: 1, // 当前页
+                pageSize: 10, // 每页多少条数据
                 total: 0, // 总页数
                 list: [] // 返回的数据
             }
@@ -51,7 +51,6 @@ var vm = new Vue({
     created() {
         this.years = new Date().getFullYear()
         this.months = parseInt(new Date().getMonth() + 1)
-        // this.dateVal = this.years + '年' + this.months + '月'
         this.dateVal = new Date()
         this.subPoint()
         this.subRecord()
@@ -75,7 +74,7 @@ var vm = new Vue({
                 year: this.years,
                 month: this.months,
                 pageSize: this.seeList.pageSize,
-                pageNum: this.seeList.pageNum
+                pageNum: this.seeList.pageNum - 1
             }
         },
         subRecord() {
@@ -89,7 +88,7 @@ var vm = new Vue({
                 var _this = this
                 if (res.error_code == 0 && res.data.list) {
                     if (res.data.total) {
-                        this.listState.total = res.data.total
+                        this.seeList.total = res.data.total
                     }
                     res.data.list.forEach(v => {
                         const arrs = {
@@ -114,12 +113,13 @@ var vm = new Vue({
         },
         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 = 0
+            this.seeList.pageNum = 1
             this.seeList.list = []
             this.subRecord()
         },

src/web/staticres/js/pc_detail_tags.js

@@ -295,7 +295,8 @@ function addTagsAjax (name) {
         }
         getUserTags()
       } else {
-        toastFn(r.error_msg, 1000)
+        // toastFn(r.error_msg, 1000)
+        toastFn('标签已经存在，无需添加', 1000)
       }
     }
   })

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

@@ -46,7 +46,7 @@
                 <i class="el-icon-arrow-down r-icons" @click="dateHandler"></i>
             </div>
         </div>
-        <div class="see-content w" v-show="seeList.length !== 0">
+        <div class="see-content w" v-show="seeList.list.length !== 0">
             <div class="lists flex" v-for="item in seeList.list" :key="item._id">
                 <div class="words-img" :style="{'background-color': item.color}" @click="detailed(item._id)">
                     <span>{item.abbr1}</span><span class="xin-xi">{item.abbr2}</span>
@@ -59,7 +59,7 @@
                     <div class="cont-tips di-zhi">地址：<span>{item.address}</span></div>
                 </div>
             </div>
-            <div class="el-pagination-container">
+            <div class="el-pagination-container" v-show="seeList.total">
                 <el-pagination
                     background
                     layout="prev, pager, next, ->"
@@ -71,7 +71,7 @@
                 ></el-pagination>
             </div>
         </div>
-        <div class="no-data" v-show="seeList.length === 0"><el-image src="/images/pc_12.png"></el-image><div class="tip-text"><p>暂无数据</p></div></div>
+        <div class="no-data" v-show="seeList.list.length === 0"><el-image src="/images/pc_12.png"></el-image><div class="tip-text"><p>暂无数据</p></div></div>
     </section>
 
     {{include "/common/pcbottom.html"}}

src/web/templates/pc/entsearchindex.html

@@ -105,7 +105,7 @@
                                 trigger="hover">
                                 <div class="popover-content" v-if="entUseInfo.used < entUseInfo.total" key="popover-content">
                                     <p>超级订阅用户，每购买一个省，每月可看50个画像。</p>
-                                    <p>您当前订阅了${getVipSubText}，如需查看更多，请前往订阅更多省份。<span class="popover-link" @click="openVipPage('popover-link')">前往</span></p>
+                                    <p v-show="false">您当前订阅了${getVipSubText}，如需查看更多，请前往订阅更多省份。<span class="popover-link" @click="openVipPage('popover-link')">前往</span></p>
                                 </div>
                                 <div class="popover-content" v-else key="popover-content">
                                     <p>超级订阅用户，每购买一个省，每月可看50个画像。</p>

src/web/templates/pc/index.html

@@ -122,7 +122,8 @@
 			<div class="search">
 				<form method="post" action="/jylab/supsearch/index.html" id="zbIndex">
 					<input class="ser" autocomplete="off"  type="text" name="keywords" placeholder="请输入您想要查询的招标信息" id="keywords" value="" />
-					<input type="hidden" name="searchvalue">
+          <input type="hidden" name="searchvalue">
+          <input type="hidden" name="publishtime" value="lately-30">
 					<input class="btn" type="button" onclick="zbSeatch('zbIndex')" />
 				</form>
         <div class="index_search_thikn">

src/web/templates/pc/supsearch.html

@@ -1164,7 +1164,7 @@ $(function(){
 						<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
 						<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
 					</span><br>
-					<div style="display:none;" id="allSearchModel">试试<span onclick="NullSuperSearch()" style="color:#2cb7ca;text-decoration:underline;line-height: 30px;cursor: pointer;">全文搜索</span></div>
+<!--					<div style="display:none;" id="allSearchModel">试试<span onclick="NullSuperSearch()" style="color:#2cb7ca;text-decoration:underline;line-height: 30px;cursor: pointer;">全文搜索</span></div>-->
 				</div>
 			</div>
 			<div class="working" style="display: none;">
@@ -1686,7 +1686,8 @@ function addTagsAjax (name) {
         }
         getUserTags()
       } else {
-        toastFn(r.error_msg, 1000)
+        // toastFn(r.error_msg, 1000)
+        toastFn('标签已经存在，无需添加', 1000)
       }
     }
   })

src/web/templates/weixin/wxsearchlist.html

@@ -674,7 +674,7 @@ body{
 <div>
 	<div class="selLable" id="selLable" >
 		<div class="com-title"><!--height:30px; margin-top:20px;-->
-			<span onclick="allSearch()" id="span1" >全文搜索</span><img src="{{Msg "seo" "cdn"}}/images/wx/line@2x.png" style="height:30px;vertical-align:middle;"><span id="span2" onclick="titleSearch()"  style="color:black;">标题搜索</span>
+<!--			<span onclick="allSearch()" id="span1" >全文搜索</span><img src="{{Msg "seo" "cdn"}}/images/wx/line@2x.png" style="height:30px;vertical-align:middle;"><span id="span2" onclick="titleSearch()"  style="color:black;">标题搜索</span>-->
 		</div>
 	</div>
 	<div class="wxsearch">