Merge branch 'dev4.5' of http://192.168.3.207:8080/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/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/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

@@ -113,7 +113,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>

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>
@@ -762,6 +762,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 +777,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 +787,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 +804,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 +828,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 +849,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 +1279,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>

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/web/staticres/common-module/ent-search/ent-search-template.js

@@ -589,10 +589,12 @@ var vMainSearchComponent = new Vue({
           disabled: true
         },
         {
-          title: '中标企业联系方式'
+          title: '中标企业联系方式',
+          disabled: true
         },
         {
-          title: '采购单位联系方式'
+          title: '采购单位联系方式',
+          disabled: true
         }
       ],
       statusEnum: ['存续', '吊销', '停业', '撤销'],
@@ -680,6 +682,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/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/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/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(){

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>