Merge branch 'dev4.5' of ssh://192.168.3.207:10022/qmx/jy into dev4.5

src/jfw/front/supsearch.go

@@ -248,8 +248,8 @@ func (p *Pcsearch) PcSearchIndex() error {
 	//高级筛选 仅vip用户可查询
 	var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 	var buyerclass string = ""                    //采购单位类别
-	vipData := jy.GetBigVipUserBaseMsg(userId, public.Mysql, public.MQFW)
-	if vipData.Status > 0 || vipData.VipStatus > 0 {
+	isPayedUser := jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser()
+	if isPayedUser {
 		buyerclass = p.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = p.GetString("buyertel"), p.GetString("winnertel")
 	}
@@ -396,7 +396,7 @@ func (p *Pcsearch) PcSearchIndex() error {
 	p.T["industry"] = industry
 	p.T["industrylist"] = industrylist
 	p.T["sortArray"] = sortArray
-	p.T["showVipScreen"] = vipData.Status > 0 || vipData.VipStatus > 0
+	p.T["showVipScreen"] = isPayedUser
 	//
 	if userId != "" {
 		//企业画像 权限

src/jfw/front/swordfish.go

@@ -119,8 +119,8 @@ func (m *Front) PcAjaxReq() {
 	//高级筛选 仅vip用户可查询
 	var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 	var buyerclass string = ""                    //采购单位类别
-	vipData := jy.GetBigVipUserBaseMsg(userId, public.Mysql, public.MQFW)
-	if vipData.Status > 0 || vipData.VipStatus > 0 {
+
+	if jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser() {
 		buyerclass = m.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
 	}
@@ -437,8 +437,8 @@ func (m *Front) WxsearchlistPaging() {
 			//高级筛选 仅vip用户可查询
 			var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 			var buyerclass string = ""                    //采购单位类别
-			vipData := jy.GetBigVipUserBaseMsg(userId, public.Mysql, public.MQFW)
-			if vipData.Status > 0 || vipData.VipStatus > 0 {
+
+			if jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser() { //超级订阅、大会员、商机管理
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
 			}

src/jfw/modules/app/src/app/front/swordfish.go

@@ -273,12 +273,12 @@ func (m *Front) WxsearchlistPaging() {
 			//高级筛选 仅vip用户可查询
 			var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 			buyerclass := ""                              //采购单位类别
-			vipData := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
-			if vipData.Status > 0 || vipData.VipStatus > 0 {
+
+			if jy.GetVipState(public.Mysql, public.MQFW, userid).IsPayedUser() {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
 			}
-			if vipData.CheckBigVipBackPower("search") {
+			if jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW).CheckBigVipBackPower("search") {
 				winner = m.GetString("winner")
 			}
 			//全文检索限制

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

@@ -422,6 +422,8 @@ var vNode = {
                             } else {
                                 _this.digshow = false
                             }
+                            _this.entInfo.followSearchFinish = true
+                            _this.entInfo.entExist = false
                         }
                         if (_this.svip || res.data.viper) {
                             _this.entInfo.followSearchFinish = true

src/jfw/modules/app/src/web/staticres/jyapp/course/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -165,33 +165,33 @@ float: right;*/
     display: flex;
     justify-content: center;
   }
-  
+
   .dialog_alert .quotacenter .topimgdiv .topimg {
     width: 3.2rem;
     height: 2.64rem;
   }
-  
+
   .dialog_alert .quotacenter .quotamain {
     display: flex;
     flex-direction: column;
     align-items: center;
     margin-top: 1.94rem;
   }
-  
+
   .dialog_alert .quotacenter .quotamain .alreadcare {
     font-weight: bold;
     font-size: 0.36rem;
     line-height: 0.52rem;
     color: #2ABED1;
   }
-  
+
   .dialog_alert .quotacenter .quotamain .purcare {
     margin-top: 0.16rem;
     font-size: 0.28rem;
     line-height: 0.4rem;
     color: #5F5E64;
   }
-  
+
   .dialog_alert .quotacenter .quotamain .prudiv {
     margin: 0.8rem 0 0.48rem;
     padding: 0 0.48rem;
@@ -199,7 +199,7 @@ float: right;*/
     height: 0.8rem;
     box-sizing: border-box;
   }
-  
+
   .dialog_alert .quotacenter .quotamain .prudiv .prubtn {
     display: flex;
     justify-content: center;
@@ -211,7 +211,7 @@ float: right;*/
     font-size: 0.36rem;
     color: #33323A;
   }
-  
+
   .dialog_alert .quotacenter .whiteclose {
     position: fixed;
     right: 0;
@@ -1101,8 +1101,8 @@ ul {
 }
 .collec_star .shoucang{
     display: inline-block;
-    width: .32rem;
-    height: .32rem;
+    width: .36rem;
+    height: .36rem;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHRSURBVHgB1VVLTsMwEH1jCB8hpHICwpIVsASERE4CV+AEcARuAjdoJYTY0e4QbBpOQBGC8quH5/RD2jiti7rhSZNY8fjNmxnbAaaAVlFxNs2a+WmcEeECJhslmDX0Cod6Dc2M49B1JtQRgtPBeC43nkWATLHkVCuzCcwiLAODo8K3wCxkkgN3TYwFNL2TFokcoIbQAHpDsi9sU3FMW6fKWFfkEO+oyIf61qdkSPluMNgjS9fgupbs850PwHqecaKQsi5yerWn4UshL+pUh0FwIns47/bA4JLPVsFpKTeOBLpmoMsTq+o2QYtW61K7YN2UkkKQSEZVASsM5LIyY8iFvemVaeCWfTDYAbKaulNbDpZOK8YXJM2T9zUNC3CNtqiyFLFTOxau72/sTVu75Ibkuz2BZQH6QViGOksUdLHJm6Z41wK5g7eSmWMkKUJg1e2wlo/cYdxtuo1J+N26cZmLN4PPhwnkSuJX2vPgXFT0lgczNIDRuRhlcKqfSNweOdlt/z/C3wOrxQxEax1rE5InVJ0W5kvK5O2BMbqlgw2mjY7Vk2hz6FLb4I/nmG93vcQ9qd4SeWEfpGrvpfl9l5GMhQtEa9LqCIXWp/ux/3XN/8APC++o0hFQWAMAAAAASUVORK5CYII=) no-repeat;
     background-size: contain;
 }
@@ -1112,4 +1112,4 @@ ul {
     height: .32rem;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAJESURBVHgB1VXRbdswEL2jqH5rg7gT1NnA3iAdIKmNxiqCfhSdQOkETb+M2goUxO13vEHcCapOEGUDfQaQyOsdYQV2ItdU/noATYt6994deUcBdLAsyyIZXXx0F3Bt9M3679DXR/kCp/PFgCc35vNs4OvnLaAREgQqAKgE1Imvn5dAE7218MUSfoMOWXgJhIjvJPo4Prl6peuLLlnsFZhOsx4BjSR6eR6Px2WXLPApmQp1H4h6WqkDwzMDBhx9GQTmUMgFJ6Vam+AOQZUsXijEvLb23oLJLUH5MR7nWwLf54tzxYe4rc3bAFggUm4N/JLt2XybposjC8BbBz3G8sCt/rBEnz9MTi5cHyDVS8Dgk4DY4W1V1fnZ2biAf9jp6fGSp2XzLFlVVXCECjMJDsmsZN2dQcwpkTXDddRf4QX28AARKJUIh3DF6216PGRZqCtzaMFCGIa3ch6+5IIN2Eex7ya5GLaDAwYrqKpquG+rNsmryjzDPytTARgGEthIhzqDPRaG+mYXeatAI4JcQeBnBQGWuzLd2WgE0OfxB/YYn9k9uFJtt1aB2Szrr0VWzZqU4fxykcxm16MtMDcZ/0Zp+vPAW0Ap3ZO5tnXhBC+vR5UJf7PiudR5mv64exQyxlWMdWXuKWDIugy4u6MZkyFh5q5q4g8NDynlRogwGLhskXptXK1ftADVG5KXqG/ZNRfSyeR4tQF5LVkRUcL3kGvMQOGBtwCTRxKx3KBP76DG4vdu/UqE2CHhFPrga10/7C/1+T/sL+2vJ0ALxXBYAAAAAElFTkSuQmCC) no-repeat;
     background-size: contain;
-}
+}

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

@@ -52,29 +52,28 @@ var vm = new Vue({
         industrytimer: '',
         keytimer: '',
         noticetimer: ''
-      }
+      },
+      iosMeauStyle: false
     }
   },
   created () {
     var recover = this.recover()
     if (!recover) {
       this.getUserRoot()
+      setTimeout(() => {
+        // 如果订阅消息进来时间不清空
+        if(this.time !== '') {
+          sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
+          this.setPushTime(this.time)
+          this.revorceOtherData()
+        }else{
+          // 清空筛选数据
+          this.revorceData()
+        }
+      })
     }
     this.addEventListerWeb()
   },
-  mounted () {
-    setTimeout(() => {
-      // 如果订阅消息进来时间不清空
-      if(this.time !== '') {
-        sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
-        this.setPushTime(this.time)
-        this.revorceOtherData()
-      }else{
-        // 清空筛选数据
-        this.revorceData()
-      }
-    })
-  },
   methods: {
     addEventListerWeb: function() {
       let _this = this
@@ -163,12 +162,18 @@ var vm = new Vue({
       this.key = ''
       this.buyerclass = ''
     },
+    open: function() {
+      this.iosMeauStyle = true
+    },
+    close: function() {
+      this.iosMeauStyle = false
+    },
     // 订阅推送消息展示数据
     setPushTime: function(time) {
       console.log(time)
       let pushtime = {
-        start: parseInt(time.split('_')[0]),
-        end: parseInt(time.split('_')[0]),
+        start: parseInt(time.split('_')[0] * 1000),
+        end: parseInt(time.split('_')[0] * 1000),
       }
       this.tagText.timeText = new Date(pushtime.start).pattern('yyyy.MM.dd') + '~' + new Date(pushtime.end).pattern('yyyy.MM.dd')
       this.selectDate.startDate = pushtime.start

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -2594,7 +2594,7 @@ var SuperSearch = {
 				homeListHtml +='<div class="area">'+area+'</div>'
 				var industry = _list["industry"];
 				var subtype = _list["subtype"];
-				var buyerclass = _list["buyerclass"];
+				var buyerclass = _list["buyerclass"] || '';
 				if(SuperSearch.hasSubscribe||SuperSearch.isVip){
 					industry = _list["s_subscopeclass"];
 					subtype = _list["type"];
@@ -2608,6 +2608,10 @@ var SuperSearch = {
 				if (SuperSearch.isVip || jyUserPower.vip > 0 || jyUserPower.member || jyUserPower.entniche) {
 					if (buyerclass!="") {
 						homeListHtml +='<div class="buyerclass">'+buyerclass+'</div>'
+					} else {
+            if (industry!=""){
+              homeListHtml +='<div class="industry">'+industry+'</div>'
+            }
 					}
 				} else {
 					if (industry!=""){

src/jfw/modules/app/src/web/staticres/jyapp/local/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/jfw/modules/app/src/web/staticres/jyapp/wx_course/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

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

@@ -46,6 +46,7 @@
         .app-layout-header{
             padding-left: 16px;
             padding-right: 16px;
+            padding-top: 20px;
         }
         .app-layout-header .switch-vip:before, .app-layout-header .only-vip:before {
             height: 18px;
@@ -64,7 +65,7 @@
             font-size: 12px;
         }
         ._header .filter_tab{
-            height: .88rem;
+            /* height: .88rem; */
             /* padding-left: 16px; */
         }
         .app-layout-content-b .app-content::after{
@@ -73,6 +74,16 @@
             height: 8px;
             background: #F5F6F7;
         }
+        .iosMeau{
+            height: 100%;
+        }
+       .app-layout-content-b {
+            height: calc(100vh - 89px);
+            overflow: hidden;
+       }
+       #dropDownItemGroup .van-dropdown-item__content {
+         max-height: 70vh;
+       }
     </style>
 </head>
 <body class="p13" id="viperSuper" style="background: #fff;overflow: hidden;">
@@ -109,7 +120,7 @@
   		<div class="header_header" style="height: 60px;display:none;transition: all 0.1s;">
   			<div class="only-personal" style="position: absolute;top: .35rem;left: 4%;background-image: url(/jyapp/vipsubscribe/image/entback.png?v=51430);background-size: 100%;background-repeat: no-repeat;border-radius: 8px;width: 92%;display: flex;align-items: center;justify-content: space-between;height: 44px;">
   				<img style="width: 20px;height: 20px; margin-left: .3rem;" src="/jyapp/vipsubscribe/image/vip-icon.png?v=1">
-  				<span  data-name="doubleEleven_title" style="position: absolute;color:#fff;font-weight: bold;font-size: 15px;text-align: left;left: 43px;">全国企业随手查，竞争实力尽展示！</span>
+  				<span  data-name="doubleEleven_title" style="padding: 0 .12rem;flex: 1;font-size: .26rem;font-weight: 700;color: #fff;">全国企业随手查，竞争实力尽展示！</span>
   				<span  data-name="doubleEleven_button" class="switch_ext" id="app-historypush-vipSub-banner" style="border-radius: 32px;display: flex;flex-direction: row;padding: 3px 12px;font-size: 12px;color: #FAE7CA;margin-right: .2rem;background: linear-gradient(to bottom, #F1D090 0%, #FAE7CA 100%);color: #33323A;font-family: PingFang SC;font-size: 12px;line-height: 18px;letter-spacing: 0px;text-align: center;white-space: nowrap;">立即使用</span>
   			</div>
   		</div>
@@ -130,10 +141,10 @@
                     </div>
                 </div> -->
                     <van-dropdown-menu style="width: auto;overflow-x: auto;">
-                        <van-dropdown-item :title="tagText.timeText"  ref="dateItem">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" @open="open" @close="close">
                             <date-component :key="setTimer.datetimer" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
                         </van-dropdown-item>
-                        <van-dropdown-item ref="areaItem">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="areaItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="areaText">地区</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -144,7 +155,7 @@
                             <area-component :key="setTimer.areatimer" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectarealist="selectAreaList"></area-component>
                             <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
                         </van-dropdown-item>
-                        <van-dropdown-item ref="industryItem">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" ref="industryItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="industryText">行业</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -155,7 +166,7 @@
                             <industry-component :key="setTimer.industrytimer" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectindustrylist="selectIndustryList"></industry-component>
                             <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
                         </van-dropdown-item>
-                        <van-dropdown-item  ref="cateItem">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false"  ref="cateItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="cateText">采购单位</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -166,7 +177,7 @@
                             <cate-component @cancel="cancel" v-if="screenShow" @confirm="confirm" :key="setTimer.catetimer" :selectcatelist="selectCateList"></cate-component>
                             <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
                         </van-dropdown-item>
-                        <van-dropdown-item title="关键词" ref="keywordItem">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="关键词" ref="keywordItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="keywordText">关键词</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -177,7 +188,7 @@
                             <keyword-component :key="setTimer.keytimer" @cancel="cancel" v-if="screenShow" @confirm="confirm"  :selectkeywordlist="selectKeyWordList"></keyword-component>
                             <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
                         </van-dropdown-item>
-                        <van-dropdown-item title="公告类型" ref="noticeItem">
+                        <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" title="公告类型" ref="noticeItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="noticeText">公告类型</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -194,6 +205,7 @@
             </div>
         </div>
         <div class="color_top" style="display:none;"></div>
+        <div id="dropDownItemGroup" class="collection"></div>
         <div class="j-main">
             <div class="listcontent" onscroll="listScroll()">
                 <div id="list"></div>
@@ -529,19 +541,18 @@
   var firstTime = {{.T.selectTime}}
     // firstTime = '1624377600'
   if( firstTime != '') {
-    firstTime = firstTime + "000" +'_'+ firstTime + "000";
+    firstTime = firstTime +'_'+ firstTime;
     vm.time = firstTime
   }else {
     firstTime = vm.time
   }
-  
+
   var userId = "";
   var selectCity = vm.area; // 地区
   var selectIndustry = vm.subscopeclass // 行业
   var selectCate = vm.buyerclass // 采购单位
   var selectKeyword = vm.key // 关键词
   var selectNotice = vm.subtype // 公告类型
-  //console.log(selectCity,selectIndustry,selectCate,selectKeyword,selectNotice, '11')
   //获取当前时间
   var date = (function () {
       var date = new Date();
@@ -553,6 +564,24 @@
       return year + '-' + month + '-' + day;
   })();
 
+    let listparams = {
+        pageNum: 1
+    }
+    var listnum = 0
+    $.ajax({
+        url: '/publicapply/bidcoll/list',
+        type: "POST",
+        contentType: 'application/json;charset=utf-8',
+        data: JSON.stringify(listparams),
+        success: function(res) {
+            if(res.error_code == 0) {
+                if(res.data && res.data.res) {
+                    listnum = res.data.res.length
+                }
+            }
+        }
+    })
+
   function initpage() {
       afterJyObjInit();
       var thisClass=this;
@@ -659,24 +688,24 @@
             showPage();
         } else {
             userId = sessionStorage.userId;
-            if (window.location.href.indexOf("selectTime") < 0 && sessionStorage.getItem(userId + "_searchTime") != null && sessionStorage.getItem(userId + "_searchTime") != "") {
-                firstTime = sessionStorage.getItem(userId + "_searchTime");
-            }
-            if (sessionStorage.getItem(userId + "_selectCity") != null && sessionStorage.getItem(userId + "_selectCity") != "") {
-                selectCity = sessionStorage.getItem(userId + "_selectCity");
-            }
-            if (sessionStorage.getItem(userId + "_selectIndustry") != null && sessionStorage.getItem(userId + "_selectIndustry") != "") {
-                selectIndustry = sessionStorage.getItem(userId + "_selectIndustry");
-            }
-            if (sessionStorage.getItem(userId + "_selectCate") != null && sessionStorage.getItem(userId + "_selectCate") != "") {
-                selectCate = sessionStorage.getItem(userId + "_selectCate");
-            }
-            if (sessionStorage.getItem(userId + "_selectKeyword") != null && sessionStorage.getItem(userId + "_selectKeyword") != "") {
-                selectKeyword = sessionStorage.getItem(userId + "_selectKeyword");
-            }
-            if (sessionStorage.getItem(userId + "_selectNotice") != null && sessionStorage.getItem(userId + "_selectNotice") != "") {
-                selectNotice = sessionStorage.getItem(userId + "_selectNotice");
-            }
+            // if (window.location.href.indexOf("selectTime") < 0 && sessionStorage.getItem(userId + "_searchTime") != null && sessionStorage.getItem(userId + "_searchTime") != "") {
+            //     firstTime = sessionStorage.getItem(userId + "_searchTime");
+            // }
+            // if (sessionStorage.getItem(userId + "_selectCity") != null && sessionStorage.getItem(userId + "_selectCity") != "") {
+            //     selectCity = sessionStorage.getItem(userId + "_selectCity");
+            // }
+            // if (sessionStorage.getItem(userId + "_selectIndustry") != null && sessionStorage.getItem(userId + "_selectIndustry") != "") {
+            //     selectIndustry = sessionStorage.getItem(userId + "_selectIndustry");
+            // }
+            // if (sessionStorage.getItem(userId + "_selectCate") != null && sessionStorage.getItem(userId + "_selectCate") != "") {
+            //     selectCate = sessionStorage.getItem(userId + "_selectCate");
+            // }
+            // if (sessionStorage.getItem(userId + "_selectKeyword") != null && sessionStorage.getItem(userId + "_selectKeyword") != "") {
+            //     selectKeyword = sessionStorage.getItem(userId + "_selectKeyword");
+            // }
+            // if (sessionStorage.getItem(userId + "_selectNotice") != null && sessionStorage.getItem(userId + "_selectNotice") != "") {
+            //     selectNotice = sessionStorage.getItem(userId + "_selectNotice");
+            // }
             $.ajax({
                 type: 'post',
                 url: '/jyapp/front/hasPushHistory?t=' + new Date().getTime(),
@@ -708,11 +737,12 @@
 
                     // 非vip的新用户
                     if (myInfo.userType !== 'vip') {
+                        // data.data.length = 0
                         // 如果是新用户(没有推送历史数据，没有关键词)，直接就显示空页面
                         if (data.data.length === 0 && myInfo.haskey === false && !firstTime) {
                             $('.filter_tab').hide()
                             $('.header_header').hide()
-                            $('.findnull-no-key').css({display: 'block'}).siblings('.empty').hide()
+                            $('.findnull-no-key').css({"display": 'block'}).siblings('.empty').hide()
                             return
                         } else {
                             $('.header_header').show()
@@ -740,6 +770,7 @@
                     hasNoData();
                 }
             });
+            // firstPage.length = 0
             if (firstPage.length == 0) {
                 //sessionStorage.removeItem("search_starttime");
                 sessionStorage.removeItem(sessionStorage.userId + "_searchTime");
@@ -933,14 +964,12 @@ window.listScroll = function() {
   }
 
   function loadDatas(me, le) {
-    //console.log('pag1')
       wxflag = me;
       selectCity = vm.area; // 地区
       selectIndustry = vm.subscopeclass // 行业
       selectCate = vm.buyerclass // 采购单位
       selectKeyword = vm.key // 关键词
       selectNotice = vm.subtype // 公告类型
-      //console.log(vm.hasNextPage)
       if(vm.hasNextPage) {
         $.ajax({
           type: 'post',
@@ -992,9 +1021,11 @@ function hasNoData() {
     $("#loading").hide()
     $(".color_top").hide()
     // 如果no-key-no-data 不显示，才会显示no-data
-    //console.log(nokeyNoDataShow, 'nokeyNoDataShow')
     if (!nokeyNoDataShow || !NoDataShow) {
-        $(".findnull_").css("display", "block").siblings('.empty').hide()
+        $(".findnull_").css("display", "block")
+        $('.findnull_').siblings('.empty').hide()
+    } else {
+        $(".findnull_").css("display", "none")
     }
 }
 
@@ -1181,18 +1212,13 @@ function hasNoData() {
             const _this = this
             e.stopPropagation()
             const id = $(this).attr('data-id')
-            const paramsObj = {
-                binfo: [
-                    {
-                    bid: id
-                    }
-                ]
-            }
             var shoucang = $(_this).find('.weishoucang').is(':hidden')
             // 说明未收藏，点击收藏
             if (vKeepComponent) {
                 vKeepComponent.changeBid(id, !shoucang)
-                vKeepComponent.changeKeepStatus(!shoucang, _this)
+                if(listnum < 100) {
+                    vKeepComponent.changeKeepStatus(!shoucang, _this)
+                }
             }
         })
   }
@@ -1219,9 +1245,11 @@ function hasNoData() {
         if(type) {
             $(that).find('.shoucang').show()
             $(that).find('.weishoucang').hide()
+            listnum++
         } else {
             $(that).find('.shoucang').hide()
             $(that).find('.weishoucang').show()
+            listnum--
         }
     }
 
@@ -1375,7 +1403,7 @@ function hasNoData() {
           }
       });
       dataCache = firstPage;
-      //console.log(firstPage.length == 0)
+    //   firstPage.length = 0
       if (firstPage.length == 0) {
           if ($(".findnull").css("display") == "block") {
               $(".findnull").css("display", "none");
@@ -1673,125 +1701,7 @@ function hasNoData() {
         if (firstTime != "" && firstTime != null) {
             date = formatDate(firstTime / 1000, "1");
         }
-        // 点击选择时间
-        $('#showDatePicker').on('click', function () {
-            //console.log('11')
-            var that = this
-            // 判断头部vip订阅广告是否显示
-            var isAdShow = $('.header_header').is(':visible')
-            if (isAdShow) {
-                $('.header_header').hide()
-            }
-
-            // 给取遮罩绑定点击事件
-            function closeTimePicker () {
-                var timeResultBox = $(that).find('.time_result')
-                var timeResult = timeResultBox.text()
-                // 点击取消或者空白处，时间选择器消失。判断#showDatePicker是否高亮
-                if (timeResult === '时间') {
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                }
-            }
-            $('.jymobile-datePicker .weui-mask').on('click', closeTimePicker)
-            // 关闭地区选择
-            if ($('.screen').css("display") !== "none") {
-                if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
-                    $('#showArea').find("span").toggleClass("current");
-                }
-                $('.area_container').slideUp();
-                $('.screen').hide();
-            }
-
-            // weui 时间选择器
-            if (Boolean($(".jymobile-datePicker").html())) {
-                $(".jymobile-datePicker .weui-mask").click()
-                $(".jymobile-datePicker .weui-mask").trigger('click')
-            } else {
-                var computedTop = $("._header").offset().top + $("._header").height() - 1
-                $("._header").addClass('fix-top')
-                $(".filter_tab").addClass('is-hide-border')
-                weui.datePicker({
-                    id: 'up',
-                    start: 2000,
-                    title: '选择时间',
-                    container: '.app-content',
-                    end: new Date(),
-                    defaultValue: date.split('-'),
-                    className: 'jymobile-datePicker up',
-                    onChange: function (result) {
-                        var nowTArr = result.map(function (v) {
-                            return v.label
-                        })
-                        $(".jymobile-datePicker.up .weui-picker__item").each(function(){
-                            var nowT = $(this).text()
-                            $(this).removeClass('is-now-select')
-                            if (nowTArr.indexOf(nowT) !== -1) {
-                                $(this).addClass('is-now-select')
-                            }
-                        })
-                    },
-                    onClose: function () {
-                        $("._header").removeClass('fix-top')
-                        $(".filter_tab").removeClass('is-hide-border')
-                        closeTimePicker()
-                        if (isAdShow) {
-                            $('.header_header').show()
-                        }
-                    },
-                    onConfirm: function (result) {
-                        var year = result[0].value;
-                        var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
-                        var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
-                        var time_result = year + '.' + month + '.' + day;
-                        FTAGData(year + '-' + month + '-' + day)
-                        $('.time_result').html(time_result)
-                    }
-                });
-                $(".jymobile-datePicker.up #weui-picker-confirm").text('确认')
-                $(that).find('.time_result').addClass('current')
-                $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend("<a href=\"javascript:;\" class=\"weui-btn weui-btn_disabled weui-picker__btn\" id=\"resetTime\" data-action=\"select\" style=\"text-decoration: none;\">\u91CD\u7F6E</a>");
-                // $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
-                $(".jymobile-datePicker.up #resetTime").on('click',function () {
-                    FTAGData();
-                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').trigger('click');
-                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').click();
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                })
-            }
-            // 日期选择器样式修改--start---------------------
-            // 修改标题
-            // $('.jymobile-datePicker .weui-picker__hd a[data-action=cancel]')
-            // $('.jymobile-datePicker .weui-picker__hd a:first').removeClass('weui-picker__action').addClass('jymobile-picker__action').text('选择时间')
-            // $("#weui-picker-confirm").css("text-decoration", "none");
-        });
-        // 选择地区
-        $('#showArea').on('click', function () {
-            // 关闭时间选择
-            if (Boolean($(".jymobile-datePicker").html())) {
-                $(".jymobile-datePicker .weui-mask").click()
-                $(".jymobile-datePicker .weui-mask").trigger('click')
-                var timeResult = $('#showDatePicker').find('.time_result').text()
-                // 点击取消或者空白处，时间选择器消失。判断#showDatePicker是否高亮
-                if (timeResult === '时间') {
-                    $('#showDatePicker').find('.time_result').removeClass('current').text('时间')
-                }
-            }
-            //if(_scrollTop==0){
-            //	_scrollTop = scrollTop;
-            //}
-            //$(".subscribe").toggleClass('overClass');
-            //scrollHtml();
-            if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
-                $(this).find("span").toggleClass("current");
-            }
-            $('.area_container').slideToggle();
-            $('.screen').toggle();
-        })
 
-        // 扩大点击区域（点击城市名字也能选中）
-        $('.area_wrap .c_item .city-name').on('click', function () {
-            //$(this).parent().children('input').trigger('click')
-        })
         //
         $('.screen').click(function () {
             //$(".subscribe").toggleClass('overClass');
@@ -1802,67 +1712,6 @@ function hasNoData() {
             $('.area_container').slideUp();
             $('.screen').hide();
         })
-        // 地区选择确认按钮
-        $('.enter_btn').click(function () {
-            //$(".subscribe").toggleClass('overClass');
-            var cityCount = $('.area_wrap .city input:checked').length - $('.area_wrap .city .cityAll input:checked').length;
-            $('.area_container').slideUp();
-            $('.screen').hide()
-            selectCity = "" //重新选择 初始化地区 参数
-
-            if (!cityCount) {
-                $('#showArea .jymobile-tab-triangle').removeClass('current').text('地区');
-                ajaxFun(firstTime, selectCity);
-                return
-            }
-
-            // cityName对象
-            var selectCityName = []
-            // 判断省份后面的数字是否隐藏来确定该省份下的城市有没有被选择
-            $('.area_wrap .province .p_item').each(function (i, dom) {
-                var f = $(dom).find('.city-count').is(':hidden')
-
-                // 如果隐藏说明该省份下没有被选中的城市
-                if (f) {
-                    // 结束当前循环，进入下个循环
-                    return true
-                }
-                // 省份名称
-                var provinceName = $(dom).children('.province-name').text()
-                var citiesBox = $('.area_wrap .city .province_city').eq(i)
-                var selectedCities = citiesBox.find('input:checked').parent().children('.city-name')
-                // 城市数组
-                var cityArr = []
-                selectedCities.each(function (i, dom) {
-                    // 对获取到的城市名字符串去空格处理
-                    cityArr.push($(dom).text().replace(/\s+/g, ''));
-                })
-                for (var i = 0; i < cityArr.length; i++) {
-                    if (selectCity != "") {
-                        selectCity += ","
-                    }
-                    selectCity += cityArr[i];
-                }
-                selectCityName.push({
-                    province: provinceName,
-                    selectCity: cityArr
-                });
-            })
-            sessionStorage.setItem(userId + "_selectCityName", JSON.stringify(selectCityName));
-            ajaxFun(firstTime, selectCity);
-            // 重写地区text
-            $('#showArea .jymobile-tab-triangle').addClass('current').text('地区 '+cityCount);
-
-        })
-        $('.reset_btn').click(function () {
-            selectCity = ''
-            $('#showArea .jymobile-tab-triangle').removeClass('current').text('地区');
-            ajaxFun(firstTime, selectCity);
-            $('.area_wrap .province .city-count').hide().text('')
-            $('.c_item input[type="checkbox"]').prop('checked', false)
-            $('.screen').trigger('click')
-            $('.screen').click()
-        })
         // 关闭设置弹窗
         $('#close_set').on('click', function () {
             $('.set_keyword').hide()

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

@@ -247,7 +247,7 @@
             </div>
             <!-- 最新标讯 -->
             <div class="home_data">
-                <h3 class="data_nav" onclick="location.href='https://web-zyh.jydev.jianyu360.com/jyapp/jylab/mainSearch'">最新标讯</h3>
+                <h3 class="data_nav" onclick="location.href='https://web-zyh.jydev.jianyu360.com/jyapp/jylab/mainSearch'">最新标讯111</h3>
                 <div class="data_list">
                     <!--首页列表-->
                 </div>
@@ -486,6 +486,7 @@
 <!--S-当前页面的资源-->
 <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.js></script>
 <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/selector/js/china_area.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/money-mobile.js?v={{Msg "seo" "version"}}'></script>
@@ -762,6 +763,7 @@
         $('.selected-export .options').on('tap', 'span',function(e){
             var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
             var $this = $(this)
+            $(this).addClass('selected').siblings().removeClass('selected')
             // 如果已经显示，则判断点击的是否和上次相同
             if ($('.weui-mask').css('display') !== 'none') {
                 // 点击按钮的时候dialog显示了,显示的如果和这次的相同，则隐藏
@@ -776,7 +778,7 @@
                     // 和上次点击的相同，则关闭tab栏
                     hideTab()
 
-                    $(this).find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
+                    $(this).find('i').removeClass('icon-triangle-up').addClass('icon-triangle-down')
                     return // 直接结束函数
                 }
 
@@ -786,8 +788,8 @@
                         $(dom).show().siblings().hide()
 
                         // 切换上下三角
-                        $this.find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-shouqi')
-                        $this.siblings().find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
+                        $this.find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-up')
+                        $this.siblings().find('i').removeClass('icon-triangle-up').addClass('icon-triangle-down')
                         return false
                     }
                 })
@@ -803,8 +805,8 @@
                     $(dom).slideDown('fast').siblings().hide()
 
                     // 切换上下三角
-                    $this.find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-shouqi')
-                    $this.siblings().find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
+                    $this.find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-up')
+                    $this.siblings().find('i').removeClass('icon-triangle-up').addClass('icon-triangle-down')
                     return false
                 }
             })
@@ -827,10 +829,11 @@
                         $(dom).find('em').text(text);
                     }
                 }
-                $(dom).find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
+                $(dom).find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-down');
             })
             $(this).addClass('active')
             $(this).siblings().removeClass('active')
+            $('.selected-export .options .selected').removeClass('selected')
             hideTab()
             if (reqFlag){
                 if (dataVal=="searchtitle"){//标题搜索
@@ -847,7 +850,8 @@
 
         $('#selLable .weui-mask').on('tap', function(){
             hideTab()
-            $('.selected-export .options').find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
+            $('.selected-export .options .selected').removeClass('selected')
+            $('.selected-export .options').find('i').removeClass('icon-triangle-up').addClass('icon-triangle-down')
         })
         //
         $(".export").on("tap",function(){
@@ -1276,8 +1280,8 @@
         $('.newdialog .tab-box .sub-search-title').slideUp('fast');
         $('.newdialog .tab-box .sub-show-list').slideUp('fast');
         // 切换上下三角
-        $('.selected-export .options .search-title').find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
-        $('.selected-export .options .show-list').find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
+        $('.selected-export .options .search-title').find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-down');
+        $('.selected-export .options .show-list').find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-down');
         $('.weui-mask').hide();
         $('.app-layout-content-b').css({"overflow":"auto"});
     }

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

@@ -445,6 +445,100 @@
     .p13 .home .home_tab {
         padding: 0;
     }
+    #selLable .show-list i,
+    #selLable .export  i,
+    #selLable .search-title  i{
+        transform: unset;
+        width: 0.32rem;
+        height: 0.32rem;
+        margin-left: 0.04rem;
+        transition: all 0.2s;
+    }
+    #selLable .show-list i:before,
+    #selLable .export  i:before,
+    #selLable .search-title  i:before{
+        content: unset;
+    }
+    #selLable .options {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+    }
+    #selLable .search-title.selected,
+    #selLable .show-list.selected {
+        color: #2ABED1;
+    }
+
+    #selLable .search-title,
+    #selLable .show-list {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        font-weight: 500;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+        color: #5F5E64;
+        padding: 0.24rem 0.32rem;
+        margin-left: 0;
+        transition: all 0.2s;
+    }
+    #selLable .selected-export-box {
+        padding: 0;
+    }
+    #selLable .export {
+        right: 0;
+    }
+    #selLable .export i {
+        margin-right: 0.08rem;
+    }
+    #selLable .export > span {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        font-weight: 500;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+        color: #2ABED1;
+        padding: 0.24rem 0.32rem;
+        margin-left: 0;
+    }
+    #selLable .export:before {
+        content: unset;
+    }
+    #selLable  {
+        height: auto;
+    }
+    #selLable .newdialog {
+        border-top: 0.02rem solid #ebedf0;
+    }
+    #selLable .newdialog .tab-box .sub-tab li.active {
+        color: #2ABED1;
+    }
+    #selLable .newdialog .tab-box .sub-tab li {
+        font-weight: 500;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+        color: #5F5E64;
+        padding-left: 0;
+        padding-right: 0.32rem;
+    }
+    #selLable .newdialog .tab-box .icon-tick {
+        width: 0.48rem;
+        height: 0.48rem;
+    }
+    #selLable .newdialog .tab-box {
+        padding: 0;
+        padding-left: 0.32rem;
+    }
+    #selLable .newdialog .tab-box .sub-tab li:nth-of-type(2) {
+        border-top: 0.02rem solid #ebedf0;
+    }
+    #wrapper {
+        width: 100%;
+    }
 </style>
 
 <!--S-Loading-->
