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

src/jfw/front/frontRouter.go

@@ -155,7 +155,7 @@ func (this *CommonRouter) BigpcPage(htmlPage string) error {
 	return this.doPcBigPage(htmlPage)
 }
 
-var bigVipFreePageReg = regexp.MustCompile(`set_*|free_*|ent_portrait`)
+var bigVipFreePageReg = regexp.MustCompile(`set_*|free_*`)
 
 func (this *CommonRouter) doPcBigPage(pageSign string) error {
 	userid, _ := this.GetSession("userId").(string)
@@ -164,17 +164,19 @@ func (this *CommonRouter) doPcBigPage(pageSign string) error {
 		return this.Redirect("/notin/page")
 	}
 	//没有购买大会员跳转大会员介绍页
-	if array := strings.Split(pageSign, "/"); len(array) > 0 {
-		pageSign = array[0]
-	}
-	if !bigVipFreePageReg.MatchString(pageSign) {
-		bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
-		if bigBaseMsg.Status <= 0 && !bigBaseMsg.Viper {
-			return this.Redirect("/big/page/index")
+	if !strings.HasPrefix(pageSign, "svip/ent_ser_portrait") {
+		if array := strings.Split(pageSign, "/"); len(array) > 0 {
+			pageSign = array[0]
 		}
-		//大会员页面权限判断
-		if !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
-			return this.Redirect("/big/page/index")
+		if !bigVipFreePageReg.MatchString(pageSign) {
+			bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
+			if bigBaseMsg.Status <= 0 && !bigBaseMsg.Viper {
+				return this.Redirect("/big/page/index")
+			}
+			//大会员页面权限判断
+			if !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
+				return this.Redirect("/big/page/index")
+			}
 		}
 	}
 	return this.Render(fmt.Sprintf("/frontRouter/pc/page_big_pc/sess/index.html"))

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

@@ -114,7 +114,7 @@ var purchase = {
       $('.error-update-tips').show()
     }
     // 新超级订阅用户，已选择的省份数量不能低于已购买的省份数量 即需要增加省份数量才能升级 老超级订阅用户可以同数量0元升级
-    if (old.upgrade == 1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
+    if (old.upgrade == 1 && this.nowBuyset.areacount !== -1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
       $('.error-update-tips').show()
     }
     var renewList = purchase.renewList

src/jfw/modules/publicapply/src/enterpriseSearch/entity/entQuery.go

@@ -111,8 +111,6 @@ func (es *EnterpriseSearch) Check() (*EnterpriseSearch, error) {
 //判断是否是空查询
 func (es *EnterpriseSearch) isEmptySearch() bool {
 	if es.Match == "" &&
-		(es.MatchType == "" ||
-			es.MatchType == "A") &&
 		es.EntArea == "" &&
 		es.EntCity == "" &&
 		es.EntCapital == "" &&

src/web/staticres/js/superSearch.js

@@ -362,7 +362,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
       if (selectType == "title") {
         listHtml += '<input class="custom-checkbox title-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" />'
         listHtml +='<div class="luce-left"><em>'+index+'.</em>'
-						+'<div class="left-title">'
+						+'<div class="left-title" style="width:680px;">'
 						+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+'</a>'
 						+'</div>'
       }
@@ -395,11 +395,12 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 			}else{
 				listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
       }
-      // if(typeof(datas[i].buyerclass) != "undefined" && datas[i].buyerclass != null && datas[i].buyerclass != ""){
-			// 	listHtml += '<a href="javascript:;">'+datas[i].buyerclass+'</a>';
-			// }else{
-			// 	listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
-			// }
+      // vipState付费用户显示采购单位类型 免费用户不显示
+      if(typeof(datas[i].buyerclass) != "undefined" && datas[i].buyerclass != null && datas[i].buyerclass != "" && vipState){
+				listHtml += '<a href="javascript:;">'+datas[i].buyerclass+'</a>';
+			}else{
+				listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
+			}
 
 			var amount= getacount(datas[i].bidamount,datas[i].budget)
 			if(amount!=""){

src/web/staticres/vipsubscribe/js/vip_upgrade.js

@@ -123,7 +123,7 @@ var purchase = {
       $('.error-update-tips').show()
     }
     // 新超级订阅用户 已选择的省份数量不能低于已购买的省份数量 即需要增加省份数量才能升级 老超级订阅用户可以同数量0元升级
-    if (old.upgrade == 1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
+    if (old.upgrade == 1 && this.nowBuyset.areacount !== -1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
       $('.error-update-tips').show()
     }
     var renewList = purchase.renewList