Merge branch 'dev4.0' of http://192.168.3.207:10080/qmx/jy into dev4.0

src/jfw/front/frontRouter.go

@@ -6,6 +6,7 @@ import (
 	"jfw/config"
 	"jfw/public"
 	"qfw/util/jy"
+	"strings"
 )
 
 //前端通用路由
@@ -42,6 +43,7 @@ type CommonRouter struct {
 
 func init() {
 	xweb.AddAction(&CommonRouter{})
+	jy.InitBigVipService(public.Mysql)
 }
 
 func (this *CommonRouter) WxCommonPage(folder, loginSign, htmlPage string) error {
@@ -138,12 +140,12 @@ func (this *CommonRouter) doEntpcPage() error {
 
 //大会员
 func (this *CommonRouter) BigpcIndex() error {
-	return this.doPcBigPage()
+	return this.doPcBigPage("")
 }
 func (this *CommonRouter) BigpcPage(htmlPage string) error {
-	return this.doPcBigPage()
+	return this.doPcBigPage(htmlPage)
 }
-func (this *CommonRouter) doPcBigPage() error {
+func (this *CommonRouter) doPcBigPage(pageSign string) error {
 	userid, _ := this.GetSession("userId").(string)
 	//没有登录跳转登录页面
 	if userid == "" {
@@ -154,6 +156,15 @@ func (this *CommonRouter) doPcBigPage() error {
 	if bigBaseMsg.Status <= 0 {
 		return this.Redirect("/big/page/index")
 	}
+	//大会员页面权限判断
+	if pageSign != "" {
+		if array := strings.Split(pageSign, "/"); len(array) > 0 {
+			pageSign = array[0]
+		}
+		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/bigmember/src/entity/portrait.go

@@ -122,7 +122,7 @@ func (this *Portrait) GetContactsMsg(entId string, pageNum, pageSize int, count
 	if entId == "" {
 		return nil, 0, errors.New("企业名称异常")
 	}
-	start, limit := pageNum*pageSize, pageSize
+	start, limit := (pageNum-1)*pageSize, pageSize
 	if start > PortraitNewMegsLimit || start+limit > PortraitNewMegsLimit {
 		return nil, 0, errors.New("超出检索限制")
 	}

src/jfw/modules/bigmember/src/service/portrait/portraitActionNew.go

@@ -22,6 +22,9 @@ func (this *EntPortrait) WinnerContacts() {
 		if pageSize == 0 {
 			pageSize = 5
 		}
+		if pageNum == 0 {
+			pageNum = 1
+		}
 		rData, total, err := cepm.GetContactsMsg(entId, pageNum, pageSize, count)
 		if err != nil {
 			return nil, err
@@ -53,7 +56,10 @@ func (this *EntPortrait) WinnerNewMsg() {
 		if limit == 0 {
 			limit = 3
 		}
-		start := pageNum * limit
+		var start = 0
+		if pageNum > 0 {
+			start = (pageNum - 1) * limit
+		}
 
 		if pageSign := this.GetString("pageSign"); pageSign != "" { //more:4-23条;max:24-50条(移动端)
 			if pageSign == "more" {
@@ -121,7 +127,10 @@ func (this *EntPortrait) BuyerNewMsg() {
 		if limit == 0 {
 			limit = 3
 		}
-		start := pageNum * limit
+		var start = 0
+		if pageNum > 0 {
+			start = (pageNum - 1) * limit
+		}
 
 		if pageSign := this.GetString("pageSign"); pageSign != "" { //more:4-23条;max:24-50条(移动端)
 			if pageSign == "more" {

src/jfw/modules/bigmember/src/util/util.go

@@ -8,6 +8,9 @@ import (
 var ClearHtml = regexp.MustCompile("<[^>]*>")
 
 func EncodeId(sid string) string {
+	if sid == "" {
+		return ""
+	}
 	return qutil.EncodeArticleId2ByCheck(sid)
 }
 

src/web/templates/pc/biddetail_rec.html

@@ -475,7 +475,7 @@ function isWechat() {
 							<td class="tab-type">采购单位</td>
 								<td class="tab-cont">
 									{{if .T.isMember}}
-										<div class="cont-cont portrait_img" href-data="/swordfish/page_big_pc/unitportrayal/{{.T.obj.buyer}}" tip-data="查看采购单位画像">{{.T.obj.buyer}} </div>
+										<div class="cont-cont portrait_img" href-data="/swordfish/page_big_pc/unit_portrayal/{{.T.obj.buyer}}" tip-data="查看采购单位画像">{{.T.obj.buyer}} </div>
 									{{else}}
 										<div class="cont-cont">{{.T.obj.buyer}}</div>
 									{{end}}
@@ -526,7 +526,7 @@ function isWechat() {
 							<td class="tab-type">中标单位</td>
 							<td class="tab-cont">
 								{{if .T.isMember}}
-									<div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/entportrayal/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
+									<div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/ent_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
 								{{else}}
 									<div class="cont-cont">{{.T.obj.winner}}</div>
 								{{end}}
@@ -632,70 +632,70 @@ function isWechat() {
 		{{if .T.obj.urltop}}<a class="trs" style="color:white">　</a>{{end}}
 	</div>
 	<div  onclick="adv_statistics(this)" adv_name="PC快照页-右部"  class="adv-pccontent-right" id="B1" style="cursor:default;">
-        <script>
+    <script>
 			{{$s:=(Ad "jy-pccontent-right" -1)}}
-            var ADList={{$s}};
-            var ExcludeList = ""
-            if (ADList.length>0){
-              for (var i=0;i<ADList.length;i++ ){
-                if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
-                  break;
-                }
-                var random=Math.floor(Math.random()*ADList.length);
-                if (ExcludeList.indexOf(random)>-1){
-                  continue;
-                }
-                var AD=ADList[random];
-                if (AD.o_extend != undefined) {
-                  var nowTime = new Date().getTime();
-                  if (AD.o_extend.startTime!=undefined){
-                    var stArr = AD.o_extend.startTime.split("-");
-                    if (stArr.length==6){
-                      var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
-                      var stTime = new Date(stStr).getTime();
-                      //未开始
-                      if (stTime>nowTime){
-                        if (ExcludeList!=""){
-                          ExcludeList +="-"
-                        }
-                        ExcludeList = ExcludeList+ random 
-                        continue
-                      }
-                    }
-                  }
-                  if (AD.o_extend.endTime!=undefined){
-                    var etArr = AD.o_extend.endTime.split("-");
-                    if (etArr.length==6){
-                      var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
-                      var etTime = new Date(etStr).getTime();
-                      //已结束
-                      if (etTime<nowTime){
-                        if (ExcludeList!=""){
-                          ExcludeList +="-"
-                        }
-                        ExcludeList = ExcludeList+ random 
-                        continue
-                      }
-                    }
+      var ADList={{$s}};
+      var ExcludeList = ""
+      if (ADList.length>0){
+        for (var i=0;i<ADList.length;i++ ){
+          if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
+            break;
+          }
+          var random=Math.floor(Math.random()*ADList.length);
+          if (ExcludeList.indexOf(random)>-1){
+            continue;
+          }
+          var AD=ADList[random];
+          if (AD.o_extend != undefined) {
+            var nowTime = new Date().getTime();
+            if (AD.o_extend.startTime!=undefined){
+              var stArr = AD.o_extend.startTime.split("-");
+              if (stArr.length==6){
+                var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+                var stTime = new Date(stStr).getTime();
+                //未开始
+                if (stTime>nowTime){
+                  if (ExcludeList!=""){
+                    ExcludeList +="-"
                   }
+                  ExcludeList = ExcludeList+ random 
+                  continue
                 }
-                var ADHtml = "";
-                if(AD.s_pic){
-                    if(AD.s_link){
-                        ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
-                    }
-                    ADHtml += "<img id='pc-article-content-right' src='"+AD.s_pic+"'>";
-                    if(AD.s_link){
-                        ADHtml += "</a>";
-                    }
-                }else {
-                    ADHtml += AD.s_script;
+              }
+            }
+            if (AD.o_extend.endTime!=undefined){
+              var etArr = AD.o_extend.endTime.split("-");
+              if (etArr.length==6){
+                var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+                var etTime = new Date(etStr).getTime();
+                //已结束
+                if (etTime<nowTime){
+                  if (ExcludeList!=""){
+                    ExcludeList +="-"
+                  }
+                  ExcludeList = ExcludeList+ random 
+                  continue
                 }
-                $("#B1").html(ADHtml);
-                break;
               }
             }
-        </script>
+          }
+          var ADHtml = "";
+          if(AD.s_pic){
+              if(AD.s_link){
+                  ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+              }
+              ADHtml += "<img id='pc-article-content-right' src='"+AD.s_pic+"'>";
+              if(AD.s_link){
+                  ADHtml += "</a>";
+              }
+          }else {
+              ADHtml += AD.s_script;
+          }
+          $("#B1").html(ADHtml);
+          break;
+        }
+      }
+    </script>
 	</div>
 	<!--去掉一键报告排版问题-->
 	<!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">