@@ -639,7 +733,7 @@
                                 <h3>您暂无使用权限</h3>
                                 <p>开通超级订阅，全国企业随手查，<br>搜索信息更高效！</p>
                             </div>
-                            <div class="condition-select-group" :class="{more: isMoreSelect}" v-show="conditionMap[activeTabIndex]">
+                            <div class="condition-select-group" :class="{more: isMoreSelect}" v-show="!isWaitBuy && conditionMap[activeTabIndex]">
                                 <div class="condition-select-item" @click="onSelectItem(item, activeTabIndex)" v-for="(item,i) in conditionMap[activeTabIndex]" :class="{checked: item.checked}">
                                     <div>@@item.title@@</div>
                                     <i v-if="!isMoreSelect" class="j-icon base-icon icon-tick"></i>
@@ -686,17 +780,17 @@
                     <div class="options">
 	                        <span class="search-title active" index="1">
 	                            <em>标题搜索</em>
-	                            <i class="jyapp-icon jyapp-icon-zhankai"></i>
+	                            <i class="j-icon base-icon icon-triangle-down"></i>
 	                        </span>
                         <span class="show-list active" index="2">
 	                            <em>列表显示</em>
                             <!-- jyapp-icon-shouqi -->
-	                            <i class="jyapp-icon jyapp-icon-zhankai"></i>
+	                            <i class="j-icon base-icon icon-triangle-down"></i>
 	                        </span>
                     </div>
                     <div class="export">
-	                        <span style="padding: 3px 8px 3px;border-radius: 10px;background: rgba(44,183,202, 0.1);">
-	                            <i class="jyapp-icon jyapp-icon-shujudaochu"></i>
+	                        <span>
+	                            <i class="j-icon base-icon icon-download"></i>
 	                            <em id="mainSearch-selLable-dataExport">数据导出</em>
 	                        </span>
                     </div>
@@ -706,21 +800,21 @@
                         <ul class="sub-tab sub-search-title" index="1"  style="display: none">
                             <li class="active" dataVal="searchtitle">
                                 <span>标题搜索</span>
-                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+                                <i class="j-icon base-icon icon-tick"></i>
                             </li>
                             <li dataVal="searchall">
                                 <span>全文搜索</span>
-                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+                                <i class="j-icon base-icon icon-tick"></i>
                             </li>
                         </ul>
                         <ul class="sub-tab sub-show-list" index="2" style="display: none">
                             <li class="active" dataVal="showlist">
                                 <span>列表显示</span>
-                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+                                <i class="j-icon base-icon icon-tick"></i>
                             </li>
                             <li dataVal="showtable">
                                 <span>表格显示</span>
-                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+                                <i class="j-icon base-icon icon-tick"></i>
                             </li>
                         </ul>
                     </div>
@@ -1239,7 +1333,7 @@
     <div class="resbm0">
         <div>
             <i class="icon iconfont" id="close_set">&#xe61a;</i>
-            <span>如果您对以上结果满意可【直接订阅】{{if and (not .T.isIosExam) (not .T.isIosExamPhone)}}<br>更有超级订阅等你试用。{{end}}</span>
+            <span>如果您对以上结果满意可【直接订阅】{{if and (not .T.isIosExam) (not .T.isIosExamPhone)}}。{{end}}</span>
             <a id="zjdy" style="text-decoration: none;">直接订阅</a>
         </div>
     </div>

src/jfw/modules/common/src/qfw/util/jy/payUser.go

@@ -0,0 +1,51 @@
+package jy
+
+import (
+	"mongodb"
+	qu "qfw/util"
+	"qfw/util/mysql"
+)
+
+//是否是付费用户
+type VipState struct {
+	VipState  int //超级订阅状态(1普通 2升级版)
+	BigMember int //大会员状态
+	EntMember int //商机管理用户状态
+}
+
+func GetVipState(mysql *mysql.Mysql, mg mongodb.MongodbSim, userId string) (vs *VipState) {
+	vs = &VipState{}
+	phone := ""
+	data, ok := mg.FindById("user", userId, `"i_member_status":1,"i_vip_status":1,"s_m_phone":1,"s_phone":1,"o_vipjy":1`)
+	if data != nil && len(*data) > 0 && ok {
+		i_vip_status := qu.IntAll((*data)["i_vip_status"])
+		if i_vip_status > 1 {
+			vs.VipState = 1
+			ovipjy, _ := (*data)["o_vipjy"].(map[string]interface{})
+			if ovipjy["o_buyset"] != nil {
+				o_buyset := ovipjy["o_buyset"].(map[string]interface{})
+				if o_buyset["upgrade"] != nil {
+					vs.VipState = 2
+				}
+			}
+		}
+		if i_member_status := qu.IntAllDef((*data)["i_member_status"], 0); i_member_status > 0 {
+			vs.BigMember = i_member_status
+		}
+		if s_phone, _ := (*data)["s_phone"].(string); s_phone != "" {
+			phone = s_phone
+		} else if s_m_phone, _ := (*data)["s_m_phone"].(string); s_m_phone != "" {
+			phone = s_m_phone
+		}
+		if phone != "" {
+			if mysql.CountBySql(`select count(1) from entniche_user where phone = ? and power =1`, phone) > 0 {
+				vs.EntMember = 1
+			}
+		}
+	}
+	return
+}
+
+func (vs *VipState) IsPayedUser() bool {
+	return vs.VipState > 0 || vs.BigMember > 0 || vs.EntMember > 0
+}

src/jfw/modules/followent/src/web/templates/_error.html

@@ -554,12 +554,16 @@ function infoListCss(){
 (function(){
     var myhost = location.host;
     var nowYear = new Date().getFullYear()
+    var copyrightMap = {
+        com: '京ICP备14030217号-3',
+        cn: '京ICP备2021020018号-1'
+    }
 	if(myhost.indexOf("jianyu360.com")>=0){
-		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.com 版权所有 | " + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a>')
+		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.com 版权所有 | " + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">'+ copyrightMap.com +'</a>')
 	}else if(myhost.indexOf("jianyu360.cn")>=0){
-		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.cn 版权所有 | " + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a>')
+		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.cn 版权所有 | " + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">'+ copyrightMap.cn +'</a>')
 	}else{
-		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.com 版权所有 | 豫ICP备15016539号-2")
+		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.com 版权所有 | " + copyrightMap.com)
 	}
 
 	$(".j-bottom .jy_province font").click(function(){

src/jfw/modules/publicapply/src/bidcollection.json

@@ -2,6 +2,7 @@
     "payUserCollLimit":5000,
     "freeUserCollLimit":10,
     "pageSize":50,
+    "freePageSize":100,
     "labelMaxCount":50,
     "collRedisDb":"other",
     "isCollRedisTime":259200,

src/jfw/modules/publicapply/src/bidcollection/entity/entity.go

@@ -354,6 +354,9 @@ func GetCollList(c *util.CollList, userid string) map[string]interface{} {
 		"res":          []map[string]interface{}{},
 	}
 	isPay, _ := Power(userid)
+	if !isPay {
+		pagesize_max = config.BidCollConfig.FreePageSize
+	}
 	if c.Pagesize != 0 {
 		pagesize_max = c.Pagesize
 	}

src/jfw/modules/publicapply/src/config/config.go

@@ -19,6 +19,7 @@ type BidColl struct {
 	PayUserCollLimit      int    //付费用户收藏数量最大限制
 	FreeUserCollLimit     int    //免费用户收藏数量最大限制
 	Pagesize              int    //付费用户收藏列表每页展示数量
+	FreePageSize          int    //免费用户收藏列表展示数量
 	LabelMaxCount         int    //标签数量最大限制
 	CollRedisDb           string //收藏的bid redis key
 	IsCollRedisTime       int    //是否收藏redis过期时间

src/jfw/modules/subscribepay/src/timetask/timetask.go

@@ -58,7 +58,7 @@ func updateDataExportStatus() {
 		log.Println("over_time:", over_time, "start_time:", start_time)
 		//查询未支付超时订单
 		wooList := util.Mysql.SelectBySql(`SELECT * FROM dataexport_order  WHERE order_status = 0 AND  create_time < ? AND create_time > ?`, over_time, start_time)
-		if len(*wooList) != 0 {
+		if wooList != nil && len(*wooList) != 0 {
 			for _, v := range *wooList {
 				if v["order_code"] != nil {
 					//订单编号

src/jfw/modules/subscribepay/src/util/coupon.go

@@ -90,6 +90,7 @@ func UpdateCouponState(userId, userLotteryId, nickName, orderCode string, model
 	res, err := http.PostForm(config.CouponConfig.CouponUpdate, data)
 	if err != nil {
 		log.Println(err.Error())
+		return false
 	}
 	defer res.Body.Close()
 	bs, _ := ioutil.ReadAll(res.Body)

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

@@ -55,7 +55,7 @@
     overflow: auto;
     height: .88rem;
     box-shadow: none;
-    border-bottom: 1.5px solid rgba(0,0,0,0.05);
+    /* border-bottom: 1.5px solid rgba(0,0,0,0.05); */
     z-index: 10;
 }
 .collection .van-dropdown-menu__item{
@@ -291,6 +291,9 @@
     color: #171826;
     line-height: .4rem;
 }
+.collection  .main-hidden{
+    overflow: hidden;
+}
 .collection .timeTag{
     display: -webkit-box;
     display: -webkit-flex;

src/web/staticres/common-module/collection/js/date-mobile.js

@@ -20,7 +20,7 @@ var dateComponentTemplate = `<div class="j-container">
           </span>
         </div>
       </div>
-      <div class="j-main">
+      <div class="j-main main-hidden">
         <van-datetime-picker
           class="datepopup"
           :show-toolbar="false"
@@ -54,7 +54,7 @@ var dateComponentTemplate = `<div class="j-container">
           </span>
         </div>
       </div>
-      <div class="j-main">
+      <div class="j-main main-hidden">
         <van-datetime-picker
           class="datepopup"
           :show-toolbar="false"
@@ -121,8 +121,8 @@ var dateComponent = {
       datePicker:{
         startshow: false,
         endshow: false,
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 0, 1),
+        maxDate: new Date(),
         startcurrentDate: new Date(),
         endcurrentDate: new Date(),
       },

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

@@ -123,6 +123,7 @@ var vNode = {
             // 获取企业基本信息
             this.getEntBaseInfo()
         }
+
     },
     mounted: function () {
         var _this = this
@@ -422,6 +423,8 @@ var vNode = {
                             } else {
                                 _this.digshow = false
                             }
+                            _this.entInfo.followSearchFinish = true
+                            _this.entInfo.entExist = false
                         } else {
                             _this.digshow = false
                         }

src/web/staticres/common-module/collection/js/keyword-mobile.js

@@ -94,10 +94,14 @@ var keywordComponent = {
         type: 'POST',
         success: function(res) {
           // 如果不是超级订阅会员，获取免费用户关键词
-          if(res.data.vip > 0) {
-            _this.isvip = true
+          if(res.data.vip <= 0) {
+            if(res.data.member || res.data.entniche) {
+              _this.isvip = false
+            } else {
+              _this.isvip = true
+            }
           } else {
-            _this.isvip = false
+            _this.isvip = true
           }
         }
       })
@@ -110,7 +114,7 @@ var keywordComponent = {
         type:'POST',
         success: function(res){
           console.log(res)
-          this.initlist = res.userData.o_vipjy.a_items
+          // this.initlist = res.userData.o_vipjy.a_items
           let maxarr = []
           if(_this.isvip) {
             let data = res.userData.o_vipjy.a_items
@@ -162,6 +166,7 @@ var keywordComponent = {
               }
               maxarr.push(obj)
             })
+            console.log(maxarr)
             _this.tablist = maxarr
           }
           _this.setState()

src/web/staticres/common-module/collection/js/notice-mobile.js

@@ -152,7 +152,6 @@ var noticeComponent = {
       let bool = true
       let noticeArr = this.selectnoticelist
       this.tablist.forEach(function(item) {
-        console.log(item)
         item[Object.keys(item)[0]].forEach(function(sum) {
           noticeArr.forEach(data => {
             if (data == sum.name) {
@@ -201,10 +200,8 @@ var noticeComponent = {
     },
     // 模块全选
     checkAll: function(data){
-      console.log(data)
       let selectBool = data[Object.keys(data)[1]]
       let dataArr = data[Object.keys(data)[0]]
-      console.log(selectBool, dataArr)
       if(selectBool) {
         data[Object.keys(data)[1]] = false
         dataArr.forEach(function(item, index){
@@ -263,7 +260,6 @@ var noticeComponent = {
         itemall[Object.keys(itemall)[0]].forEach(function(data) {
           let bool = true
           if(data.type) {
-            console.log(data)
             bool = false+''
           }
           boolArr.push(bool)
@@ -291,7 +287,6 @@ var noticeComponent = {
       this.tablist.forEach(function(item, index){
         item[Object.keys(item)[0]].forEach(function(data, i) {
           if(data.type){
-            console.log(data)
             let str = ''
             // 选择拟建项目传拟建，选择招标预告传预告
             if (data.name === '拟建项目') {

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -1,3 +1,35 @@
+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 + ' -> \'\'')
+      }
+      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 vEntSearchComponent = new Vue({
   el: '#v-ent-search-group',
   components: {
@@ -369,7 +401,7 @@ var vEntSearchComponent = new Vue({
           this.list = this.list.concat(r.data.list.map(function (v) {
             return {
               name: v.company_name,
-              abbr: (v.company_abbr || v.company_name).slice(0, 4),
+              abbr: getShortName(v.company_name),
               color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
               legal: v.legal_person,
               money: v.capital,
@@ -589,10 +621,12 @@ var vMainSearchComponent = new Vue({
           disabled: true
         },
         {
-          title: '中标企业联系方式'
+          title: '中标企业联系方式',
+          disabled: true
         },
         {
-          title: '采购单位联系方式'
+          title: '采购单位联系方式',
+          disabled: true
         }
       ],
       statusEnum: ['存续', '吊销', '停业', '撤销'],
@@ -680,6 +714,8 @@ var vMainSearchComponent = new Vue({
     },
     changePower (type, member) {
       this.entTabs[7].disabled = type
+      this.entTabs[8].disabled = type
+      this.entTabs[9].disabled = type
       this.entTabs[6].hide = !member
     },
     getMoreListToStr (key) {

src/web/staticres/common-module/ent-search/ent-search-template.prefixer.css

@@ -336,10 +336,6 @@
     margin: 0 0.04rem;
 }
 
-.v-ent-search-group .ent-search-tab-item.ent-p-disabled {
-    color: #C0C4CC !important;
-}
-
 .v-ent-search-group .ent-search-tab-item.ent-p-disabled .disabled-tag {
     display: inline-block;
 }
@@ -347,6 +343,9 @@
 .v-ent-search-group .ent-search-tab-item.ent-p-select {
     color: #2ABED1 !important;
 }
+.v-ent-search-group .ent-search-tab-item.ent-p-disabled {
+    color: #C0C4CC !important;
+}
 
 .v-ent-search-group .ent-search-tab-item.ent-p-hide {
     display: none;

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -384,9 +384,7 @@ Vue.component('keep-component', {
               overlayClass: 'z-2030',
               showCancelButton: false,
               confirmButtonText: '我知道了',
-            }).then(function () {
-              _this.goUpBuyPage()
-            }).catch(function () {});
+            }).then(function () {}).catch(function () {});
             return
           }
           if (r.error_msg === '免费用户收藏已达上限') {
@@ -396,7 +394,9 @@ Vue.component('keep-component', {
               className: 'ent-search-dialog',
               overlayClass: 'z-2030',
               confirmButtonText: '去升级'
-            }).then(function () {}).catch(function () {});
+            }).then(function () {
+              _this.goUpBuyPage()
+            }).catch(function () {});
             return
           }
           this.$toast(r.error_msg || '已取消收藏')

src/web/staticres/common-module/mainSearch/css/j-icons.css

@@ -346,6 +346,9 @@
 .icon-tick-circle {
     background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANySURBVHgB7VndUdtAEP5OsvPsDiIqiDMJmWEgg1VBTAVABZAKwBUEKghUEFKB7AmEBwg4FcTpgKc8YKTN7kk2MsPpx5asyUTfjHxne3W7e3u3u7cH1KhRo0aVUCgI3uWlA7/RVcp6BaIOCC0evaX/JNxxfyQPEQ0wfjhz3bURCsDCCngXP3YU0TZ3O8iHIang2F1/d4IFMLcC3rerjlLqM3cd/YPMsqXOyMcAtj/EfXPkuq/vNK1328KLMdPZbfg+v2d9mFoHbBUV9OZVJLcCIozVDA4ItD8VAHSMceNkInCmcULLHSCaAAV1FIytXp4xwvdywPMuHdVsfuFuW2acFPXcjdUjLADv/Gqfhf8UfR3ReOzm2R+ZFYiE9xDOWG5GZY1tZSGSZRNjMCxSeIGMJWPK2MJDrKz3TQZkUkDWPB5nZ6tI4SeIlNgSHvy0I56pSF1C0WYTbwNmsFKG8DP8wuV0y90WxwzXfb/aT6JPtUDkKXjP0seyhRdoS4B6mnfophORaIHY7I86G29XsET0z69/ceNwjNhNihGJFmDh96SVQIMlQ8cWLYO1nURnVEDWIsTfA3eLhvu5wIFRePPTubi5eWkiM1ug2eiGHXWGCiARmQJ8lf79H3/LRGdUQJHalJaUP0BlUH39KRmuAWYLqChJC4NLNfD9Ce+OiSRpEzv6k7NKVIaIN5ExKicpoF/Kmx0WiRjvuRT4J5CkwONhpCLEeBtXQaoC4UmqKkx5j0wURgXYB0/cZxtV4YWteXNU/m0iMVvAIu3CFOxNVAROZSa8+yYaswJc+tAtUbfCfdCdkeUZGBWIUuc+xIU1H3awZEgmjNB9DpPS+EQ3SkqdSsuH7j0sGdNzCNeOkugSFXDX35wg9ACOVA+wJAy+X8uEOcI7LRNODWR8rNuVlq1wEKXYpUJ4sAfUpZos55BUBeRMSgQxo65MlKlErLwC4ZnlHJItlXiwDzFT8iheiVjRzIEs25BnKv6PwpYgVnwaIbTEbREbWzasaugyioM5imZzFXfR8A+VwsS15q4u6zE4tkTu2ZHf9D7jZVNqcXdGiCfV5fASg8vr4RH0+fK6b7eVjU0E1J0pr7OnSytgFa7AE0VkJvMmfX223GllFxxPoT1TU66YuBhAbBV5Zq+YxELskoOfsPmKaa38Kl+NGjVqlI+/zO65Qdp3pJkAAAAASUVORK5CYII=");
 }
+.icon-download {
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAE/SURBVHgB7ZZNTsMwEIXfWKVIrLhBswQWlJwAirphxw0IJwGOwAlKbwArNiC4QcUqLHMEVkjtwlM7/U/aOpk26qL+JCuONPY8jew3Bjz7DkHIyXsvUIfqy87/SYdJK/yDAAUhdIAL8wnsONK4hRC5AMIxtoBYwLbwAryAnQuouQLOPnuRuXSXesBPvzdhggKkJlWnB2b1FrfPX9fFuitAqmMufWRdz27sCp86pFlDijuueKcA1uiOp4FLxJw9pzHM07UrKdQLTj9+Xkjhbvyb6L5uqTqu0uqMVN7rAb4XkgPd+LoZufYudAjjdjPKVsIcn8YsotaQJLeU6oaZSiylTPLSAlwiyiYXCVglQpJcLCArQpp8Y4xJPdoBzwbkzsDE+1EBy3pDvhlN3K0CiNg+XhcE5J2Q9TMqokhv8OwfQ/kycNLa3JKkAAAAAElFTkSuQmCC");
+}
 
 /******** img背景图 **********/
 .j-img {

src/web/staticres/common-module/selector/js/china_area.js

@@ -272,7 +272,7 @@ var chinaMapJSON = [{
     name: '大连市',
     ProID: 6,
     CitySort: 29,
-    area: ['长海县', '旅顺口区', '中山区', '西岗区', '沙河口区', '甘井子区', '金州区', '普兰店市', '瓦房店市', '庄河市']
+    area: ['长海县', '旅顺口区', '中山区', '西岗区', '沙河口区', '甘井子区', '金州区', '普兰店区', '瓦房店市', '庄河市']
   }, {
     CityID: 30,
     name: '鞍山市',

src/web/staticres/course/js/city/city-picker.data.js

@@ -668,7 +668,7 @@
                 210213: '金州区',
                 210224: '长海县',
                 210281: '瓦房店市',
-                210282: '普兰店市',
+                210282: '普兰店区',
                 210283: '庄河市'
             },
             210300: {

src/web/staticres/course/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/web/staticres/course/js/province.js

@@ -227,7 +227,7 @@ var province = [
             },
             {
                 name: "大连市",
-                districtAndCounty: ["西岗区", "中山区", "沙河口区", "甘井子区", "旅顺口区", "金州区", "瓦房店市", "普兰店市", "庄河市", "长海县", "大长山岛镇"]
+                districtAndCounty: ["西岗区", "中山区", "沙河口区", "甘井子区", "旅顺口区", "金州区", "瓦房店市", "普兰店区", "庄河市", "长海县", "大长山岛镇"]
             },
             {
                 name: "营口市",
@@ -1613,4 +1613,4 @@ var province = [
             }
         ]
     }
-];
+];

src/web/staticres/css/wxcontentinfo.css

@@ -18,7 +18,7 @@
     text-align: center;
     float:left;
 	height: 43px;
-    
+
 }
 .childNav .active{
 	color:#2cb7ca;
@@ -85,18 +85,18 @@
 }
 
 #tab1 .itemInfo>ul>li p.textcontent.long {
-	
+
 	line-height: .4rem;
 	overflow: hidden;
 	background: #fff url(/images/down.png) right bottom no-repeat;
 	background-size: .25rem .16rem;
-	
+
 }
 
 #tab1 .itemInfo>ul>li p.textcontent.long.up {
 	background: #fff url(/images/up.png) right bottom no-repeat;
 	background-size: .25rem .16rem;
-	
+
 }
 
 #tab1 .itemInfo>ul>li>a {
@@ -263,7 +263,7 @@
 .explain{
 	font-size: .25rem;
     color: #888;
-    background-color: #f4f4f9;    
+    background-color: #f4f4f9;
 	height: 80px;
     line-height: 40px;
     padding-left: 10px;
@@ -341,8 +341,8 @@
 }
 .collec_star .shoucang{
     display: inline-block;
-    width: .32rem;
-    height: .32rem;
+    width: .36rem;
+    height: .36rem;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHRSURBVHgB1VVLTsMwEH1jCB8hpHICwpIVsASERE4CV+AEcARuAjdoJYTY0e4QbBpOQBGC8quH5/RD2jiti7rhSZNY8fjNmxnbAaaAVlFxNs2a+WmcEeECJhslmDX0Cod6Dc2M49B1JtQRgtPBeC43nkWATLHkVCuzCcwiLAODo8K3wCxkkgN3TYwFNL2TFokcoIbQAHpDsi9sU3FMW6fKWFfkEO+oyIf61qdkSPluMNgjS9fgupbs850PwHqecaKQsi5yerWn4UshL+pUh0FwIns47/bA4JLPVsFpKTeOBLpmoMsTq+o2QYtW61K7YN2UkkKQSEZVASsM5LIyY8iFvemVaeCWfTDYAbKaulNbDpZOK8YXJM2T9zUNC3CNtqiyFLFTOxau72/sTVu75Ibkuz2BZQH6QViGOksUdLHJm6Z41wK5g7eSmWMkKUJg1e2wlo/cYdxtuo1J+N26cZmLN4PPhwnkSuJX2vPgXFT0lgczNIDRuRhlcKqfSNweOdlt/z/C3wOrxQxEax1rE5InVJ0W5kvK5O2BMbqlgw2mjY7Vk2hz6FLb4I/nmG93vcQ9qd4SeWEfpGrvpfl9l5GMhQtEa9LqCIXWp/ux/3XN/8APC++o0hFQWAMAAAAASUVORK5CYII=) no-repeat;
     background-size: contain;
 }
@@ -352,4 +352,4 @@
     height: .32rem;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAJESURBVHgB1VXRbdswEL2jqH5rg7gT1NnA3iAdIKmNxiqCfhSdQOkETb+M2goUxO13vEHcCapOEGUDfQaQyOsdYQV2ItdU/noATYt6994deUcBdLAsyyIZXXx0F3Bt9M3679DXR/kCp/PFgCc35vNs4OvnLaAREgQqAKgE1Imvn5dAE7218MUSfoMOWXgJhIjvJPo4Prl6peuLLlnsFZhOsx4BjSR6eR6Px2WXLPApmQp1H4h6WqkDwzMDBhx9GQTmUMgFJ6Vam+AOQZUsXijEvLb23oLJLUH5MR7nWwLf54tzxYe4rc3bAFggUm4N/JLt2XybposjC8BbBz3G8sCt/rBEnz9MTi5cHyDVS8Dgk4DY4W1V1fnZ2biAf9jp6fGSp2XzLFlVVXCECjMJDsmsZN2dQcwpkTXDddRf4QX28AARKJUIh3DF6216PGRZqCtzaMFCGIa3ch6+5IIN2Eex7ya5GLaDAwYrqKpquG+rNsmryjzDPytTARgGEthIhzqDPRaG+mYXeatAI4JcQeBnBQGWuzLd2WgE0OfxB/YYn9k9uFJtt1aB2Szrr0VWzZqU4fxykcxm16MtMDcZ/0Zp+vPAW0Ap3ZO5tnXhBC+vR5UJf7PiudR5mv64exQyxlWMdWXuKWDIugy4u6MZkyFh5q5q4g8NDynlRogwGLhskXptXK1ftADVG5KXqG/ZNRfSyeR4tQF5LVkRUcL3kGvMQOGBtwCTRxKx3KBP76DG4vdu/UqE2CHhFPrga10/7C/1+T/sL+2vJ0ALxXBYAAAAAElFTkSuQmCC) no-repeat;
     background-size: contain;
-}
+}

src/web/staticres/dataExport/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/web/staticres/electronic_invoice/js/city/city-picker.data.js

@@ -668,7 +668,7 @@
                 210213: '金州区',
                 210224: '长海县',
                 210281: '瓦房店市',
-                210282: '普兰店市',
+                210282: '普兰店区',
                 210283: '庄河市'
             },
             210300: {

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

@@ -141,6 +141,7 @@
 .c-tab-container .j-icon {
     width: 16px;
     height: 16px;
+    background-position: center;
 }
 .c-tab-container .icon-box {
     padding: 0 10px;

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

@@ -124,8 +124,8 @@ var vm = new Vue({
                 url: '/publicapply/bidcoll/getLabel',
                 type: 'POST',
                 success: function (res) {
-                    if (res.error_code === 0 && res.data) {
-                        this.tagList = res.data
+                    if (res.error_code === 0) {
+                        this.tagList = res.data || []
                         this.initSelectTagList()
                         callback && callback()
                     }

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

@@ -392,6 +392,7 @@ var vm = new Vue({
             })
         },
         setListStateAndCheckPower: function (res) {
+            var _this = this
             if (res.data) {
                 if (res.data.total) {
                     if (this.power) {
@@ -402,6 +403,9 @@ var vm = new Vue({
                 }
 
                 if (res.data.list) {
+                    res.data.list.forEach(function (d) {
+                        d.company_shortname = _this.getShortName(d.company_name)
+                    })
                     if (this.power) {
                         this.listState.list = res.data.list || []
                     } else {
@@ -457,6 +461,37 @@ var vm = new Vue({
             var arr = ['default', 'blue', 'orange', 'green']
             var randomIndex = utils.getRandomNumber(0, arr.length - 1)
             return 'bgc-' + arr[randomIndex]
+        },
+        getShortName: function (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 + ' -> \'\'')
+                    }
+                    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
         }
     }
 })

src/web/staticres/js/wxSupersearch.js

@@ -2384,7 +2384,7 @@ var SuperSearch = {
 				homeListHtml +='<div class="area">'+area+'</div>'
 				var industry = _list["industry"];
 				var subtype = _list["subtype"];
-				var buyerclass = _list["buyerclass"];
+				var buyerclass = _list["buyerclass"] || '';
 				if(SuperSearch.hasSubscribe||SuperSearch.isVip){
 					industry = _list["s_subscopeclass"];
 					subtype = _list["type"];
@@ -2398,7 +2398,11 @@ var SuperSearch = {
 				if (SuperSearch.isVip || jyUserPower.vip > 0 || jyUserPower.member || jyUserPower.entniche) {
 					if (buyerclass!="") {
 						homeListHtml +='<div class="buyerclass">'+buyerclass+'</div>'
-					}
+					} else {
+            if (industry!=""){
+              homeListHtml +='<div class="industry">'+industry+'</div>'
+            }
+          }
 				} else {
 					if (industry!=""){
 						homeListHtml +='<div class="industry">'+industry+'</div>'

src/web/staticres/vipsubscribe/js/historypush.js

@@ -52,28 +52,27 @@ var vm = new Vue({
         industrytimer: '',
         keytimer: '',
         noticetimer: ''
-      }
+      },
+      iosMeauStyle: false
     }
   },
   created () {
     var recover = this.recover()
     if (!recover) {
       this.getUserRoot()
+      setTimeout(() => {
+        // 如果订阅消息进来时间不清空
+        if(this.time !== '') {
+          sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
+          this.setPushTime(this.time)
+          this.revorceOtherData()
+        }else{
+          // 清空筛选数据
+          this.revorceData()
+        }
+      })
     }
   },
-  mounted () {
-    setTimeout(() => {
-      // 如果订阅消息进来时间不清空
-      if(this.time !== '') {
-        sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
-        this.setPushTime(this.time)
-        this.revorceOtherData()
-      }else{
-        // 清空筛选数据
-        this.revorceData()
-      }
-    })
-  },
   methods: {
     recover: function () {
       let _this = this
@@ -149,11 +148,17 @@ var vm = new Vue({
       this.key = ''
       this.buyerclass = ''
     },
+    open: function() {
+      this.iosMeauStyle = true
+    },
+    close: function() {
+      this.iosMeauStyle = false
+    },
     // 订阅推送消息展示数据
     setPushTime: function(time) {
       let pushtime = {
-        start: parseInt(time.split('_')[0]),
-        end: parseInt(time.split('_')[0]),
+        start: parseInt(time.split('_')[0] * 1000),
+        end: parseInt(time.split('_')[0] * 1000),
       }
       this.tagText.timeText = new Date(pushtime.start).pattern('yyyy.MM.dd') + '~' + new Date(pushtime.end).pattern('yyyy.MM.dd')
       this.selectDate.startDate = pushtime.start

src/web/staticres/vipsubscribe/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/web/staticres/wx_course/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/web/staticres/wx_dataExport/js/mapJSON.js

@@ -270,7 +270,7 @@ var chinaMapJSON = [{
     "name": "大连市",
     "ProID": 6,
     "CitySort": 29,
-    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店市", "瓦房店市", "庄河市"]
+    "area": ["长海县", "旅顺口区", "中山区", "西岗区", "沙河口区", "甘井子区", "金州区", "普兰店区", "瓦房店市", "庄河市"]
   }, {
     "CityID": 30,
     "name": "鞍山市",
@@ -2426,4 +2426,4 @@ var chinaMapJSON = [{
     "CitySort": 372,
     "area": ['美国','加拿大','澳大利亚','新西兰','英国','法国','德国','捷克','荷兰','瑞士','希腊','挪威','瑞典','丹麦','芬兰','爱尔兰','奥地利','意大利','乌克兰','俄罗斯','西班牙','韩国','新加坡','马来西亚','印度','泰国','日本','巴西','阿根廷','南非','埃及','其他']
   },]
-}]
+}]

src/web/templates/_error.html

@@ -604,9 +604,21 @@ function infoListCss(){
 <script type="text/javascript">
 // ajax部分匿名函数自执行，防止泄露全局变量
 $(function(){
+    var host = location.host
+    var copyrightMap = {
+        com: '京ICP备14030217号-3',
+        cn: '京ICP备2021020018号-1'
+    }
     // 动态设置copyright
-    var copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a>'
-    $('.copyright').text(copyright)
+    var copyright = ''
+    if (host.indexOf('jianyu360.com') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    } else if (host.indexOf('jianyu360.cn') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
+    } else {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    }
+    $('.copyright').html(copyright)
 
   	$(".j-bottom .jy_province font").click(function(){
   		var scope = $(this).text();

src/web/templates/active/index_bak.html

@@ -120,7 +120,20 @@
 $(function(){
     haslogin({{.T.logid}});
     // 动态设置copyright
-    var copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a>'
+    var host = location.host
+    var copyrightMap = {
+        com: '京ICP备14030217号-3',
+        cn: '京ICP备2021020018号-1'
+    }
+    // 动态设置copyright
+    var copyright = ''
+    if (host.indexOf('jianyu360.com') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    } else if (host.indexOf('jianyu360.cn') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
+    } else {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    }
     $('.copyright').html(copyright)
 })
 //

src/web/templates/common/mobilebottom.html

@@ -7,7 +7,20 @@
 <script type="text/javascript">
 $(function () {
     // 动态设置copyright
-    var copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a>'
+    var host = location.host
+    var copyrightMap = {
+        com: '京ICP备14030217号-3',
+        cn: '京ICP备2021020018号-1'
+    }
+    // 动态设置copyright
+    var copyright = ''
+    if (host.indexOf('jianyu360.com') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    } else if (host.indexOf('jianyu360.cn') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
+    } else {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    }
     $('.copyright').html(copyright)
 })
 function zbSeatch(id){

src/web/templates/common/pcbottom.html

@@ -709,7 +709,20 @@ if (location.href.indexOf('jyblog') === -1) {
 <script type="text/javascript">
 (function(){
 	// 动态设置copyright
-    var copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a>'
+    var host = location.host
+    var copyrightMap = {
+        com: '京ICP备14030217号-3',
+        cn: '京ICP备2021020018号-1'
+    }
+    // 动态设置copyright
+    var copyright = ''
+    if (host.indexOf('jianyu360.com') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    } else if (host.indexOf('jianyu360.cn') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
+    } else {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    }
     $('.copyright').html(copyright)
 
 	$(".j-bottom .jy_province font").click(function(){

src/web/templates/frontRouter/pc/squeeze/sess/test.html

@@ -433,7 +433,20 @@ $(function () {
     // 处理低高度屏幕下无法显示下方文字
     $('#index').css('min-height', document.documentElement.clientHeight + 'px')
     // 动态设置copyright
-    var copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a>'
+    var host = location.host
+    var copyrightMap = {
+        com: '京ICP备14030217号-3',
+        cn: '京ICP备2021020018号-1'
+    }
+    // 动态设置copyright
+    var copyright = ''
+    if (host.indexOf('jianyu360.com') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    } else if (host.indexOf('jianyu360.cn') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
+    } else {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    }
     $('.copyright').html(copyright)
     //弹窗
     if (times<1604505600000&&times>1604246400000){

src/web/templates/pc/index.html

@@ -587,7 +587,20 @@ $(function () {
     // 处理低高度屏幕下无法显示下方文字
     $('#index').css('min-height', document.documentElement.clientHeight + 'px')
     // 动态设置copyright
-    var copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a>'
+    var host = location.host
+    var copyrightMap = {
+        com: '京ICP备14030217号-3',
+        cn: '京ICP备2021020018号-1'
+    }
+    // 动态设置copyright
+    var copyright = ''
+    if (host.indexOf('jianyu360.com') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    } else if (host.indexOf('jianyu360.cn') >= 0) {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
+    } else {
+        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    }
     $('.copyright').html(copyright)
     //弹窗
     if (times<1604505600000&&times>1604246400000){

src/web/templates/weixin/historypush.html

@@ -522,6 +522,9 @@
             color: #fff;
             text-decoration: none;
         }
+        .iosMeau{
+            height: 100%;
+        }
     </style>
 </head>
 <body class="p13">
@@ -582,11 +585,11 @@
                 </p>
             </div>
         </div> -->
-        <van-dropdown-menu style="width: auto;overflow-x: auto;">
-            <van-dropdown-item :title="tagText.timeText"  ref="dateItem" id="showDatePicker">
+        <van-dropdown-menu style="width: auto;overflow-x: auto;" :class="{iosMeau:iosMeauStyle==true}">
+            <van-dropdown-item :title="tagText.timeText"  ref="dateItem" id="showDatePicker" @open="open" @close="close">
                 <date-component :key="setTimer.datetimer" ref="datecom" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
             </van-dropdown-item>
-            <van-dropdown-item ref="areaItem">
+            <van-dropdown-item ref="areaItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="areaText">地区</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -597,7 +600,7 @@
                 <area-component :key="setTimer.areatimer" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectarealist="selectAreaList"></area-component>
                 <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
             </van-dropdown-item>
-            <van-dropdown-item ref="industryItem">
+            <van-dropdown-item ref="industryItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="industryText">行业</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -608,7 +611,7 @@
                 <industry-component :key="setTimer.industrytimer" ref="industryCom" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectindustrylist="selectIndustryList"></industry-component>
                 <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
             </van-dropdown-item>
-            <van-dropdown-item  ref="cateItem">
+            <van-dropdown-item  ref="cateItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="cateText">采购单位</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -619,7 +622,7 @@
                 <cate-component :key="setTimer.catetimer" @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectcatelist="selectCateList"></cate-component>
                 <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
             </van-dropdown-item>
-            <van-dropdown-item title="关键词" ref="keywordItem">
+            <van-dropdown-item title="关键词" ref="keywordItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="keywordText">关键词</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -630,7 +633,7 @@
                 <keyword-component :key="setTimer.keytimer" @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectkeywordlist="selectKeyWordList"></keyword-component>
                 <root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
             </van-dropdown-item>
-            <van-dropdown-item title="公告类型" ref="noticeItem">
+            <van-dropdown-item title="公告类型" ref="noticeItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="noticeText">公告类型</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -930,7 +933,7 @@
       var firstTime = {{.T.stime}}; // 时间
     //   firstTime = '1624377600'
       if (firstTime != "") {
-          firstTime = firstTime + "000" +'_'+ firstTime + "000";
+          firstTime = firstTime  +'_'+ firstTime
           vm.time = firstTime
       } else {
           firstTime = vm.time
@@ -950,6 +953,23 @@
           day = day < 10 ? '0' + day : day;
           return year + '-' + month + '-' + day;
       })();
+      let listparams = {
+            pageNum: 1
+        }
+        var listnum = 0
+        $.ajax({
+            url: '/publicapply/bidcoll/list',
+            type: "POST",
+            contentType: 'application/json;charset=utf-8',
+            data: JSON.stringify(listparams),
+            success: function(res) {
+                if(res.error_code == 0) {
+                    if(res.data && res.data.res) {
+                        listnum = res.data.res.length
+                    }
+                }
+            }
+        })
       //初始化数据
       function initpage() {
           if (sessionStorage && sessionStorage.historypushScrollTop && sessionStorage.historypushDataCache) {
@@ -992,24 +1012,6 @@
               showPage();
           } else {
               userId = sessionStorage.userId;
-              if (sessionStorage.getItem(userId + "_searchTime") != null && sessionStorage.getItem(userId + "_searchTime") != "") {
-                  firstTime = sessionStorage.getItem(userId + "_searchTime");
-              }
-              if (sessionStorage.getItem(userId + "_selectCity") != null && sessionStorage.getItem(userId + "_selectCity") != "") {
-                  selectCity = sessionStorage.getItem(userId + "_selectCity");
-              }
-              if (sessionStorage.getItem(userId + "_selectIndustry") != null && sessionStorage.getItem(userId + "_selectIndustry") != "") {
-                  selectIndustry = sessionStorage.getItem(userId + "_selectIndustry");
-              }
-              if (sessionStorage.getItem(userId + "_selectCate") != null && sessionStorage.getItem(userId + "_selectCate") != "") {
-                  selectCate = sessionStorage.getItem(userId + "_selectCate");
-              }
-              if (sessionStorage.getItem(userId + "_selectKeyword") != null && sessionStorage.getItem(userId + "_selectKeyword") != "") {
-                  selectKeyword = sessionStorage.getItem(userId + "_selectKeyword");
-              }
-              if (sessionStorage.getItem(userId + "_selectNotice") != null && sessionStorage.getItem(userId + "_selectNotice") != "") {
-                  selectNotice = sessionStorage.getItem(userId + "_selectNotice");
-              }
               $.ajax({
                 type: 'post',
                 url: '/front/hasPushHistory?t=' + new Date().getTime(),
@@ -1449,7 +1451,9 @@
             //console.log(vKeepComponent)
             if (vKeepComponent) {
                 vKeepComponent.changeBid(id, !shoucang)
-                vKeepComponent.changeKeepStatus(!shoucang, _this)
+                if(listnum < 100) {
+                   vKeepComponent.changeKeepStatus(!shoucang, _this)
+                }
             }
             // $.ajax({
             //     url: '/publicapply/bidcoll/action',
@@ -1501,9 +1505,11 @@
         if(type) {
             $(that).find('.shoucang').show()
             $(that).find('.weishoucang').hide()
+            listnum++
         } else {
             $(that).find('.shoucang').hide()
             $(that).find('.weishoucang').show()
+            listnum--
         }
     }
     
@@ -1605,36 +1611,6 @@
                 firstPage = data.data;
                 hasNextPage = data.hasNextPage;
                 count = 0;
-                // if (time == undefined || time == "") {
-                //     sessionStorage.removeItem(userId + "_searchTime");
-                // } else {
-                //     sessionStorage.setItem(userId + "_searchTime", time);
-                // }
-                // if (area == undefined || area == "") {
-                //     sessionStorage.removeItem(userId + "_selectCity");
-                // } else {
-                //     sessionStorage.setItem(userId + "_selectCity", area);
-                // }
-                // if (subscopeclass == undefined || subscopeclass == "") {
-                //     sessionStorage.removeItem(userId + "_selectIndustry");
-                // } else {
-                //     sessionStorage.setItem(userId + "_selectIndustry", subscopeclass);
-                // }
-                // if (buyerclass == undefined || buyerclass == "") {
-                //     sessionStorage.removeItem(userId + "_selectCate");
-                // } else {
-                //     sessionStorage.setItem(userId + "_selectCate", buyerclass);
-                // }
-                // if (key == undefined || key == "") {
-                //     sessionStorage.removeItem(userId + "_selectKeyword");
-                // } else {
-                //     sessionStorage.setItem(userId + "_selectKeyword", key);
-                // }
-                // if (subtype == undefined || subtype == "") {
-                //     sessionStorage.removeItem(userId + "_selectNotice");
-                // } else {
-                //     sessionStorage.setItem(userId + "_selectNotice", subtype);
-                // }
                 ajaxFlag = true;
             },
             error: function (xhr, type) {
@@ -1984,114 +1960,7 @@
         if (firstTime != "" && firstTime != null) {
             date = formatDate(firstTime / 1000, "1");
         }
-        // 点击选择时间
-        $('#showDatePicker').on('click', function () {
-            var that = this
-            // 给取遮罩绑定点击事件
-            function closeTimePicker () {
-                var timeResultBox = $(that).find('.time_result')
-                var timeResult = timeResultBox.text()
-                // 点击取消或者空白处，时间选择器消失。判断#showDatePicker是否高亮
-                if (timeResult === '时间') {
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                }
-            }
-            $('.jymobile-datePicker .weui-mask').on('click', closeTimePicker)
-            // 关闭地区选择
-            if ($('.screen').css("display") !== "none") {
-                if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
-                    $('#showArea').find("span").toggleClass("current");
-                }
-                $('.area_container').slideUp();
-                $('.screen').hide();
-            }
-
-            // weui 时间选择器
-            if (Boolean($(".jymobile-datePicker").html())) {
-                $(".jymobile-datePicker .weui-mask").click()
-                $(".jymobile-datePicker .weui-mask").trigger('click')
-            } else {
-                var computedTop = $("._header").offset().top + $("._header").height() - 1
-                $("._header").addClass('fix-top')
-                $(".filter_tab").addClass('is-hide-border')
-                weui.datePicker({
-                    id: 'up',
-                    start: 2000,
-                    title: '选择时间',
-                    end: new Date(),
-                    defaultValue: date.split('-'),
-                    className: 'jymobile-datePicker up',
-                    onChange: function (result) {
-                        var nowTArr = result.map(function (v) {
-                            return v.label
-                        })
-                        $(".jymobile-datePicker.up .weui-picker__item").each(function(){
-                            var nowT = $(this).text()
-                            $(this).removeClass('is-now-select')
-                            if (nowTArr.indexOf(nowT) !== -1) {
-                                $(this).addClass('is-now-select')
-                            }
-                        })
-                    },
-                    onClose: function () {
-                        $("._header").removeClass('fix-top')
-                        $(".filter_tab").removeClass('is-hide-border')
-                        closeTimePicker()
-                    },
-                    onConfirm: function (result) {
-                        let year = result[0].value;
-                        let month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
-                        let day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
-                        let time_result = year + '.' + month + '.' + day;
-                        FTAGData(year + '-' + month + '-' + day)
-                        $('.time_result').html(time_result)
-                    }
-                });
-                $(".jymobile-datePicker.up #weui-picker-confirm").text('确认')
-                $(that).find('.time_result').addClass('current')
-                $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend("<a href=\"javascript:;\" class=\"weui-btn weui-btn_disabled weui-picker__btn\" id=\"resetTime\" data-action=\"select\" style=\"text-decoration: none;\">\u91CD\u7F6E</a>");
-                // $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
-                $(".jymobile-datePicker.up #resetTime").on('click',function () {
-                    FTAGData();
-                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').trigger('click');
-                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').click();
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                })
-            }
-            // 日期选择器样式修改--start---------------------
-            // 修改标题
-            // $('.jymobile-datePicker .weui-picker__hd a[data-action=cancel]')
-            // $('.jymobile-datePicker .weui-picker__hd a:first').removeClass('weui-picker__action').addClass('jymobile-picker__action').text('选择时间')
-            // $("#weui-picker-confirm").css("text-decoration", "none");
-        });
-        // 选择地区
-        $('#showArea').on('click', function () {
-            // 关闭时间选择
-            if (Boolean($(".jymobile-datePicker").html())) {
-                $(".jymobile-datePicker .weui-mask").click()
-                $(".jymobile-datePicker .weui-mask").trigger('click')
-                var timeResult = $('#showDatePicker').find('.time_result').text()
-                // 点击取消或者空白处，时间选择器消失。判断#showDatePicker是否高亮
-                if (timeResult === '时间') {
-                    $('#showDatePicker').find('.time_result').removeClass('current').text('时间')
-                }
-            }
-            //if(_scrollTop==0){
-            //	_scrollTop = scrollTop;
-            //}
-            //$(".subscribe").toggleClass('overClass');
-            //scrollHtml();
-            if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
-                $(this).find("span").toggleClass("current");
-            }
-            $('.area_container').slideToggle();
-            $('.screen').toggle();
-        })
 
-        // 扩大点击区域（点击城市名字也能选中）
-        $('.area_wrap .c_item .city-name').on('click', function () {
-            //$(this).parent().children('input').trigger('click')
-        })
         //
         $('.screen').click(function () {
             //$(".subscribe").toggleClass('overClass');
@@ -2102,67 +1971,6 @@
             $('.area_container').slideUp();
             $('.screen').hide();
         })
-        // 地区选择确认按钮
-        $('.enter_btn').click(function () {
-            //$(".subscribe").toggleClass('overClass');
-            var cityCount = $('.area_wrap .city input:checked').length - $('.area_wrap .city .cityAll input:checked').length;
-            $('.area_container').slideUp();
-            $('.screen').hide()
-            selectCity = "" //重新选择 初始化地区 参数
-
-            if (!cityCount) {
-                $('#showArea .jymobile-tab-triangle').removeClass('current').text("地区");
-                ajaxFun(firstTime, selectCity);
-                return
-            }
-
-            // cityName对象
-            var selectCityName = []
-            // 判断省份后面的数字是否隐藏来确定该省份下的城市有没有被选择
-            $('.area_wrap .province .p_item').each(function (i, dom) {
-                var f = $(dom).find('.city-count').is(':hidden')
-
-                // 如果隐藏说明该省份下没有被选中的城市
-                if (f) {
-                    // 结束当前循环，进入下个循环
-                    return true
-                }
-                // 省份名称
-                var provinceName = $(dom).children('.province-name').text()
-                var citiesBox = $('.area_wrap .city .province_city').eq(i)
-                var selectedCities = citiesBox.find('input:checked').parent().children('.city-name')
-                // 城市数组
-                var cityArr = []
-                selectedCities.each(function (i, dom) {
-                    // 对获取到的城市名字符串去空格处理
-                    cityArr.push($(dom).text().replace(/\s+/g, ''));
-                })
-                for (var i = 0; i < cityArr.length; i++) {
-                    if (selectCity != "") {
-                        selectCity += ","
-                    }
-                    selectCity += cityArr[i];
-                }
-                selectCityName.push({
-                    province: provinceName,
-                    selectCity: cityArr
-                });
-            })
-            sessionStorage.setItem(userId + "_selectCityName", JSON.stringify(selectCityName));
-            ajaxFun(firstTime, selectCity);
-            // 重写地区text
-            $('#showArea .jymobile-tab-triangle').addClass('current').text("地区 " + cityCount);
-
-        })
-        $('.reset_btn').click(function () {
-            selectCity = ''
-            $('#showArea .jymobile-tab-triangle').removeClass('current').text("地区");
-            ajaxFun(firstTime, selectCity);
-            $('.area_wrap .province .city-count').hide().text('')
-            $('.c_item input[type="checkbox"]').prop('checked', false)
-            $('.screen').trigger('click')
-            $('.screen').click()
-        })
         // 关闭设置弹窗
         $('#close_set').on('click', function () {
             $('.set_keyword').hide()

src/web/templates/weixin/search/mainSearch.html

@@ -124,18 +124,18 @@
         $('.newdialog .tab-box .sub-search-title').slideUp('fast');
         $('.newdialog .tab-box .sub-show-list').slideUp('fast');
         // 切换上下三角
-       $('.selected-export .options .search-title').find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
-       $('.selected-export .options .show-list').find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
-       $('.weui-mask').hide();
-      $('.app-layout-content-b').css({"overflow":"auto"});
-      if(getWxVersion()!=null){
-			window.ontouchmove=function(e){
-		        //e.preventDefault && e.preventDefault();
-		        //e.returnValue=true;
-		        //e.stopPropagation && e.stopPropagation();
-		        return true;
-		     }
-		}
+        $('.selected-export .options .search-title').find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-down');
+        $('.selected-export .options .show-list').find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-down');
+        $('.weui-mask').hide();
+        $('.app-layout-content-b').css({"overflow":"auto"});
+        if(getWxVersion()!=null){
+              window.ontouchmove=function(e){
+                  //e.preventDefault && e.preventDefault();
+                  //e.returnValue=true;
+                  //e.stopPropagation && e.stopPropagation();
+                  return true;
+               }
+          }
     }
 
     // 是否显示ActiveTip
@@ -166,6 +166,7 @@
         $('.selected-export .options').on('tap', 'span',function(e){
             var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
             var $this = $(this)
+            $(this).addClass('selected').siblings().removeClass('selected')
             // 如果已经显示，则判断点击的是否和上次相同
             if ($('.weui-mask').css('display') !== 'none') {
                 // 点击按钮的时候dialog显示了,显示的如果和这次的相同，则隐藏
@@ -180,7 +181,7 @@
                     // 和上次点击的相同，则关闭tab栏
                     hideTab()
 
-                    $(this).find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                    $(this).find('i').removeClass('icon-triangle-up').addClass('icon-triangle-down')
                     return // 直接结束函数
                 }
 
@@ -190,8 +191,9 @@
                         $(dom).show().siblings().hide()
 
                         // 切换上下三角
-                        $this.find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-shouqi')
-                        $this.siblings().find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                        $this.find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-up')
+                        $this.siblings().find('i').removeClass('icon-triangle-up').addClass('icon-triangle-down')
+
                         return false
                     }
                 })
@@ -214,8 +216,8 @@
                     $(dom).slideDown('fast').siblings().hide()
 
                     // 切换上下三角
-                    $this.find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-shouqi')
-                    $this.siblings().find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                    $this.find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-up')
+                    $this.siblings().find('i').removeClass('icon-triangle-up').addClass('icon-triangle-down')
                     return false
                 }
             })
@@ -246,11 +248,12 @@
                     	$(dom).find('em').text(text);
 					}
                 }
-                $(dom).find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
+                $(dom).find('i').removeClass('icon-triangle-down').removeClass('icon-triangle-up').addClass('icon-triangle-down');
             })
             $(this).addClass('active')
             $(this).siblings().removeClass('active')
-            hideTab()
+            $('.selected-export .options .selected').removeClass('selected')
+             hideTab()
 			if (reqFlag){
 				if (dataVal=="searchtitle"){//标题搜索
 					SuperSearch.titleSearch();
@@ -266,7 +269,8 @@
 
         $('.weui-mask').on('tap', function(){
             hideTab()
-            $('.selected-export .options').find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+            $('.selected-export .options .selected').removeClass('selected')
+            $('.selected-export .options').find('i').removeClass('icon-triangle-up').addClass('icon-triangle-down')
         })
 		//
 		$(".export").on("tap",function(){
@@ -891,6 +895,7 @@
 </div>
 <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.js></script>
 <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/selector/js/china_area.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/area-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/money-mobile.js?v={{Msg "seo" "version"}}'></script>

src/web/templates/weixin/search/tabSearch.html

@@ -453,6 +453,100 @@
         opacity: 0;
         pointer-events: none;
     }
+        #selLable .show-list i,
+    #selLable .export  i,
+    #selLable .search-title  i{
+        transform: unset;
+        width: 0.32rem;
+        height: 0.32rem;
+        margin-left: 0.04rem;
+        transition: all 0.2s;
+    }
+    #selLable .show-list i:before,
+    #selLable .export  i:before,
+    #selLable .search-title  i:before{
+        content: unset;
+    }
+    #selLable .options {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+    }
+    #selLable .search-title.selected,
+    #selLable .show-list.selected {
+        color: #2ABED1;
+    }
+
+    #selLable .search-title,
+    #selLable .show-list {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        font-weight: 500;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+        color: #5F5E64;
+        padding: 0.24rem 0.32rem;
+        margin-left: 0;
+        transition: all 0.2s;
+    }
+    #selLable .selected-export-box {
+        padding: 0;
+    }
+    #selLable .export {
+        right: 0;
+    }
+    #selLable .export i {
+        margin-right: 0.08rem;
+    }
+    #selLable .export > span {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        font-weight: 500;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+        color: #2ABED1;
+        padding: 0.24rem 0.32rem;
+        margin-left: 0;
+    }
+    #selLable .export:before {
+        content: unset;
+    }
+    #selLable  {
+        height: auto;
+    }
+    #selLable .newdialog {
+        border-top: 0.02rem solid #ebedf0;
+    }
+    #selLable .newdialog .tab-box .sub-tab li.active {
+        color: #2ABED1;
+    }
+    #selLable .newdialog .tab-box .sub-tab li {
+        font-weight: 500;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+        color: #5F5E64;
+        padding-left: 0;
+        padding-right: 0.32rem;
+    }
+    #selLable .newdialog .tab-box .icon-tick {
+        width: 0.48rem;
+        height: 0.48rem;
+    }
+    #selLable .newdialog .tab-box {
+        padding: 0;
+        padding-left: 0.32rem;
+    }
+    #selLable .newdialog .tab-box .sub-tab li:nth-of-type(2) {
+        border-top: 0.02rem solid #ebedf0;
+    }
+    #wrapper {
+        width: 100%;
+    }
 </style>
 
 <!--S-Loading-->
@@ -647,7 +741,7 @@
                                 <h3>您暂无使用权限</h3>
                                 <p>开通超级订阅，全国企业随手查，<br>搜索信息更高效！</p>
                             </div>
-                            <div class="condition-select-group" :class="{more: isMoreSelect}" v-show="conditionMap[activeTabIndex]">
+                            <div class="condition-select-group" :class="{more: isMoreSelect}" v-show="!isWaitBuy && conditionMap[activeTabIndex]">
                                 <div class="condition-select-item" @click="onSelectItem(item, activeTabIndex)" v-for="(item,i) in conditionMap[activeTabIndex]" :class="{checked: item.checked}">
                                     <div>@@item.title@@</div>
                                     <i v-if="!isMoreSelect" class="j-icon base-icon icon-tick"></i>
@@ -694,17 +788,17 @@
                     <div class="options">
 	                        <span class="search-title active" index="1">
 	                            <em>标题搜索</em>
-	                            <i class="jyapp-icon jyapp-icon-zhankai"></i>
+	                            <i class="j-icon base-icon icon-triangle-down"></i>
 	                        </span>
                         <span class="show-list active" index="2">
 	                            <em>列表显示</em>
                             <!-- jyapp-icon-shouqi -->
-	                            <i class="jyapp-icon jyapp-icon-zhankai"></i>
+	                            <i class="j-icon base-icon icon-triangle-down"></i>
 	                        </span>
                     </div>
                     <div class="export">
-	                        <span style="padding: 3px 8px 3px;border-radius: 10px;background: rgba(44,183,202, 0.1);">
-	                            <i class="jyapp-icon jyapp-icon-shujudaochu"></i>
+	                        <span>
+	                            <i class="j-icon base-icon icon-download"></i>
 	                            <em id="mainSearch-selLable-dataExport">数据导出</em>
 	                        </span>
                     </div>
@@ -714,21 +808,21 @@
                         <ul class="sub-tab sub-search-title" index="1"  style="display: none">
                             <li class="active" dataVal="searchtitle">
                                 <span>标题搜索</span>
-                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+                                <i class="j-icon base-icon icon-tick"></i>
                             </li>
                             <li dataVal="searchall">
                                 <span>全文搜索</span>
-                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+                                <i class="j-icon base-icon icon-tick"></i>
                             </li>
                         </ul>
                         <ul class="sub-tab sub-show-list" index="2" style="display: none">
                             <li class="active" dataVal="showlist">
                                 <span>列表显示</span>
-                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+                                <i class="j-icon base-icon icon-tick"></i>
                             </li>
                             <li dataVal="showtable">
                                 <span>表格显示</span>
-                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+                                <i class="j-icon base-icon icon-tick"></i>
                             </li>
                         </ul>
                     </div>
@@ -1247,7 +1341,7 @@
     <div class="resbm0">
         <div>
             <i class="icon iconfont" id="close_set">&#xe61a;</i>
-            <span>如果您对以上结果满意可【直接订阅】{{if and (not .T.isIosExam) (not .T.isIosExamPhone)}}<br>更有超级订阅等你试用。{{end}}</span>
+            <span>如果您对以上结果满意可【直接订阅】{{if and (not .T.isIosExam) (not .T.isIosExamPhone)}}。{{end}}</span>
             <a id="zjdy" style="text-decoration: none;">直接订阅</a>
         </div>
     </div>