Browse Source

Merge branch 'master' into feature/v4.7.31

123456 2 năm trước cách đây
mục cha
commit
7ac6feb53b
45 tập tin đã thay đổi với 1903 bổ sung1833 xóa
  1. 2 13
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js
  2. 1 12
      src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_aiForecastPack.html
  3. 1 11
      src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html
  4. 1 12
      src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_subAccount.html
  5. 1 1
      src/jfw/modules/bigmember/src/entity/portrait_screen.go
  6. 1 1
      src/jfw/modules/followent/src/web/templates/weixin/list.html
  7. 2 1
      src/jfw/modules/subscribepay/src/config.json
  8. 1 0
      src/jfw/modules/subscribepay/src/config/config.go
  9. 1 0
      src/jfw/modules/subscribepay/src/entity/dataReportStruct.go
  10. 1 0
      src/jfw/modules/subscribepay/src/entity/jyCourseOnlineStruct.go
  11. 40 1
      src/jfw/modules/subscribepay/src/entity/shareFission.go
  12. 1 0
      src/jfw/modules/subscribepay/src/service/aiForecastPack.go
  13. 1 0
      src/jfw/modules/subscribepay/src/service/areaPack.go
  14. 1 0
      src/jfw/modules/subscribepay/src/service/bigmember.go
  15. 10 0
      src/jfw/modules/subscribepay/src/service/commonAction.go
  16. 1 0
      src/jfw/modules/subscribepay/src/service/courseAction.go
  17. 1 0
      src/jfw/modules/subscribepay/src/service/dataExportPay.go
  18. 1 0
      src/jfw/modules/subscribepay/src/service/dataexportPack.go
  19. 1 0
      src/jfw/modules/subscribepay/src/service/entniche.go
  20. 1 1
      src/jfw/modules/subscribepay/src/service/index_p1.go
  21. 10 0
      src/jfw/modules/subscribepay/src/service/integral.go
  22. 77 50
      src/jfw/modules/subscribepay/src/service/orderListDetails.go
  23. 1 0
      src/jfw/modules/subscribepay/src/service/resourcePack.go
  24. 5 3
      src/jfw/modules/subscribepay/src/service/salesCreateOrder.go
  25. 1 0
      src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go
  26. 2 0
      src/jfw/modules/subscribepay/src/service/vipSubscribePay.go
  27. 1 0
      src/jfw/modules/subscribepay/src/service/vipSubscribeTrial.go
  28. 1 1
      src/jfw/modules/subscribepay/src/util/msgremind.go
  29. 1 15
      src/web/staticres/common-module/order-list/js/order-list.js
  30. 110 0
      src/web/staticres/js/common.js
  31. 10 16
      src/web/staticres/js/superSearch.js
  32. 8 1
      src/web/staticres/public-pc/js/pc-bottom.js
  33. 2 13
      src/web/templates/frontRouter/wx/vipIntro/free/order_detail.html
  34. 1 13
      src/web/templates/pc/aiPack_orderDetail.html
  35. 1552 1558
      src/web/templates/pc/biddingsearch_enterprise.html
  36. 10 16
      src/web/templates/pc/classifylist.html
  37. 1 13
      src/web/templates/pc/member_orderDetail.html
  38. 25 9
      src/web/templates/pc/myOrder.html
  39. 1 14
      src/web/templates/pc/subAccount_orderDetail.html
  40. 1 1
      src/web/templates/pc/supsearch.html
  41. 9 9
      src/web/templates/pc/vip_orderDetail.html
  42. 0 12
      src/web/templates/weixin/member/aiForecastPackdetail.html
  43. 1 11
      src/web/templates/weixin/member/memberdetail.html
  44. 0 12
      src/web/templates/weixin/member/subAccountDetail.html
  45. 3 13
      src/web/templates/weixin/vipsubscribe/vip_order_detail.html

+ 2 - 13
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -384,19 +384,8 @@ $(function () {
                 }
                 $(".payPrice").text("¥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
 
-
-
-                if (r.data.order.return_status === 0||r.data.order.return_status === 2){
-                    $("#card-header-bg").addClass("bg nopay-bg")
-                    if (r.data.order.return_status === 0){
-                        $("#pageTitle").text("待付款");
-                    }else if (r.data.order.return_status === 2){
-                        $("#pageTitle").text("待付完");
-                    }
-                }else{
-                    $("#card-header-bg").addClass("bg finish-bg")
-                    $("#pageTitle").text("已完成");
-                }
+                $("#card-header-bg").addClass("bg finish-bg")
+                $("#pageTitle").text("已完成");
                 $("#pageTitle").addClass("status")
 
                 //支付时间

+ 1 - 12
src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_aiForecastPack.html

@@ -216,18 +216,7 @@
                 $("#card-header-bg").addClass("bg finish-bg")
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
-
-                var customIsAll = 0
-                if (filterObj.isAll){
-                  customIsAll=filterObj.isAll
-                }
-                if (customIsAll == 2){
-                  $("#pageTitle").text("待付款");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }else if (customIsAll == 3){
-                  $("#pageTitle").text("待付完");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }
+                
                 //有效周期
                 $(".line_cycle").css("display", "");
                 if (source === ""){

+ 1 - 11
src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html

@@ -289,17 +289,7 @@
                 $("#card-header-bg").addClass("bg finish-bg")
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
-                var customIsAll = 0
-                if (filterObj.isAll){
-                  customIsAll=filterObj.isAll
-                }
-                if (customIsAll == 2){
-                  $("#pageTitle").text("待付款");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }else if (customIsAll == 3){
-                  $("#pageTitle").text("待付完");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }
+               
                 //有效周期
                 $(".line_cycle").css("display", "");
                 if (source === "") {

+ 1 - 12
src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_subAccount.html

@@ -205,18 +205,7 @@
                 $("#card-header-bg").addClass("bg finish-bg")
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
-
-                var customIsAll = 0
-                if (filterObj.isAll){
-                  customIsAll=filterObj.isAll
-                }
-                if (customIsAll == 2){
-                  $("#pageTitle").text("待付款");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }else if (customIsAll == 3){
-                  $("#pageTitle").text("待付完");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }
+                
                 //有效周期
                 $(".line_cycle").css("display", "");
                 if (source === "") {

+ 1 - 1
src/jfw/modules/bigmember/src/entity/portrait_screen.go

@@ -294,7 +294,7 @@ func (pwp *PortraitProjectScreen) GetWinnerList() (list []map[string]interface{}
 			(*newData)[k]["firsttime"] = rowData["publishtime"]
 		}
 
-		for _, name := range []string{"budget", "subtype", "toptype", "_id", "projectname", "publishtime"} {
+		for _, name := range []string{"subtype", "toptype", "_id", "projectname", "publishtime"} {
 			delete((*newData)[k], name)
 		}
 	}

+ 1 - 1
src/jfw/modules/followent/src/web/templates/weixin/list.html

@@ -167,7 +167,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
             EasyAlert.show("最多可关注<br>"+followEntLimit+"个企业!");
             return;
           }
-          window.location.href = "/jyapp/followent/addEnt";
+          window.location.href = "/jylab/followent/addEnt";
         });
         if (res.list.length == 0) {
           return;

+ 2 - 1
src/jfw/modules/subscribepay/src/config.json

@@ -124,5 +124,6 @@
     "androidUrl": "/jyapp/vipsubscribe/toOrderDetailPage?orderCode=%s",
     "iosUrl": "/jyapp/vipsubscribe/toOrderDetailPage?orderCode=%s",
     "weChatUrl": "/front/vipsubscribe/toOrderDetailPage?orderCode=%s"
-  }
+  },
+  "keywordsLimit":35
 }

+ 1 - 0
src/jfw/modules/subscribepay/src/config/config.go

@@ -88,6 +88,7 @@ type config struct {
 		IosUrl     string
 		WeChatUrl  string
 	}
+	KeywordsLimit int
 }
 type mgoConf struct {
 	Address           string

+ 1 - 0
src/jfw/modules/subscribepay/src/entity/dataReportStruct.go

@@ -100,6 +100,7 @@ func (this *dataReportStruct) NewOrder(param frpc.JyPayOrderParam) (ordercode st
 		"dis_word":             param.Detail["disWord"],               //分销口令
 		"distribution_channel": distributionChannel,                   //销售渠道
 		"order_channel":        util.GetRpcOrderChannel(param.PayWay), //下单渠道
+		"audit_status":         3,                                     //默认审核通过
 	})
 	if orderId <= 0 {
 		err = errors.New("订单插入失败")

+ 1 - 0
src/jfw/modules/subscribepay/src/entity/jyCourseOnlineStruct.go

@@ -161,6 +161,7 @@ func (this *jyCourseOnline) NewOrder(param frpc.JyPayOrderParam) (ordercode stri
 		"order_channel":        util.GetRpcOrderChannel(param.PayWay), //下单渠道
 		"discount_price":       discount_price,
 		"d_relation_id":        userLotteryId,
+		"audit_status":         3, //默认审核通过
 	}
 	if param.Phone != "" {
 		insertMap["user_phone"] = param.Phone

+ 40 - 1
src/jfw/modules/subscribepay/src/entity/shareFission.go

@@ -28,6 +28,17 @@ func NewShareFission(userId, shareUid string) *ShareFission {
 	}
 }
 
+// 活动赠送
+const (
+	SaleChannel051    = "x051"          // 销售渠道活动赠送
+	OrderPassed       = 3               // 订单审核状态-审核通过
+	TableAuditRecords = "audit_records" // 审核记录表
+	OperateCreate     = 1               // 审核轨迹操作类型-新增
+	AuditCreate       = 2               // 审核类型-创建订单
+)
+
+var jianyubiReg = regexp.MustCompile(`达到(\d+)剑鱼币`)
+
 //增加权益
 func (this *ShareFission) AddPower(r *http.Request) {
 	if this.ShareUid != "" { //有分享人
@@ -109,7 +120,18 @@ func Order(userid, starttime, endtime string, types, dayNum int, remark string)
 		"vip_endtime":    endtime,
 		"billingMode":    0, //计费模式 0免费 1付费
 	}
-	return util.Mysql.Insert("dataexport_order", insertMap) != 0
+	// 如果备注为剑鱼币兑换
+	if jianyubiReg.MatchString(remark) {
+		insertMap["distribution_channel"] = SaleChannel051 // 销售渠道
+	}
+	insertMap["audit_status"] = OrderPassed // 订单审核状态
+	if util.Mysql.Insert("dataexport_order", insertMap) != 0 {
+		// 新增一条审核记录
+		CreateOrderAuditRecord(ordercode, qu.FormatDate(&now, qu.Date_Full_Layout))
+		return true
+	} else {
+		return false
+	}
 }
 
 func (this *ShareFission) Record() {
@@ -119,3 +141,20 @@ func (this *ShareFission) Record() {
 		"createtime": time.Now().Unix(),
 	})
 }
+
+func CreateOrderAuditRecord(orderCode string, createTime string) {
+	saveData := map[string]interface{}{
+		"operator":      "-",
+		"create_time":   createTime,
+		"operator_type": OperateCreate,
+		"audit_status":  OrderPassed,
+		"order_code":    orderCode,
+		"audit_type":    AuditCreate,
+	}
+	if !InsertAudit(saveData) {
+		log.Println("新增审核轨迹保存失败", saveData)
+	}
+}
+func InsertAudit(data map[string]interface{}) bool {
+	return util.Mysql.Insert(TableAuditRecords, data) > 0
+}

+ 1 - 0
src/jfw/modules/subscribepay/src/service/aiForecastPack.go

@@ -65,6 +65,7 @@ func (a *AiForecastPack) CreateOrder() {
 			"user_id":        userId,
 			"pay_way":        "",
 			"original_price": order_money,
+			"audit_status":   3, //默认审核通过
 		})
 		log.Println("AI预测包购买订单", userId, order_id, code)
 		if order_id > 0 {

+ 1 - 0
src/jfw/modules/subscribepay/src/service/areaPack.go

@@ -117,6 +117,7 @@ func (this *AreaPack) CreateOrder() {
 			"d_relation_id":        userLotteryId,
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		}
 		//校验
 		rdata, ok := util.MQFW.FindById("user", userId, `{"o_jy":1}`)

+ 1 - 0
src/jfw/modules/subscribepay/src/service/bigmember.go

@@ -101,6 +101,7 @@ func (b *Bigmember) CreateOrder() {
 			"original_price":       order_money,
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		}
 		order_phone := b.GetString("order_phone") //p19.3用户信息采集 手机号
 		if order_phone != "" {

+ 10 - 0
src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -550,6 +550,7 @@ func (this *CommonAction) Createorder() {
 			"dis_word":             inserMap.DisWord,
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		}
 
 		if openId := qutil.ObjToString(this.GetSession("s_m_openid")); openId != "" {
@@ -589,6 +590,15 @@ func (this *CommonAction) Createorder() {
 			insertM["expiration_time"] = inserMap.ExpirationTime
 		}
 		orderid := util.Mysql.Insert("dataexport_order", insertM)
+		//审核轨迹
+		util.Mysql.Insert("audit_records", map[string]interface{}{
+			"operator":      "-",
+			"create_time":   qutil.NowFormat(qutil.Date_Full_Layout),
+			"operator_type": 1,
+			"audit_status":  3,
+			"order_code":    inserMap.OrderCode,
+			"audit_type":    2,
+		})
 		if orderid <= 0 {
 			return nil, fmt.Errorf("创建订单异常")
 		}

+ 1 - 0
src/jfw/modules/subscribepay/src/service/courseAction.go

@@ -325,6 +325,7 @@ func (this *CourseAction) Reserve() {
 			"filter":               string(datailMsg),   //订单详情
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		})
 		if orderId == 0 {
 			return &entity.FuncResult{false, errors.New("数据库操作异常,请稍后重试"), nil}

+ 1 - 0
src/jfw/modules/subscribepay/src/service/dataExportPay.go

@@ -200,6 +200,7 @@ func (p *DataExportPay) CreateOrder() {
 			"dis_word":             disWord,             //202020817分销口令
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		})
 		if orderid > 0 {
 			p.SetSession("DataExportVerifyPhone_val", user_phone)

+ 1 - 0
src/jfw/modules/subscribepay/src/service/dataexportPack.go

@@ -184,6 +184,7 @@ func (this *DataExportPack) CreateOrder() {
 			"dis_word":             disWordStr,
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		})
 		if orderid <= 0 {
 			return nil, fmt.Errorf("创建订单异常")

+ 1 - 0
src/jfw/modules/subscribepay/src/service/entniche.go

@@ -65,6 +65,7 @@ func (e *Entniche) Buy() {
 			"pay_way":              "",
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		})
 		if order_id > 0 {
 			return 1, code

+ 1 - 1
src/jfw/modules/subscribepay/src/service/index_p1.go

@@ -94,7 +94,7 @@ func (this *IndexSearch) GetIndexMessage() {
 				_history = strings.Split(h, ",")
 				for k, v := range _history {
 					//默认关键词不超过35个字符
-					b_word, _, _ := jy.InterceptSearchKW(v, 35, true)
+					b_word, _, _ := jy.InterceptSearchKW(v, qutil.IntAllDef(config.Config.KeywordsLimit, 35), true)
 					if b_word == "" {
 						_history = append(_history[:k], _history[k+1:]...)
 					}

+ 10 - 0
src/jfw/modules/subscribepay/src/service/integral.go

@@ -128,6 +128,7 @@ func (b *Integral) CreateOrder() {
 			"d_relation_id":        userLotteryId,
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		}
 		order_phone := b.GetString("order_phone") //p19.3用户信息采集 手机号
 		if order_phone != "" {
@@ -137,6 +138,15 @@ func (b *Integral) CreateOrder() {
 			insertObj["user_phone"] = order_phone
 		}
 		order_id := util.Mysql.Insert("dataexport_order", insertObj)
+		//审核轨迹
+		util.Mysql.Insert("audit_records", map[string]interface{}{
+			"operator":      "-",
+			"create_time":   qutil.NowFormat(qutil.Date_Full_Layout),
+			"operator_type": 1,
+			"audit_status":  3,
+			"order_code":    code,
+			"audit_type":    2,
+		})
 		if order_id > 0 {
 			//绑定卡卷
 			if userLotteryId != "" && lotteryId != "" {

+ 77 - 50
src/jfw/modules/subscribepay/src/service/orderListDetails.go

@@ -68,38 +68,28 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 // 订单列表首页
 func (o *OrderListDetails) MyOrder() {
 	//每页显示数
-	userId := o.Session().Get("userId")
+	userId, _ := o.Session().Get("userId").(string)
 	returnMap := map[string]interface{}{}
 	if userId == "" {
 		o.ServeJson(returnMap)
 		return
 	}
-	queryM := map[string]interface{}{
-		"user_id":    userId,
-		"del_status": 0, //默认未删除
-	}
-
 	typ := o.GetString("type") // 0全部 1未支付 2已支付 3已取消
-	sta := TypSta(typ)
-	if sta != nil {
-		queryM["order_status"] = sta
-	}
 	fromPage := o.GetString("fromPage")
-	if fromPage == "wx" { //微信暂无企业商机管理
-		queryM["product_type"] = map[string]interface{}{"ne": "企业商机管理"}
-	}
+
 	//总数
 	pageNum := qutil.IntAll(o.GetString("pageNum"))
 	pageNum = qutil.If(pageNum == 0, 1, pageNum).(int)
 	i_page_size := qutil.IntAll(o.GetString("page_size"))
 	i_page_size = qutil.If(i_page_size == 0, 10, i_page_size).(int)
 
-	haveNextPage, res, _ := o.Datas(queryM, pageNum, i_page_size)
+	sql, sqlC := getOrderSql(userId, fromPage, typ)
+	haveNextPage, res, _ := o.Datas(sql, pageNum, 10)
 	if res != nil {
-		o.SetRes(res, queryM)
+		o.SetRes(res, userId)
 	}
 	if fromPage == "pc" {
-		returnMap["count"] = util.Mysql.Count(tableName_order, queryM)
+		returnMap["count"] = util.Mysql.CountBySql(sqlC)
 	}
 	returnMap["res"] = res
 	returnMap["hasNextPage"] = haveNextPage
@@ -128,26 +118,20 @@ func (o *OrderListDetails) DeleteOrder() error {
 			"id":      o.GetString("id"),
 			"user_id": userId.(string),
 		}
-		queryM := map[string]interface{}{
-			"user_id":    userId.(string),
-			"del_status": 0, //默认未删除
-		}
+		fromPage := o.GetString("fromPage")
 		nextPage := false
 		// 0全部 1未支付 2已支付
 		typ := o.GetString("type")
 		cancel := o.GetString("cancel")
 		pageNum, _ := o.GetInteger("pageNum")
-		sta := TypSta(typ)
-		if sta != nil {
-			queryM["order_status"] = sta
-		}
-		if o.GetString("fromPage") != "" && o.GetString("fromPage") == "wx" { //微信暂无企业商机管理
-			queryM["product_type"] = map[string]interface{}{"ne": "企业商机管理"}
-		}
+
+		sql, _ := getOrderSql(userId.(string), fromPage, typ)
+
 		var haveNextPage = false
 		var res = []map[string]interface{}{}
-		if o.GetString("fromPage") == "" || o.GetString("fromPage") != "pc" {
-			haveNextPage, res, _ = o.Datas(queryM, pageNum, 10)
+		if fromPage == "" || fromPage != "pc" {
+			// haveNextPage, res, _ = o.Datas1(queryM, pageNum, 10)
+			haveNextPage, res, _ = o.Datas(sql, pageNum, 10)
 			if len(res) > 0 {
 				res = res[0:1]
 				//用于删除订单后 判断新增的订单之后 是否有下一页
@@ -155,7 +139,7 @@ func (o *OrderListDetails) DeleteOrder() error {
 			}
 			if res != nil {
 				log.Println(res)
-				o.SetRes(res, queryM)
+				o.SetRes(res, userId.(string))
 			}
 		}
 		var boo = false
@@ -194,9 +178,6 @@ func (o *OrderListDetails) DeleteOrder() error {
 				//删除订单
 				boo = util.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"del_status": 1, "del_time": qutil.FormatDate(&now, qutil.Date_Full_Layout)})
 			}
-			// if boo {
-			// 	util.MsgRemind.Delete(qutil.IntAll((*order)["id"]))
-			// }
 		}
 
 		o.ServeJson(map[string]interface{}{
@@ -483,13 +464,12 @@ and order_status=1 and  product_type in(`
 	return m
 }
 
-func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[string]interface{}) {
+func (o *OrderListDetails) SetRes(res []map[string]interface{}, userId string) {
 	entid := o.GetUserEntId() //用户购买的entid
-	ent_ordercode := GetEntOrdercode(queryM, entid)
+	ent_ordercode := GetEntOrdercode(userId, entid)
 	var create_time_stamp int64 = 0
-	userid := qutil.ObjToString(queryM["user_id"])
 	//获取最后一次购买的vip订单
-	lastOrderMap := LastOrder("VIP订阅,省份订阅包", userid)
+	lastOrderMap := LastOrder("VIP订阅,省份订阅包", userId)
 
 	for _, v := range res {
 		//获取单号 如果是vip xx小时取消
@@ -537,16 +517,18 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 		}
 		orderMoney := v["order_money"]
 		discount_price := v["discount_price"]
+		//对公转账的订单也有优惠
+		if discount_price != nil {
+			v["discount_price"] = float64(discount_price.(int64)) / 100
+		}
 		if orderMoney != nil {
-			if v["pay_way"] == "transferAccounts" && qutil.IntAll(v["order_status"]) == 1 { //对公转账 订单金额展示为实付金额
+			if v["pay_way"] == "transferAccounts" && qutil.IntAll(v["order_status"]) == 1 && qutil.Int64All(v["return_status"]) > 0 { //对公转账 订单金额展示为实付金额
 				v["order_money"] = float64(qutil.Int64All(v["pay_money"])) / 100
 			} else {
 				v["order_money"] = float64(orderMoney.(int64)) / 100
-				if discount_price != nil {
-					v["discount_price"] = float64(discount_price.(int64)) / 100
-				}
 			}
 		}
+		log.Println(orderMoney, "---", orderMoney.(int64), float64(orderMoney.(int64))/100, v["order_money"])
 		pay_money := v["pay_money"]
 		if pay_money != nil {
 			v["pay_money"] = float64(pay_money.(int64)) / 100
@@ -583,16 +565,18 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 }
 
 // 查询数据
-func (o *OrderListDetails) Datas(queryM map[string]interface{}, pageNum, pagesize_max int) (haveNextPage bool, result []map[string]interface{}, err error) {
-	res := *util.Mysql.Find(tableName_order, queryM, "id,order_code,order_channel,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,pay_money,data_count,order_status,pay_way,product_type,filter,pay_time,vip_starttime,vip_endtime,applybill_status,applybill_type,applybill_taxnum,applybill_company,vip_type,course_status,discount_price,d_relation_id,billingMode,is_backstage_order,return_status,expiration_time", "create_time desc", -1, 0)
-	if len(res) > 0 {
+func (o *OrderListDetails) Datas(sql string, pageNum, pagesize_max int) (haveNextPage bool, result []map[string]interface{}, err error) {
+	log.Println(sql)
+	res := util.Mysql.SelectBySql(sql)
+	log.Println(res)
+	if len(*res) > 0 {
 		start := (pageNum - 1) * pagesize_max
 		end := pageNum * pagesize_max
-		if end > len(res) {
-			end = len(res)
+		if end > len(*res) {
+			end = len(*res)
 		}
-		if start < len(res) {
-			result = res[start:end]
+		if start < len(*res) {
+			result = (*res)[start:end]
 		}
 		//
 		for i := 0; i < len(result); i++ {
@@ -982,10 +966,14 @@ func (o *OrderListDetails) JyPoint() {
 	})
 }
 
-func GetEntOrdercode(query map[string]interface{}, entid []int) []string {
+func GetEntOrdercode(userId string, entid []int) []string {
 	//获取购买的所有企业最近一次的ordercode
 	entordercode := []string{}
-	query["product_type"] = "企业商机管理"
+	query := map[string]interface{}{
+		"product_type": "企业商机管理",
+		"user_id":      userId,
+		"order_status": 1,
+	}
 	for _, v := range entid {
 		query["filter_id"] = v
 		lastbuy_ent := *util.Mysql.Find(tableName_order, query, "order_code,pay_time", "pay_time desc", -1, 0)
@@ -1021,3 +1009,42 @@ func deleteRepeat(slice []int) []int {
 	}
 	return slice_repeat
 }
+
+//获取订单列表sql语句拼接
+//userId 用户id
+//fromPage 来源地址
+//typ 类型
+//@return sql语句 countsql语句
+func getOrderSql(userId, fromPage, typ string) (string, string) {
+	sql := fmt.Sprintf(`select id,order_code,order_channel,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,pay_money,data_count,order_status,pay_way,product_type,filter,pay_time,vip_starttime,vip_endtime,applybill_status,applybill_type,applybill_taxnum,applybill_company,vip_type,course_status,discount_price,d_relation_id,billingMode,is_backstage_order,return_status,expiration_time from dataexport_order
+		where del_status=0 and audit_status=3 AND (is_backstage_order =0 AND user_id ='%s')`, userId)
+	sqlC := fmt.Sprintf(`select count(1) from dataexport_order
+		where del_status=0 and audit_status=3 AND (is_backstage_order =0 AND user_id ='%s')`, userId)
+
+	if fromPage == "wx" {
+		sql += `AND product_type !="企业商机管理"` //微信暂无企业商机管理
+	}
+	// 0全部 1未支付 2已支付 3已取消
+	//拼接sql
+	switch typ {
+	case "0", "":
+		s := fmt.Sprintf(` or (order_status =1 AND is_backstage_order=1 and user_id ='%s')  `, userId)
+		sql += s
+		sqlC += s
+	case "1":
+		s := ` AND order_status = 0`
+		sql += s
+		sqlC += s
+	case "2":
+		s := fmt.Sprintf(`AND order_status = 1 or (order_status =1 AND is_backstage_order=1 and user_id ='%s')  `, userId)
+		sql += s
+		sqlC += s
+	case "3":
+		s := ` AND order_status in(-2,-3)`
+		sql += s
+		sqlC += s
+	}
+	sql += " order by create_time desc"
+
+	return sql, sqlC
+}

+ 1 - 0
src/jfw/modules/subscribepay/src/service/resourcePack.go

@@ -112,6 +112,7 @@ func (this *ResourcePack) CreateOrder() {
 		"d_relation_id":        filter.UserLotteryId,
 		"distribution_channel": distributionChannel, //销售渠道
 		"order_channel":        orderChannel,        //下单渠道
+		"audit_status":         3,                   //默认审核通过
 	})
 	if orderid <= 0 {
 		this.ServeJson(OrderResult{Msg: "创建订单异常"})

+ 5 - 3
src/jfw/modules/subscribepay/src/service/salesCreateOrder.go

@@ -8,9 +8,6 @@ import (
 	"entity"
 	"errors"
 	"fmt"
-	"github.com/SKatiyar/qr"
-	"github.com/go-xweb/xweb"
-	"go.mongodb.org/mongo-driver/bson"
 	"log"
 	"net/url"
 	"pay"
@@ -20,6 +17,10 @@ import (
 	"strconv"
 	"time"
 	"util"
+
+	"github.com/SKatiyar/qr"
+	"github.com/go-xweb/xweb"
+	"go.mongodb.org/mongo-driver/bson"
 )
 
 type SalesCreateOrder struct {
@@ -158,6 +159,7 @@ func (this *SalesCreateOrder) CreateBySeller() {
 			"order_channel":        "xdqd04",  //下单渠道-启明星后台销售创建
 			"salesperson":          sellPName, //销售人员
 			"salesperson_id":       sellPid,   //销售人员id
+			"audit_status":         3,         //默认审核通过
 		}
 
 		if inserMap.VipStartTime != "" && inserMap.VipEndTime != "" {

+ 1 - 0
src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -314,6 +314,7 @@ func (this *SubscribeChange) Upgrade() {
 			"dis_word":             disWord,
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		}
 		if order_phone != "" {
 			if !jy.PhoneReg.MatchString(order_phone) {

+ 2 - 0
src/jfw/modules/subscribepay/src/service/vipSubscribePay.go

@@ -313,6 +313,7 @@ func (this *SubVipPayOrder) CreateOrder() {
 			"dis_word":             disWord,             //分销口令
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		}
 		if orderType != 5 && order_phone != "" { //p19.3用户信息采集(仅付费可填写手机号)
 			if !jy.PhoneReg.MatchString(order_phone) {
@@ -516,6 +517,7 @@ func (this *SubVipPayOrder) Renew() {
 			"vip_starttime":        qutil.FormatDate(&startTime, qutil.Date_Full_Layout),
 			"vip_endtime":          qutil.FormatDate(&endTime, qutil.Date_Full_Layout),
 			"vip_type":             1,
+			"audit_status":         3, //默认审核通过
 		}
 
 		if userfilter != nil && len(*userfilter) > 0 {

+ 1 - 0
src/jfw/modules/subscribepay/src/service/vipSubscribeTrial.go

@@ -320,6 +320,7 @@ func (this *TrialOrder) TrialPay() {
 			"vip_endtime":          qutil.FormatDate(&endTime, qutil.Date_Full_Layout),
 			"distribution_channel": distributionChannel, //销售渠道
 			"order_channel":        orderChannel,        //下单渠道
+			"audit_status":         3,                   //默认审核通过
 		}
 		if order_phone != "" {
 			if !jy.PhoneReg.MatchString(order_phone) {

+ 1 - 1
src/jfw/modules/subscribepay/src/util/msgremind.go

@@ -412,7 +412,7 @@ func (m *msgRemind) loadOrder() {
 	log.Println("开始加载72小时内的订单到内存中。。。")
 	startTime := time.Unix(time.Now().Unix()-MsgRemind.getExpireTime(), 0)
 	startTimes := util.FormatDate(&startTime, util.Date_Full_Layout)
-	list := Mysql.SelectBySql("select id,order_code,order_money,user_id,create_time,remind_status,vip_type,product_type from dataexport_order where order_money>0 and create_time>=? and product_type in ('VIP订阅','大会员') and order_status=0 and del_status=0 and (remind_status<>2 or remind_status is null)", startTimes)
+	list := Mysql.SelectBySql("select id,order_code,order_money,user_id,create_time,remind_status,vip_type,product_type from dataexport_order where order_money>0 and create_time>=? and product_type in ('VIP订阅','大会员') and order_status=0 and del_status=0 and (remind_status<>2 or remind_status is null) and audit_status=3", startTimes)
 	if list == nil {
 		log.Println("加载72小时内的订单到内存中失败")
 		return

+ 1 - 15
src/web/staticres/common-module/order-list/js/order-list.js

@@ -530,20 +530,6 @@ var vm = new Vue({
             stateText = '未收到转账'
           }
         }
-      } else if (orderStatus === 1) {
-        if (customPayProduction.indexOf(productType) !== -1) {
-          var customIsAll = 0
-          if (filterInfo.isAll) {
-            customIsAll = filterInfo.isAll
-          }
-          if (customIsAll === 2 || order.return_status === 0) {
-            stateText = '待付款'
-            className = 'notpay'
-          } else if (customIsAll === 3 || order.return_status === 2) {
-            stateText = '待付完'
-            className = 'notpay'
-          }
-        }
       }
 
       return {
@@ -1447,7 +1433,7 @@ var vm = new Vue({
         publishTime = '全部'
       } else {
         if (publishTime.indexOf('_') !== -1) {
-          var pbt = publishTime.join('_')
+          var pbt = publishTime.split('_')
           if (pbt[0] && !pbt[1]) {
             publishTime = new Date(pbt[0] * 1000).pattern('yyyy.MM.dd')
             publishTime = publishTime + '-'

+ 110 - 0
src/web/staticres/js/common.js

@@ -702,3 +702,113 @@ function echoRequiredValues (target, now, keys) {
     return {}
   }
 }
+
+/**
+ *   ----S 金额转换 ---
+  *  @desc 同步金额转换函数-与PC、MOBILE 端其他项目保持一致,经过 babel 转化,原始代码参照其他项目
+  *  @date 2022-10-08 目前用于表格中预算、中标金额字段展示格式化
+ */
+
+/**
+ * 金额转换
+ * @param money 金额
+ * @param config
+ * @param config.type 类型 full | number | unit
+ * @param config.level 初始单位索引
+ * @param config.levelArr 单位数组 ['元', '万', '亿', '万亿']
+ * @param config.unit 计算单位 10000
+ * @param config.digit 精度,保留小数位数 2
+ * @param config.degrade 指定单位索引时,所需精度不够是否降级单位 false
+ * @returns {*|string|string|number}
+ */
+function recursiveCalculationMoney(money, config, start) {
+  if (config === void 0) {
+    config = {};
+  }
+
+  if (start === void 0) {
+    start = false;
+  }
+
+  var _Object$assign = Object.assign({
+      type: 'full',
+      level: 0,
+      levelArr: ['元', '万元', '亿元', '万亿元'],
+      digit: 2,
+      degrade: false,
+      unit: 10000
+    }, config),
+    type = _Object$assign.type,
+    level = _Object$assign.level,
+    levelArr = _Object$assign.levelArr,
+    unit = _Object$assign.unit,
+    digit = _Object$assign.digit,
+    degrade = _Object$assign.degrade; // 提取纯数字
+
+
+  var computMoney = String(money).match(/^\d+(\.\d+)?/g) || [0];
+  computMoney = Number(computMoney[0]); // 是否指定单位索引
+
+  var lockUnit = start && level > 0; // 判断是否需要递归单位
+
+  if (!lockUnit) {
+    var canNext = computMoney / Math.pow(unit, level + 1) >= 1 && level + 1 < levelArr.length;
+
+    if (canNext) {
+      return recursiveCalculationMoney(computMoney, {
+        type: type,
+        level: level + 1,
+        levelArr: levelArr,
+        digit: digit,
+        degrade: degrade,
+        unit: unit
+      });
+    }
+  } // 浮点数精度
+
+
+  var digitNumber = Math.pow(10, digit); // 指定单位索引时,如不满足精度要求,是否需要降级单位处理
+
+  var computLevel = level;
+  var needDegrade = degrade && computMoney * digitNumber < Math.pow(unit, level);
+
+  if (lockUnit && needDegrade) {
+    computLevel--;
+  } // 计算金额
+
+
+  computMoney = Number(String(Math.floor(computMoney / Math.pow(unit, computLevel) * digitNumber) / digitNumber)); // 返回结果
+
+  switch (type) {
+    case 'full':
+    {
+      if (computMoney === 0) {
+        return '';
+      } else {
+        return computMoney + levelArr[computLevel];
+      }
+    }
+
+    case 'unit':
+    {
+      return levelArr[computLevel];
+    }
+
+    case 'number':
+    {
+      return computMoney;
+    }
+  }
+}
+
+function tableFormatMoney(money, config) {
+  if (config === void 0) {
+    config = {};
+  }
+
+  return recursiveCalculationMoney(money, config, true);
+}
+
+/**
+ *   ----E 金额转换 ---
+ */

+ 10 - 16
src/web/staticres/js/superSearch.js

@@ -521,14 +521,11 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 		}
 
 		if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
-			var budget =parseInt(datas[i].budget)/10000
-			if(budget.toString().length>6){
-				if(budget.toString().indexOf(".")==5){
-					budget=budget.toString().substr(0,7)
-				}else{
-					budget=budget.toString().substr(0,6)
-				}
-			}
+      var budget = tableFormatMoney(datas[i].budget, {
+        type: 'number',
+        digit: 2,
+        level: 1
+      })
 			tableHtml += '<td class="tt-r" width="73"><div>'+budget+'</div></td>';
 		}else{
 			tableHtml += '<td class="tt-r" width="73"><div></div></td>';
@@ -550,14 +547,11 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 			tableHtml += '<td class="tt-l" width="174"><div></div></td>';
 		}
 		if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
-			var bidamount = parseInt(datas[i].bidamount)/10000;
-			if(bidamount.toString().length>6){
-				if(bidamount.toString().indexOf(".")==5){
-					bidamount=bidamount.toString().substr(0,7);
-				}else{
-					bidamount=bidamount.toString().substr(0,6);
-				}
-			}
+      var bidamount = tableFormatMoney(datas[i].bidamount, {
+        type: 'number',
+        digit: 2,
+        level: 1
+      })
 			tableHtml += '<td class="tt-r" width="76"><div>'+bidamount+'</div></td>';
 		}else{
 			tableHtml += '<td class="tt-r" width="76"><div></div></td>';

+ 8 - 1
src/web/staticres/public-pc/js/pc-bottom.js

@@ -2,9 +2,16 @@
  * 获取用户信息 (用于兼用旧页面使用 ajaxUserInfo)
  */
 function getNowUserInfo () {
+  if (!window.ajaxUserInfo) {
+    window.ajaxUserInfo = {
+      headImage: '',
+      nickName: '',
+      userId: '',
+    }
+  }
   $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r) {
     if (r) {
-      Object.keys(ajaxUserInfo).forEach(function (v) {
+      Object.keys(r).forEach(function (v) {
         if (r[v] && r[v] !== '') {
           ajaxUserInfo[v] = r[v]
         }

+ 2 - 13
src/web/templates/frontRouter/wx/vipIntro/free/order_detail.html

@@ -694,19 +694,8 @@
                     }
                     $(".payPrice").text("¥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
                     $("#card-header-bg").addClass("bg finish-bg")
-
-
-                    if (r.data.order.return_status === 0||r.data.order.return_status === 2){
-                        $("#card-header-bg").addClass("bg nopay-bg")
-                        if (r.data.order.return_status === 0){
-                            $("#pageTitle").text("待付款");
-                        }else if (r.data.order.return_status === 2){
-                            $("#pageTitle").text("待付完");
-                        }
-                    }else{
-                        $("#card-header-bg").addClass("bg finish-bg")
-                        $("#pageTitle").text("已完成");
-                    }
+                    $("#card-header-bg").addClass("bg finish-bg")
+                    $("#pageTitle").text("已完成");
                     $("#pageTitle").addClass("status")
 
                     //支付时间

+ 1 - 13
src/web/templates/pc/aiPack_orderDetail.html

@@ -193,19 +193,7 @@
                     $(".price").text("¥ " + formatMoney(r.data.order_money / 100) + "元");
                     $(".real_cycle").text(member_endtime+"到期");
                     if (r.data.order_status === 1) {
-                        var customIsAll = 0
-                        if (filterObj.isAll){
-                          customIsAll=filterObj.isAll
-                        }
-                        if (customIsAll == 2){
-                          $("#status_wait_pay").removeClass("hide").text("待付款");
-                          $("#bg").addClass("yellowBg").removeClass("greenBg");
-                        }else if (customIsAll == 3){
-                          $("#status_wait_pay").removeClass("hide").text("待付完");
-                          $("#bg").addClass("yellowBg").removeClass("greenBg");
-                        }else{
-                          $("#status_success").removeClass("hide");
-                        }
+                        $("#status_success").removeClass("hide");
                         if (r.data.pay_time){
                             $(".pay_time_p").css("display", "");
                             $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));

+ 1552 - 1558
src/web/templates/pc/biddingsearch_enterprise.html

@@ -1,1558 +1,1552 @@
-
-<html lang="zh-cn">
-	<head>
-		<title>招标搜索结果_{{Msg "seo" "qfw.swordfishsl.title"}}</title>
-		<meta name="Keywords" content="{{Msg "seo" "qfw.swordfishsl.key"}}"/>
-		<meta name="Description" content="{{Msg "seo" "qfw.swordfishsl.description"}}"/>
-		<meta name="renderer" content="webkit">
-		<meta content="telephone=no" name="format-detection"/>
-        <meta content="招标搜索" theme="light" name="enable-header"/>
-		{{include "/common/pnc.html"}}
-		<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link href="{{Msg "seo" "cdn"}}/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link href="{{Msg "seo" "cdn"}}/css/dev2/superSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/biddingSearch.js?v={{Msg "seo" "version"}}"></script>
-		<script language="javascript" type="text/javascript" src="{{Msg "seo" "cdn"}}/My97DatePicker/WdatePicker.js"></script>
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
-
-		<style type="text/css">
-			#searchInner .pagination a:hover{
-				color:#97310e !important;
-			}
-			#searchInner .pagination a.disabled{
-				color: #aea79f !important;
-				background-color: #fff ;
-				border-color: #ddd;
-				cursor: not-allowed;
-			}
-			#searchInner .pagination a:visited{
-				color:#1d1d1d;
-			}
-
-			/*j-wx-code Start*/
-			.j-wx-code{
-				width: 335px;
-				height: 355px;
-				background-color: #fff;
-				-webkit-border-radius: 6px;
-				   -moz-border-radius: 6px;
-				        border-radius: 6px;
-				position: relative;
-				/*margin: 100px auto;*/
-			}
-			.j-wx-code>.code-close{
-				width: 40px;
-				height: 40px;
-				position: absolute;
-				right: -20px;
-				top: -20px;
-				cursor: pointer;
-				-webkit-transition: all 1s;
-				-o-transition: all 1s;
-				-moz-transition: all 1s;
-				transition: all 1s;
-			}
-			.j-wx-code>.code-close:hover{
-				-webkit-transform: scale(1.2);
-				   -moz-transform: scale(1.2);
-				    -ms-transform: scale(1.2);
-				     -o-transform: scale(1.2);
-				        transform: scale(1.2);
-			}
-			.j-wx-code>.code-title{
-				height: 82px;
-				background:url(/images/j-wx-code-title.png) center center no-repeat;
-				-webkit-animation: moveYun 15s infinite linear both;
-				   -moz-animation: moveYun 15s infinite linear both;
-				     -o-animation: moveYun 15s infinite linear both;
-				        animation: moveYun 15s infinite linear both;
-			}
-			.j-wx-code>.code-wxm{
-				text-align: center;
-				margin-bottom: -6px;
-				margin-top: -16px;
-
-			}
-			.j-wx-code>.code-wxm>img{
-				width: 200px;
-				height: 200px;
-				margin-top: -5px;
-			}
-			.j-wx-code>.code-text{
-				font: 16px "microsoft yahei";
-				text-align: center;
-				color: #252627;
-			}
-			.j-wx-code>.code-bottom{
-				width: 470px;
-				height: 211px;
-				position: absolute;
-				bottom: -113px;
-				left: -73px;
-				background: url(/images/j-wx-code-bottom.png) 0 0 no-repeat;
-			}
-			.j-wx-code>.code-bottom>img{
-				position: absolute;
-				left: 280px;
-				top: 88px;
-				-webkit-animation: codeWxMove 10s linear both;
-				   -moz-animation: codeWxMove 10s linear both;
-				     -o-animation: codeWxMove 10s linear both;
-				        animation: codeWxMove 10s linear both;
-				-webkit-animation-fill-mode:forwards;
-				   -moz-animation-fill-mode:forwards;
-				     -o-animation-fill-mode:forwards;
-				        animation-fill-mode:forwards;
-			}
-			#keyImg{
-				width:198px;
-			}
-			/*
-			#layerImg{
-				position:absolute;
-				width: 150px !important;
-			    height: 150px !important;
-			    left: 198px;
-			    top: 148px;
-			}*/
-			#labmodalbody .code-close{
-				width: 40px;
-			    height: 40px;
-			    position: absolute;
-			    right: 40px;
-			    top: -20px;
-			    cursor: pointer;
-			    -webkit-transition: all 1s;
-			    -o-transition: all 1s;
-			    -moz-transition: all 1s;
-			    transition: all 1s;
-			}
-			#labmodalbody .code-close:hover{
-				-webkit-transform: scale(1.2);
-				   -moz-transform: scale(1.2);
-				    -ms-transform: scale(1.2);
-				     -o-transform: scale(1.2);
-				        transform: scale(1.2);
-			}
-			.layheader{
-				position: absolute;
-			    color: #fff;
-			    left: 138px;
-			    top: 40px;
-			    line-height: 32px;
-			    font-family: 微软雅黑;
-			    font-weight: bold;
-			}
-
-			.layheader div:nth-child(1){
-				font-size:20px;
-				width:272px;
-			}
-			.layheader div:nth-child(2){
-				font-size:16px;
-				margin-top:10px;
-				width:272px;
-			}
-			.modal-footer{
-				text-align: center;
-			    position: absolute;
-			    bottom: 65px;
-			    left: 110px;
-			    font-size: 14px;
-			    line-height: 22px;
-			    color: #686868;
-			}
-			.modal-dialog{
-				width:500px;
-			}
-			/*add*/
-			.searchSlideText ul li{
-				float: none;
-			}
-			/*功能提示*/
-			#labwelcomebody .welcomeImg{
-				width: 335px;
-    			height: 402px;
-			}
-			#labwelcomebody .code-close{
-				width: 40px;
-			    height: 40px;
-			    position: absolute;
-			    right: 63px;
-			    top: -20px;
-			    cursor: pointer;
-				-webkit-transition: all 1s;
-   				-o-transition: all 1s;
-   				-moz-transition: all 1s;
-    			transition: all 1s;
-			}
-			.modal-footer-welcome{
-				width:273px;
-				margin:auto;
-			    font-size: 16px;
-			    line-height: 26px;
-				margin-top: -133px;
-			}
-
-			#labwelcomebody .code-close:hover{
-				 -webkit-transform: scale(1.2);
-	   				-moz-transform: scale(1.2);
-	   				 -ms-transform: scale(1.2);
-	     			  -o-transform: scale(1.2);
-	        			 transform: scale(1.2);
-			}
-			/*价格*/
-			.minwy{
-				position: absolute;
-			    left: 124px;
-			    top: 7.5px;
-			    color: #ccc;
-			}
-			.maxwy{
-				position: absolute;
-			    right: 8px;
-			    top: 7.5px;
-			    color: #ccc;
-			}
-			.PriceInput{
-				position:relative;
-			}
-			.j-clearicon {
-			    right: 118px !important;
-			}
-			.lucene-table tr{
-				cursor: pointer;
-			}
-			#labImg {
-			    position: absolute;
-			    width: 150px !important;
-			    height: 150px !important;
-			    left: 198px;
-			    top: 148px;
-			}
-			#searchInner .searchControl .seaTender-inner .tabContainer .lucene-table.entlist table{
-				width: 1200px;
-			}
-			.working{
-				border: 1px solid #e0e0e0 !important;
-			}
-		</style>
-	</head>
-    <!-- 中标企业搜索页面 -->
-	<body>
-	{{include "/common/pchead.html"}}
-		<div class="modal fade" id="labModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-		    <div class="modal-dialog">
-		        <div class="modal-content" id="labmodalcont">
-		            <div class="modal-body" id="labmodalbody">
-					<img class="code-close" src="{{Msg "seo" "cdn"}}/images/j-wx-code-close.png" alt="" onclick="labClose();">
-						<div class="layheader">
-							<div>超级搜索</div>
-							<div>按行业、金额搜索,结果可按表格显示</div>
-						</div>
-						<img src="{{Msg "seo" "cdn"}}/images/biddingSearch/labbkimg.png"/>
-						<img id="labImg" src=""/>
-					</div>
-		            <div class="modal-footer">
-		                此功能尚处在实验阶段,请扫码进入<br>剑鱼标讯实验室,打开相应开关后,即可体验!
-		            </div>
-		        </div><!-- /.modal-content -->
-		    </div><!-- /.modal -->
-		</div>
-		<div class="modal fade" id="myModal"  tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" >
-			<div class="modal-dialog" style="width:400px;border:0px;" >
-				<div class="j-wx-code" id="myModal-div">
-					<img class="code-close" src="{{Msg "seo" "cdn"}}/images/j-wx-code-close.png" alt="" onclick="layerClose();"/>
-					<div class="code-title"></div>
-					<div class="code-wxm"><img id="layerImg" src="/front/share/{{.T.shareid}}"/></div>
-					<div class="code-text">
-						<span><img id="wxpng" src="{{Msg "seo" "cdn"}}/images/wx1.png"/>微信扫码登录</span>
-						<br/>
-						<span id="freetext">立即免费使用</span>
-					</div>
-					<div class="code-bottom">
-						<img src="{{Msg "seo" "cdn"}}/images/j-wx-cose-move.png" alt=""/>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="modal fade" id="welcome" tabindex="-1" role="dialog" aria-labelledby="welcome" aria-hidden="false">
-		    <div class="modal-dialog">
-		        <div class="modal-content" id="labmodalcont">
-		            <div class="modal-body" id="labwelcomebody">
-					<img class="code-close" src="{{Msg "seo" "cdn"}}/images/j-wx-code-close.png" alt="" onclick="labWelClose();">
-					<img class="welcomeImg" src="{{Msg "seo" "cdn"}}/images/biddingSearch/welcomeusejylab.png"/>
-		           		<div class="modal-footer-welcome">
-							欢迎体验剑鱼标讯实验室—中标企业搜索功能。实验随时可能结束,或者进行调整,请密切关注剑鱼标讯通知。
-		           		</div>
-					</div>
-		        </div><!-- /.modal-content -->
-		    </div><!-- /.modal -->
-		</div>
-		<section id="searchInner">
-			<!--搜索头部 START-->
-			<div class="searchHeader">
-				<div class="w searchHeader-container">
-					<!--搜索-->
-					<div class="searchInput clearfix">
-						<form action="/jylab/bidsearchforent/index.html" method="post" id="zbSeatchT" class="clearfix">
-							<input class="searchname" autocomplete="off" type="search" name="keywords" id="searchinput" value="{{.T.searchvalue}}" placeholder="中标企业搜索" />
-
-							<input type="submit" class="searchBtn" value="搜索"/>
-							<img src="{{Msg "seo" "cdn"}}/images/pc_20.png" id="t-clear" class="j-clearicon" style="display:none;">
-							<div class="searchSlideText">
-								<ul>
-								</ul>
-							</div>
-							<input type="hidden" name="searchvalue" value="{{.T.searchvalue}}">
-							<input type="hidden" name="area" value="{{.T.area}}">
-							<input type="hidden" name="minprice" value="{{.T.minprice}}">
-							<input type="hidden" name="maxprice" value="{{.T.maxprice}}">
-							<input type="hidden" name="pricetype" value="{{.T.pricetype}}">
-						</form>
-						<!--筛选-->
-						<div id="screenBtn" class="screen down">
-							筛选
-						</div>
-						<!--二维码-->
-						<div class="search-right-wx">
-							<img src="{{Msg "seo" "cdn"}}/images/biddingSearch/sea-right-wx.png" />
-							<div class="search-right-wx-inner">
-								<div class="wx-inner-title">
-									扫码关注剑鱼标讯
-								</div>
-								<div class="wx-inner-ewm">
-									<img  id="keyImg" src="/front/share/{{.T.shareid}}"/>
-								</div>
-								<div class="wx-inner-bottom"  style="font-size:14px">
-									微信扫一扫<br>随时随地掌握招标信息
-		<!--						微信扫一扫,及时获取及时获取<i>"1"</i>相关招标信息-->
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<!--整体页面切换tab-->
-					<div class="control-tabBtn">
-						<span class="bidbutdir" style="left:187px;"></span>
-						<a class="supbtn" left="50" href="javascript:void(0)">
-							<i></i><font>招标搜索</font>
-						</a>
-						<a href="#" class="on" left="187"><i></i>中标企业搜索</a>
-						<a href="{{Msg "seo" "url.portrait_winner"}}"{{if not .T.portraitpower}} class="hidden"{{end}} left="335"><i></i>中标企业画像</a>
-						<a href="{{Msg "seo" "url.portrait_buyer"}}"{{if not .T.portraitpower}} class="hidden"{{end}} left="485"><i></i>采购单位画像</a>
-					</div>
-				</div>
-			</div>
-
-	<!--招标搜索页面 START-->
-	<div class="searchControl">
-		<!--头部功能-->
-		<div class="searchTender w" style="display:none;">
-			<!--价格区间-->
-			<div class="Price clearfix">
-				<div class="leftTitle">
-					价格区间:
-				</div>
-				<div class="Price-content clearfix">
-					<span class="active">全部</span>
-					<div class="pricefat">
-						<div class="PriceInput">
-							<input type="text" name="minprice" id="minprice" value="{{.T.minprice}}" placeholder="" />
-							<font class="minwy">万元</font>
-							<span></span>
-							<font class="maxwy">万元</font>
-							<input type="text" name="maxprice" id="maxprice" value="{{.T.maxprice}}" placeholder="" />
-						</div>
-						<button class="pricebut" style="display:none;">确定</button>
-					</div>
-				</div>
-			</div>
-			<!--项目地区-->
-			<div class="region clearfix" style="border: none;">
-				<div class="leftTitle">
-					项目地区:
-				</div>
-				<div class="region-content">
-					<span id="regionBtn" class=" active">全国</span>
-					<i class="diver">A</i>
-					<font>安徽</font>
-					<font>澳门</font>
-					<i class="diver">B</i>
-					<font>北京</font>
-					<i class="diver">C</i>
-					<font>重庆</font>
-					<i class="diver">F</i>
-					<font>福建</font>
-					<i class="diver">G</i>
-					<font>广东</font>
-					<font>广西</font>
-					<font>贵州</font>
-					<font>甘肃</font>
-					<i class="diver">H</i>
-					<font>河北</font>
-					<font>湖北</font>
-					<font>黑龙江</font>
-					<font>海南</font>
-					<font>河南</font>
-					<font  style="margin-right: 45px;">湖南</font>
-					<i class="diver">J</i>
-					<font>吉林</font>
-					<br>
-					<font>江苏</font>
-					<font>江西</font>
-					<i class="diver">L</i>
-					<font>辽宁</font>
-					<i class="diver">N</i>
-					<font>内蒙古</font>
-					<font>宁夏</font>
-					<i class="diver">Q</i>
-					<font>青海</font>
-					<i class="diver">S</i>
-					<font>山西</font>
-					<font>陕西</font>
-					<font>上海</font>
-					<font>山东</font>
-					<font>四川</font>
-					<i class="diver">T</i>
-					<font>天津</font>
-					<font>台湾</font>
-					<i class="diver">X</i>
-					<font>西藏</font>
-					<font>新疆</font>
-					<font>香港</font>
-					<i class="diver">Y</i>
-					<font>云南</font>
-					<i class="diver">Z</i>
-					<font>浙江</font>
-				</div>
-			</div>
-		</div>
-		<!--招标搜索列表内容-->
-		<div class="seaTender-inner w">
-			<!--招标tab切换-->
-			<div class="tabTitle clearfix">
-				<ul>
-					<li>
-						<a class="active" href="javascript:;" style="width:100px;">最新招标信息</a>
-					</li>
-				</ul>
-				<div class="right-tabBtn">
-					<button id="right-list" class="active">列表</button>
-					<button id="right-table">表格</button>
-				</div>
-			</div>
-			<!--tab切换内容-->
-			<div class="tabContainer tabContainer-2"  id="allnews">
-				<!--全文搜索 列表-->
-				<div class="lucene">
-					<ul id="ul_list">
-
-					</ul>
-				</div>
-				<!--全文搜索 表格 展示中标企业搜索数据-->
-				<div class="lucene-table" style="display: none;">
-					<table>
-						<thead>
-						<tr>
-						{{if .T.searchvalue}}
-							<td width="45">序号</td>
-							<td width="150" style="border-top: 4px solid #2C90CB;">中标日期</td>
-							<td width="854">项目名称</td>
-							<td width="150" style="border-top: 4px solid #2C90CB;">中标金额(万元)</td>
-						{{else}}
-							<td width="48">序号</td>
-							<td width="315" style="border-top: 3px solid #2C90CB;">项目名称</td>
-							<td width="84">公告类型</td>
-							<td width="73" style="border-top: 3px solid #2C90CB;">预算<br>(万元)</td>
-							<td width="181">招标单位</td>
-							<td width="103" style="border-top: 3px solid #2C90CB;">开标时间</td>
-							<td width="174">中标单位</td>
-							<td width="76" style="border-top: 3px solid #2C90CB;">中标金额<br>(万元)</td>
-							<td width="103">发布时间</td>
-						{{end}}
-						</tr>
-						</thead>
-					</table>
-					<table>
-						<tbody class="formTable" id="formTable">
-
-						</tbody>
-					</table>
-          <div class="shade_table" style="">
-            <div class="more" data-need-bind-phone>
-              查看更多&gt;
-            </div>
-          </div>
-				</div>
-			</div>
-			<div class="hasNoData" style="display: none;">
-				<img style="width: 216px;margin: 45px auto;" src="{{Msg "seo" "cdn"}}/images/pc_12.png" id="hasNoData">
-				<div style="color:#2cb7ca;">没有找到与该关键词匹配的信息</div>
-			</div>
-			<div class="working" style="display: none;">
-				<img style="width: 216px;margin: 45px auto;" src="{{Msg "seo" "cdn"}}/images/wx/working.gif">
-				<div style="color:#2cb7ca;">剑鱼标讯正在努力工作中···</div>
-			</div>
-		</div>
-		<!--分页-->
-		<div class="pagination clearfix w" style="display:none;">
-			<div class="pagination-inner fr">
-				<a class="nbprev disabled" href="#"><i><</i>上一页</a>
-				<span class="currentPage">1</span>
-				<a class="nbnext" href="#">下一页<i>></i></a>
-			</div>
-		</div>
-	</div>
-	<!--招标搜索页面 END-->
-</section>
-
-    {{include "/common/pcbottom.html"}}
-    {{include "/common/baiducc.html"}}
-
-    <script>
-    $(".shade_table .more").on('click', toPaydataExport)
-	var searchVal = ""
-    $(function() {
-		$(".control-tabBtn>a").hover(function(){
-			$(".control-tabBtn>a").removeClass("on");
-			$(this).addClass("on");
-			$(".control-tabBtn>.bidbutdir").css("left",$(this).attr("left"));
-		},function(){
-			$(".control-tabBtn>a").removeClass("on");
-			$(".control-tabBtn>a:eq(1)").addClass("on");
-			$(".control-tabBtn>.bidbutdir").css("left",$(".control-tabBtn>a:eq(1)").attr("left"));
-		});
-		var oInput=document.getElementById("searchinput");
-		moveEnd(oInput)
-		priceTime();
-		$(".searchname").focus();
-		new JyWebScoket.qrToLab();
-		var recList = "";
-		var len = "";
-        $("#searchinput").on("input propertychange",function(){
-			var searchInput = $("#searchinput").val().trim();
-            if(searchInput == searchVal){
-                return false;
-            }
-            searchVal = searchInput;
-            if($.trim(searchInput).length > 0){
-				$("#t-clear").show();
-                getRecList(searchInput);
-            }else{
-				$("#t-clear").hide();
-                $(".searchSlideText").hide();
-            }
-        });
-
-		$("#t-clear").click(function(){
-			$("#t-clear").hide();
-			$("#searchinput").val("").focus();
-		})
-        //隐藏企业推荐列表
-        $("body").on("click",function (e) {
-            if(e.target.id != "searchinput") {
-                $(".searchSlideText").hide();
-            }
-        });
-    });
-	var scIndex = "";
-	var selected = false;
-	var prevDiff = null;
-	var firstItem = 0;
-	var index = -1;
-	var con = 10;
-	var backbottomFlag = false;
-    //企业推荐列表
-   	 function getRecList(entName_key) {
-		prevDiff = null;
-		firstItem = 0;
-		index = -1;
-		con = 10;
-		backbottomFlag = false;
-        $(".searchSlideText ul").html("");
-        $.post("/jylab/bidsearchforent/recList",{entName:entName_key},function(r){
-            if(r){
-                if(typeof (r.recList)!="undefined"){
-                    recList = r.recList;
-					len = recList.length;
-					var html = "";
-                    for(var i=0;i<recList.length;i++){
-                        var entName = recList[i].name;
-                        if(entName!="" && entName.length>36){
-                            entName = entName.substr(0,36)+"...";
-                        }
-                        html += "<li>"+entName.replace(entName_key,"<i>"+entName_key+"</i>")+"</li>";
-                    }
-					var htmlObj = $(html);
-					htmlObj.mouseover(function(){
-						var currentDiff = $(this).index() - firstItem;
-						if(prevDiff != null && backbottomFlag){
-							backbottomFlag = false;
-							prevDiff = $(this).index() - firstItem;
-							return;
-						}
-						if(prevDiff != null && currentDiff == prevDiff){
-							return;
-						}
-						index = $(this).index();
-						prevDiff = $(this).index() - firstItem;
-						$(".searchSlideText").find("li").css("background-color","")
-						$(this).css("background-color","#f4f4f7");
-					});
-					$(".searchSlideText ul").append(htmlObj);
-                }
-            }
-            if($(".searchSlideText ul li").length>=10){
-                $(".searchSlideText").css("height","400px");
-            }else{
-                $(".searchSlideText").css("height","auto");
-            }
-            $(".searchSlideText").show();
-
-            $(".searchSlideText ul li").click(function(){
-                if($(this).text()!=""){
-                    $("#searchinput").val($(this).text());
-                    $(".searchSlideText").hide();
-                    $(".searchBtn").click();
-                }
-            });
-        });
-    }
-
-	$(".searchSlideText").scroll(function(){
-		var d = $(this).scrollTop() / 40;
-		var s = parseInt(d);
-		if(d-s == 0){
-			con = 10;
-			firstItem = s;
-		}else if(d-s >= 0.5){
-			con = 9;
-			firstItem = s + 1;
-		}else{
-			con = 10;
-			firstItem = s;
-		}
-	});
-
-	//方向键选择
-	$(".searchname").keydown(function(event){
-		var key = event.keyCode;
-		var $scrollTop = $(".searchSlideText").scrollTop();
-		if($.trim($(this).val()).length == 0){
-			return;
-		}
-		if(key == 38){ //向上按钮
-			event.preventDefault();
-			if(index < firstItem && index != -1){
-				index = firstItem+1;
-			}else if(index > firstItem+con){
-				index = firstItem+con;
-				if(index > len-1){
-					index = len-1;
-				}
-			}
-			index--;
-			if(index < 0){
-				index = len-1;
-				$(".searchSlideText").scrollTop(len*40);
-				backbottomFlag = true;
-			}else{
-				if(index == 0){ //到顶了
-					$(".searchSlideText").scrollTop(0);
-				}else if(index == firstItem - 1){
-					$scrollTop -= 40;
-					$(".searchSlideText").scrollTop($scrollTop);
-				}
-			}
-			selected = true;
-			scIndex = index;
-		}else if(key == 40){ //向下按钮
-			event.preventDefault();
-			index++;
-			//处理滚动滑轮淹没上次选中li情况
-			if(index < firstItem){
-				index = firstItem;
-			}else if(index > firstItem+con){
-				index = firstItem+con-1;
-				if(index > len-1){
-					index = len-1;
-				}
-			}
-			if(index-firstItem == con){
-				$scrollTop += 40;
-				$(".searchSlideText").scrollTop($scrollTop);
-			}
-			if(index == len-1){
-				if(prevDiff != null){
-					backbottomFlag = true;
-				}
-			}
-			if(index == len){ //到底了
-				index = 0;
-				$(".searchSlideText").scrollTop(0);
-			}
-			selected = true;
-			scIndex = index;
-		}
-
-		$(".searchSlideText li").css("background", "");
-		$(".searchSlideText").find("li:eq("+index+")").css("background", "#f4f4f7");
-	})
-	</script>
-
-	<script>
-		var mainList = {{.T.list}};
-		var totalPage = {{.T.totalPage}};
-		var submitflag = true;
-		var pricetype = "";
-		var areas = {{.T.area}};
-		var searchvalue = {{.T.searchvalue}};
-		var currentPage = 1;//当前页
-		var pageSize = 50;
-		var tabularflag = "Y";
-		var dataId="";
-		$(function(){
-			new TableHeadFixed("tabContainer-2",searchvalue=="",false);
-			haslogin({{.T.logid}});
-			if(mainList != "" && mainList != null){
-				getSearchTable(mainList);
-			}
-			$(".j-nav .j-nav-link:eq(2)").addClass("active");
-			$(window).scroll(function(){
-				if($(this).scrollTop() > 0){
-				$("#backTop").show();
-				}else{
-					$("#backTop").hide();
-				}
-			});
-
-			//判断用户是否搜索中标企业,调整二维码样式
-			if(searchvalue != "" && searchvalue.length > 0){
-				$("#t-clear").show();
-				$(".wx-inner-title").html("扫码关注企业");
-				$(".wx-inner-bottom").html('扫码即可实时接收<span style="color:#2cb7ca">'+'"'+searchvalue+'"'+'</span>的中标信息!');
-			}
-
-			//地区回显样式设置
-			if(areas != ""){
-				$("#regionBtn").removeClass("active");
-				areas = areas.split(",");
-				for(var i=0;i<areas.length;i++){
-					$(".region-content>font:not('.parent-node')").each(function(){
-						if($(this).text() == areas[i]){
-							$(this).addClass("active");
-							return false;
-						}
-					});
-				}
-			}
-			//地区回显样式设置
-			$(".region-content .parent-node").each(function(){
-				var fontLen = $(this).nextUntil(".parent-node").filter("font").length;
-				var activeLen = $(this).nextUntil(".parent-node").filter(".active").length;
-				if(fontLen == activeLen){
-					$(this).addClass("active");
-				}
-				if(activeLen >0 && activeLen < fontLen){
-					$(this).addClass("secondActice");
-				}
-			});
-
-			//点击搜索 数据回显页面样式设置
-			if(mainList != "" && mainList != null && searchvalue != "" && searchvalue != null){
-				$(".seaTender-inner").css({'border':'0'});
-				$(".lucene-table").css({'padding':'0px','border-bottom':'0px','display':'block'});
-				$(".tabTitle").addClass("hidden");
-				$("#searchInner .searchControl .seaTender-inner .tabContainer .lucene-table table thead tr").css('border-top','4px solid #2cb7ca');
-				$(".lucene").attr("style","display:none");
-				$(".tabContainer").show(); //表格信息
-				$(".pagination").show();   //上、下页
-				$(".hasNoData").hide();    //数据为空图片
-			}
-			if(mainList == null || mainList.length == 0){
-				$(".tabTitle").addClass("hidden");
-				$(".tabContainer").hide();
-				$(".pagination").hide();
-				$(".hasNoData").show();
-			}
-
-
-			//价格回显样式设置
-			if({{.T.pricetype}} == "y"){
-				$(".Price-content").find("span:first-child").removeClass("active");
-				$(".pricefat").addClass("active");
-				$("#minprice").css({"border-color":"#2cb7ca"});
-				$("#maxprice").css({"border-color":"#2cb7ca"});
-			}
-
-			//筛选关闭和打开
-			//根据cookie值设置筛选是否显示
-			var rsw = localStorage.getItem("entstore");
-			if(rsw=="U"){
-				$("#screenBtn").addClass("down");
-				$(".searchTender").show();
-			}else{
-				$("#screenBtn").removeClass("down");
-				$(".searchTender").hide();
-			}
-
-			//记录用户刷选按钮状态
-			$("#screenBtn").click(function(){
-				if($(this).attr("class").indexOf("down")>0){
-					localStorage.setItem("entstore", "U");
-				}else{
-					localStorage.setItem("entstore", "D");
-				}
-			})
-
-			//价格
-			$("#minprice").click(function(){
-				$(".pricebut").show();
-				$(".pricefat").addClass("customtime-active");
-			})
-			$("#maxprice").click(function(){
-				$(".pricebut").show();
-				$(".pricefat").addClass("customtime-active");
-			})
-			//价格的全部按钮
-			$(".Price-content").find("span:first-child").click(function(){
-				priceshow=false;
-				$("#minprice").css({"border-color":""});
-				$("#maxprice").css({"border-color":""});
-				$(".pricebut").hide();
-				$(".pricefat").removeClass("customtime-active");
-				$(this).addClass("active");
-				$(".pricefat").removeClass("active");
-				pricetype = "n"
-				$("#zbSeatchT input[name='pricetype']").val(pricetype);
-				beforeSubmit();
-			})
-			//价格的确定按钮
-			$(".pricebut").click(function(){
-				var min = $("#minprice").val();
-				var max = $("#maxprice").val();
-				priceCss();
-				beforeSubmit();
-			})
-
-			//设置输入价格的格式
-			var reg = /^[\u4e00-\u9fa5]+$/;
-			var minnum = {{.T.minprice}};
-			$("#minprice").on("input propertychange",function(){
-				var minp = $.trim($(this).val()).replace(/\s/g,"");
-				$(this).val(minp)
-				if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
-					$("#minprice").blur();
-					if((reg.test(minp)||isNaN(minp)||minp.indexOf("e")>0)&&minp.indexOf(".")<0){
-						$(this).val(minnum)
-					}else{
-						//minp = minp.substr(0,minp.length-1);
-						if(reg.test(minp)||isNaN(minp)||minp.indexOf("e")>0){
-							$(this).val(minnum)
-						}else{
-							if(minp.indexOf(".")>0){
-								var offront = minp.split(".")[0];
-								var ofafter = minp.split(".")[1];
-								if(offront.length>9||ofafter.length>2){
-									//if(offront.length>9){
-										$(this).val(minnum)
-									//}else{
-									//	$(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2))
-									//	minnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
-									//}
-								}else{
-									$(this).val(minp)
-									minnum = minp;
-								}
-							}else{
-								if(minp.length>9){
-									$(this).val(minnum)
-								}else{
-									$(this).val(minp)
-									minnum = minp;
-								}
-							}
-
-						}
-					}
-				}else{
-					minnum = minp;
-				}
-
-			})
-
-			//
-			var maxnum = {{.T.maxprice}};
-			$("#maxprice").on("input propertychange",function(){
-				var maxp = $.trim($(this).val()).replace(/\s/g,"");
-				$(this).val(maxp)
-				if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(maxp)){
-					$("#maxprice").blur();
-					if((reg.test(maxp)||isNaN(maxp)||maxp.indexOf("e")>0)&&maxp.indexOf(".")<0){
-						$(this).val(maxnum)
-					}else{
-						//maxp = maxp.substr(0,maxp.length-1);
-						if(reg.test(maxp)||isNaN(maxp)||maxp.indexOf("e")>0){
-							$(this).val(maxnum)
-						}else{
-							if(maxp.indexOf(".")>0){
-								var offront = maxp.split(".")[0];
-								var ofafter = maxp.split(".")[1];
-								if(offront.length>9||ofafter.length>2){
-									//if(offront.length>9){
-										$(this).val(maxnum);
-									//}else{
-									//	$(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2))
-									//	maxnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
-									//}
-								}else{
-									$(this).val(maxp)
-									maxnum = maxp;
-								}
-							}else{
-								if(maxp.length>9){
-									$(this).val(maxnum)
-								}else{
-									$(this).val(maxp)
-									maxnum = maxp;
-								}
-
-							}
-
-						}
-					}
-				}else{
-					maxnum = maxp;
-				}
-			})
-
-			//搜索按钮
-			$(".searchBtn").click(function(r){
-				preSearchJd(r);
-
-			})
-
-			//招标搜索页面跳转
-			$(".bidbtn").click(function(){
-				window.location.href = "/jylab/supsearch/index.html";
-			})
-
-			//
-			$(".bidbut").click(function(){
-				window.location.href = "/jylab/supsearch/index.html";
-			})
-			//点击搜索框上方显示超级搜索
-			$(".supbtn").click(function(){
-					window.location.href = "/jylab/supsearch/index.html";
-			})
-
-			//下一页
-			$(".nbnext").click(function(){
-            	$(window).scrollTop(0);
-          		next();
-        	})
-			//上一页
-       		$(".nbprev").click(function(){
-           		$(window).scrollTop(0);
-           		prev();
-        	})
-        });
-
-		$(function(){
-			$(document).keydown(function(e){
-			    if(e.keyCode == "13"){
-					if($("#bidLogin").is(":visible")){
-						return;
-					}
-					if(selected){
-						var selecteSearch  = $(".searchSlideText").find("li").eq(scIndex).text();
-						$(".searchname").val(selecteSearch);
-					}
-					preSearchJd(e);
-
-				};
-			});
-		})
-
-		function preSearchJd(r){
-			var searchname = $("#zbSeatchT input[name='keywords']").val();
-			$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
-			$("#zbSeatchT").submit();
-		}
-
-		function priceCss(){
-			priceshow=false;
-			var minp = $("#minprice").val();
-			var maxp = $("#maxprice").val();
-			if(minp!=""&&isNaN(minp)){
-				$("#minprice").val("")
-			}
-			if(maxp!=""&&isNaN(maxp)){
-				$("#maxprice").val("")
-			}
-			if ($("#minprice").val()==""&&$("#maxprice").val()==""){
-				$(".pricefat").removeClass("active");
-				$(".Price-content").find("span:first-child").addClass("active");
-				$("#minprice").css({"border-color":""})
-				$("#maxprice").css({"border-color":""})
-				$(".pricefat").removeClass("customtime-active");
-				$(".pricebut").hide();
-				pricetype = "n";
-				$("#zbSeatchT input[name='pricetype']").val(pricetype);
-				return false;
-			}
-			if (parseInt(minp)>parseInt(maxp)){
-				$("#minprice").val(maxp);
-				$("#maxprice").val(minp);
-			}
-			$(".pricebut").hide();
-			$(".pricefat").addClass("active");
-			$(".Price-content").find("span:first-child").removeClass("active");
-			$(".pricefat").removeClass("customtime-active");
-			pricetype = "y";
-			$("#zbSeatchT input[name='pricetype']").val(pricetype);
-			return true;
-		}
-
-		//取redis里的数据
-		function getNewBids(pnum){
-			$.post("/jylab/supsearch/getNewBids",{pageNumber:pnum},function(r){
-				if(r.list == null || r.list.length == 0){
-					$(".seaTender-inner").css({'border':''});
-	                $(".tabContainer").hide();
-	                $(".pagination").hide();
-	                $(".hasNoData").show();
-	            }else{
-	                $(".tabContainer").show();
-	                $(".pagination").show();
-	                $(".hasNoData").hide();
-	                getSearchTable(r.list);
-	            }
-			})
-		}
-		//---取VIP数据---
-		function getVIPData(){
-			if(!$(".tabTitle").hasClass("hidden")){
-				return true;
-			}
-			if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='searchvalue']").val()==""){
-				$(".working").hide();
-				return true;
-			}
-			var tabflag = false;
-			if(currentPage==1){
-				$(".nbprev").addClass("disabled");
-			}
-			var param = {
-						currentPage: currentPage,
-			            searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
-			            area: $("#zbSeatchT [name='area']").val(),
-			            minprice: $("#zbSeatchT [name='minprice']").val(),
-			            maxprice: $("#zbSeatchT [name='maxprice']").val(),
-			            pricetype: $("#zbSeatchT [name='pricetype']").val(),
-						tabularflag : tabularflag,
-					};
-			$.ajax({
-		       type:'post',
-		       url:'/jylab/pcSearchZbqyAjax',
-		       async:false,
-			   data:param,
-		       dataType:'json',
-		       success:function(r){
-					if(currentPage == 1){
-						totalPage = r.totalPage;
-					}
-					if(r.list == null || r.list.length == 0){
-						$(".seaTender-inner").css({'border':''});
-		                $(".tabContainer").hide();
-		                $(".pagination").hide();
-		                $(".hasNoData").show();
-		            }else{
-		                $(".tabContainer").show();
-		                $(".pagination").show();
-		                $(".hasNoData").hide();
-		                getSearchTable(r.list);
-		            }
-					tabflag = true;
-				}
-			})
-			return tabflag
-		}
-		//
-		function beforeSubmit(){
-			$(".seaTender-inner").css({'border':''});
-			$(".hasNoData").hide();
-			$(".tabContainer").hide();
-			$(".pagination").hide();
-			$(".working").show();
-			$(".tabContainer-2 .lucene ul").html("");
-			$(".tabContainer-2 .lucene-table table tbody").html("");
-			$("#right-list").addClass("active").siblings().removeClass("active");
-			$(".tabContainer .lucene").show().siblings().hide();
-			if(submitflag){
-				//地区
-				var selectAreas = "";
-				$(".region-content .active:not(.parent-node)").each(function(){
-					var thisText = $(this).text();
-					if(thisText != "全国"){
-						if(selectAreas != ""){
-							selectAreas += ",";
-						}
-						selectAreas += thisText;
-					}
-				});
-				$("#zbSeatchT [name='area']").val(selectAreas);
-
-				//价格
-				var selectMinPrices = $(".PriceInput [name='minprice']").val();
-				var selectMaxPrices =  $(".PriceInput [name='maxprice']").val();
-				$("#zbSeatchT [name='minprice']").val(selectMinPrices);
-				$("#zbSeatchT [name='maxprice']").val(selectMaxPrices);
-
-				//搜索关键词
-        var searchname = "";
-				searchname = searchvalue;
-				$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
-
-
-				currentPage=1;
-				if(currentPage==1){
-					$(".nbprev").addClass("disabled");
-				}
-				if($("#zbSeatchT [name='searchvalue']").val()==""){
-					getNewBids(currentPage)
-				}else{
-					if($.trim(searchname) != ""){
-						getTableInfo();
-					}else{
-						$(".tabTitle").removeClass("hidden");
-						//$(".lucene").attr("style","display:block");
-						//$(".lucene-table").attr("style","display:none");
-						$(".wx-inner-title").html("扫码关注剑鱼标讯");
-						$(".wx-inner-bottom").html("微信扫一扫<br>随时随地掌握招标信息");
-            currentPage = 1;
-            $(".currentPage").text(currentPage);
-            $(".nbprev").addClass("disabled");
-						searchOnsubmit();
-					}
-				}
-				submitflag=false;
-			}
-			setTimeout(function(){
-				submitflag=true
-			},200);
-			return true
-		}
-
-    function getTableInfo(){
-        //$(".seaTender-inner").css({'border':'0'});
-        $(".lucene-table").css({'padding':'0px','border-bottom':'0px','display':'block'});
-        $(".tabTitle").addClass("hidden");
-        $(".lucene").attr("style","display:none");
-		//判断用户是否搜索中标企业,调整二维码样式
-		$(".wx-inner-title").html("扫码关注企业");
-		$(".wx-inner-bottom").html('扫码即可实时接收<span style="color:#2cb7ca">'+'"'+searchvalue+'"'+'</span>的中标信息!');
-        currentPage = 1;
-        $(".currentPage").text(currentPage);
-        $(".nbprev").addClass("disabled");
-		searchOnsubmit();
-    }
-
-	function reStyle(){
-		$("#bidLogin .code-text").html('<span class="reStyle_c"><img id="wxpng" style="width:24px;margin-right:5px;" src="{{Msg "seo" "cdn"}}/images/wx1.png"/>请先微信扫码登录</span>')
-		$(".reStyle_c").css({
-			'color':'#252627',
-			'font':'22px microsoft yahei',
-			'display': 'inline-block',
-			'margin-top':'10px'
-		})
-	}
-
-    //页面跳转相关
-    function next(){
-        if($(".nbnext").hasClass("disabled")){
-            return false;
-        }
-		$(".tabContainer").hide();
-		$(".hasNoData").hide();
-		$(".pagination").hide();
-		$(".working").show();
-        if(currentPage<10){
-            currentPage++;
-		}
-        //currentPage = parseInt($(".pagination-inner").find("span").text())+parseInt(1)
-        if(currentPage==10){
-            $(".nbnext").addClass("disabled");
-        }else if(currentPage==2){
-            $(".nbprev").removeClass("disabled");
-        }
-        $(".currentPage").text(currentPage);
-		if(!$(".tabTitle").hasClass("hidden") || $("#zbSeatchT [name='searchvalue']").val()==""){
-			getNewBids(currentPage)
-		}else{
-			if($("#right-table").hasClass("active")){
-				getVIPData();
-			}else{
-	        	searchOnsubmit();
-			}
-		}
-    }
-
-    function prev(){
-        if($(".nbprev").hasClass("disabled")){
-            return false;
-        }
-		$(".tabContainer").hide();
-		$(".hasNoData").hide();
-		$(".pagination").hide();
-		$(".working").show();
-        if(currentPage>1){
-            currentPage--;
-		}
-        //currentPage = parseInt($(".pagination-inner").find("span").text())-parseInt(1)
-        if(currentPage==1){
-            $(".nbprev").addClass("disabled");
-        }else if(currentPage<10){
-            $(".nbnext").removeClass("disabled");
-        }
-        $(".currentPage").text(currentPage);
-		if(!$(".tabTitle").hasClass("hidden") || $("#zbSeatchT [name='searchvalue']").val()==""){
-			getNewBids(currentPage)
-		}else{
-			if($("#right-table").hasClass("active")){
-				getVIPData();
-			}else{
-				searchOnsubmit();
-			}
-		}
-    }
-
-    function searchOnsubmit(){
-        var param = {
-            searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
-            area: $("#zbSeatchT [name='area']").val(),
-            minprice: $("#zbSeatchT [name='minprice']").val(),
-            maxprice: $("#zbSeatchT [name='maxprice']").val(),
-            pricetype: $("#zbSeatchT [name='pricetype']").val(),
-            currentPage: currentPage
-        };
-        $.post("/jylab/pcSearchZbqyAjax",param,function(r){
-			if(currentPage == 1){
-				totalPage = r.totalPage;
-			}
-            if(r.list == null || r.list.length == 0){
-				$(".seaTender-inner").css({'border':''});
-                $(".tabContainer").hide();
-                $(".pagination").hide();
-                $(".working").hide();
-                $(".hasNoData").show();
-            }else{
-                //$(".pagination").show();
-                $(".hasNoData").hide();
-				setTimeout(function(){
-					getSearchTable(r.list);
-				},3000)
-
-            }
-        });
-    }
-
-    function getSearchTable(datas) {
-		$(".tabContainer-2 .entlist").removeClass("tabfixed");
-		$(".tabContainer-2 .entlist").removeClass("tababsolute");
-		$(".tabContainer-2 .entlist").children("table").eq(0).css("top","");
-		$(".working").hide();
-		$(".hasNoData").hide();
-		$(".pagination").show();
-		$(".tabContainer").show();
-		if(searchvalue==""){
-			if(currentPage == 10 || datas.length < pageSize){
-				$(".nbnext").addClass("disabled");
-			}else{
-				$(".nbnext").removeClass("disabled");
-			}
-		}else{
-			if(currentPage == totalPage){
-				$(".nbnext").addClass("disabled");
-			}else{
-				$(".nbnext").removeClass("disabled");
-			}
-		}
-        var listItem = "";
-        var formItem = "";
-		var tableHtml = "";
-		$(".currentPage").text(currentPage);
-		listItem += '<ul>';
-		for(var i=0; i<datas.length; i++){
-			var index = (currentPage - 1) * pageSize + i + 1;
-			if(searchvalue==""){
-				listItem +='<li>'
-							+'<div class="liLuceneList">'
-							+'<div class="luce-left">'
-							+'<div class="left-title">'
-							+'<em>'+index+'.</em>'
-							+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" target="_blank">'+datas[i].title+'</a>'
-							+'</div>'
-							+'</div>'
-							+'<div class="luce-right">'
-				if(typeof(datas[i].area) != "undefined" &&datas[i].area != "" && datas[i].area != null&&datas[i].area != "A" ){
-					listItem +='<a href="/list/area/'+datas[i].areaadd+'.html">'+datas[i].area+'</a>'
-				}else{
-					listItem +='<a href="javascript:volid(0);" style="display:none;"></a>'
-				}
-				//
-				var stype = datas[i].subtype
-				if(stype==""){
-					stype==datas[i].toptype
-				}
-				if(stype==""){
-					if(datas[i].bidtype == "bid"){
-						stype = "中标";
-						datas[i].stypeadd="ZHB"
-					}else if(datas[i].bidtype == "tender"){
-						datas[i].stypeadd="ZB"
-						stype = "招标";
-					}else{
-						stype = "";
-					}
-				}
-				if(typeof(stype) != "undefined" &&stype != "" && stype != null){
-					listItem +='<a href="/list/stype/'+datas[i].stypeadd+'.html">'+stype+'</a>'
-				}else{
-					listItem +='<a href="javascript:volid(0);" style="display:none;"></a>'
-				}
-				//
-				if(typeof(datas[i].industry) != "undefined" && datas[i].industry != null && datas[i].industry != ""){
-					listItem += '<a href="/list/industry/'+datas[i].indadd+'.html">'+datas[i].industry+'</a>';
-				}else{
-					listItem += '<a href="javascript:volid(0);" style="display:none;"></a>';
-				}
-        //
-        var amount= getacount(datas[i].bidamount,datas[i].budget)
-  			if(amount!=""){
-  				listItem += '<a>'+conversionMoeny(amount)+'</a>';
-  			}else{
-  				listItem += '<a href="javascript:volid(0);" style="display:none;"></a>';
-  			}
-				//
-				if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
-					var diff = timeDiff(new Date(Number(datas[i].publishtime+"000")));
-					if(diff != null){
-						listItem += '<span class="com-time">'+diff+'</span>';
-					}
-				}
-				listItem+='</div></div></li>'
-        if (i >= 20||currentPage!=1){
-    			continue
-    		}
-				tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank">'
-						+'<td width="48"><div>'+index+'</div></td>'
-
-				if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
-					tableHtml += '<td class="tt-l" width="315"><div>'+datas[i].projectname+'</div></td>';
-				}else{
-					tableHtml += '<td class="tt-l" width="315"><div>'+datas[i].title+'</div></td>';
-				}
-
-				if(typeof(stype) != "undefined" && stype != null && stype != ""){
-					tableHtml += '<td width="84"><div>'+stype+'公告</div></td>';
-				}else{
-					tableHtml += '<td width="84"><div></div></td>';
-				}
-
-				if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
-					var budget =parseInt(datas[i].budget)/10000
-					if(budget.toString().length>6){
-						if(budget.toString().indexOf(".")==5){
-							budget=budget.toString().substr(0,7)
-						}else{
-							budget=budget.toString().substr(0,6)
-						}
-					}
-					tableHtml += '<td class="tt-r" width="73"><div>'+budget+'</div></td>';
-				}else{
-					tableHtml += '<td class="tt-r" width="73"><div></div></td>';
-				}
-				if(typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
-					tableHtml += '<td class="tt-l" width="181"><div>'+datas[i].buyer+'</div></td>';
-				}else{
-					tableHtml += '<td class="tt-l" width="181"><div></div></td>';
-				}
-				if(typeof(datas[i].bidopentime) != "undefined" && datas[i].bidopentime != null && datas[i].bidopentime != ""){
-					var diff = formatDate(Number(datas[i].bidopentime),"l");
-					tableHtml += '<td width="103"><div>'+diff+'</div></td>';
-				}else{
-					tableHtml += '<td width="103"><div></div></td>';
-				}
-				if(typeof(datas[i].winner) != "undefined" && datas[i].winner != null && datas[i].winner != ""){
-					tableHtml += '<td class="tt-l" width="174"><div>'+datas[i].winner+'</div></td>';
-				}else{
-					tableHtml += '<td class="tt-l" width="174"><div></div></td>';
-				}
-				if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
-					var bidamount = parseInt(datas[i].bidamount)/10000;
-					if(bidamount.toString().length>6){
-						if(bidamount.toString().indexOf(".")==5){
-							bidamount=bidamount.toString().substr(0,7);
-						}else{
-							bidamount=bidamount.toString().substr(0,6);
-						}
-					}
-					tableHtml += '<td class="tt-r" width="76"><div>'+bidamount+'</div></td>';
-				}else{
-					tableHtml += '<td class="tt-r" width="76"><div></div></td>';
-				}
-
-				if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
-					var diff = formatDate(Number(datas[i].publishtime),"s");
-					if(diff != null){
-						tableHtml += '<td width="103"><div>'+diff+'</div></td>';
-					}
-				}else{
-					tableHtml += '<td width="103"><div></div></td>';
-				}
-					tableHtml+='</tr>'
-			}else{
-				 formItem += '<tr onclick="noIn(this)" dataid="'+datas[i].linkid+'">'+
-							'<td width="45">'+index+'</td>'
-				//
-				var bidtime = datas[i].jgtime||datas[i].zbtime;
-				var diff = bidtime&&formatDate(Number(bidtime),"s");
-				if(diff){
-					formItem += '<td width="150">'+diff+'</td>';
-				}else{
-					formItem += '<td width="150"></td>';
-				}
-				formItem +='<td class="tt-l" width="854">'+datas[i].projectname+'</td>'
-				//
-				if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
-					var bidamount = parseInt(datas[i].bidamount)/10000;
-					formItem += '<td class="tt-r" width="150">'+bidamount+'</td>';
-				}else{
-					formItem += '<td width="150"></td>';
-				}
-				formItem +='</tr>'
-			}
-		}
-		listItem += '</ul>';
-		$(".lucene").html(listItem);
-		if(searchvalue==""){
-			$(".lucene-table").removeClass("entlist");
-      if(currentPage==1){
-  			$(".formTable").html(tableHtml);
-      }
-      $(".shade_table").show();
-      $(".lucene-table").css({"margin-bottom":"60px"});
-		}else{
-			$(".lucene-table").addClass("entlist");
-			$(".formTable").html(formItem);
-      $(".shade_table").hide();
-      //$(".tabContainer").css({"margin-bottom":"30px"});
-		}
-    }
-
-    //关闭超级搜索遮罩层
-    function labClose(){
-        $("#labModal").modal("hide");
-    }
-
-	//关闭实验室功能弹框提示
-	function labWelClose(){
-		$("#welcome").modal("hide");
-	}
-	//
-	function formatDate(date,sl)   {
-		var myDate = new Date(date*1000);
-	    var   year=myDate.getFullYear();
-	    var   month=myDate.getMonth()+1;
-	    var   date=myDate.getDate();
-		var hour = myDate.getHours()
-		var min = myDate.getMinutes()
-		if(sl=="l"){
-			if(hour<10){
-				hour="0"+hour
-			}
-			if(min<10){
-				min="0"+min
-			}
-			return   year+"-"+month+"-"+date+"<br>"+hour+":"+min;
-		}else{
-			return   year+"-"+month+"-"+date;
-		}
-	}
-	//未登录
-	function noIn(p){
-		var thisId = $(p).attr("dataId");
-		var dataindustry = $(p).attr("dataindustry");
-		dataId = thisId;
-		if(loginflag){
-			var aHref = "";
-			if(searchvalue != ""){
-				if(dataindustry!=""&&dataindustry!=undefined){
-					aHref += '.html?kds='+searchvalue+'&industry='+dataindustry;
-				}else{
-					aHref += '.html?kds='+searchvalue;
-				}
-			}else{
-				if(dataindustry!=""&&dataindustry!=undefined){
-					aHref += '.html?industry='+dataindustry;
-				}else{
-					aHref += '.html';
-				}
-			}
-			window.open("/article/content/"+thisId+aHref);
-		}else{
-			$('#bidLogin').modal("show");
-		}
-	}
-
-	//关闭遮罩层
-	function layerClose(){
-		$("#myModal").modal("hide");
-	}
-
-  function getacount(bidamount,budget){
-  	if(typeof(bidamount) != "undefined" && bidamount != null && bidamount != ""){
-  		return bidamount
-  	}
-  	if(typeof(budget) != "undefined" && budget != null && budget != ""){
-  		return budget
-  	}
-  	return ""
-  }
-
-  //金额转化   金额:0-万元以下单位为元  ,万元以上至亿元以下单位为万元 ,亿元以上单位为亿元。保留 小数点后 2 位,不进行四舍五入。
-  function conversionMoeny(money){
-  	var m = ""+money;
-  	var m_arr = m.split(".")
-  	var m_1 = m_arr[0]
-  	var len_m1 = m_1.length;
-  	if (len_m1 >= 9 ){
-  		m = m_1.substring(0,len_m1-8) + "." + m_1.substring(len_m1-8,len_m1-6) + "亿元"
-  	} else if (len_m1 >= 5) {
-  		m =m_1.substring(0,len_m1-4) + "." + m_1.substring(len_m1-4,len_m1-2) + "万元"
-  	} else {
-  		if(m_arr.length == 1) {
-  			return m + ".00元"
-  		}
-  		var m_2 = m_arr[1]
-  		if (m_2.length > 1) {
-  			m_2 = m_2.substring(0,2)
-  		} else {
-  			m_2 = m_2.substring(0,1) + "0"
-  		}
-  		m = m_1 + "." + m_2 + "元"
-  	}
-  	return m
-  }
-
-</script>
-
-</body>
-
-</html>
-
+
+<html lang="zh-cn">
+	<head>
+		<title>招标搜索结果_{{Msg "seo" "qfw.swordfishsl.title"}}</title>
+		<meta name="Keywords" content="{{Msg "seo" "qfw.swordfishsl.key"}}"/>
+		<meta name="Description" content="{{Msg "seo" "qfw.swordfishsl.description"}}"/>
+		<meta name="renderer" content="webkit">
+		<meta content="telephone=no" name="format-detection"/>
+        <meta content="招标搜索" theme="light" name="enable-header"/>
+		{{include "/common/pnc.html"}}
+		<link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+		<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+		<link href="{{Msg "seo" "cdn"}}/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+		<link href="{{Msg "seo" "cdn"}}/css/dev2/superSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+		<script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
+		<script src="{{Msg "seo" "cdn"}}/js/biddingSearch.js?v={{Msg "seo" "version"}}"></script>
+		<script language="javascript" type="text/javascript" src="{{Msg "seo" "cdn"}}/My97DatePicker/WdatePicker.js"></script>
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
+		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
+
+		<style type="text/css">
+			#searchInner .pagination a:hover{
+				color:#97310e !important;
+			}
+			#searchInner .pagination a.disabled{
+				color: #aea79f !important;
+				background-color: #fff ;
+				border-color: #ddd;
+				cursor: not-allowed;
+			}
+			#searchInner .pagination a:visited{
+				color:#1d1d1d;
+			}
+
+			/*j-wx-code Start*/
+			.j-wx-code{
+				width: 335px;
+				height: 355px;
+				background-color: #fff;
+				-webkit-border-radius: 6px;
+				   -moz-border-radius: 6px;
+				        border-radius: 6px;
+				position: relative;
+				/*margin: 100px auto;*/
+			}
+			.j-wx-code>.code-close{
+				width: 40px;
+				height: 40px;
+				position: absolute;
+				right: -20px;
+				top: -20px;
+				cursor: pointer;
+				-webkit-transition: all 1s;
+				-o-transition: all 1s;
+				-moz-transition: all 1s;
+				transition: all 1s;
+			}
+			.j-wx-code>.code-close:hover{
+				-webkit-transform: scale(1.2);
+				   -moz-transform: scale(1.2);
+				    -ms-transform: scale(1.2);
+				     -o-transform: scale(1.2);
+				        transform: scale(1.2);
+			}
+			.j-wx-code>.code-title{
+				height: 82px;
+				background:url(/images/j-wx-code-title.png) center center no-repeat;
+				-webkit-animation: moveYun 15s infinite linear both;
+				   -moz-animation: moveYun 15s infinite linear both;
+				     -o-animation: moveYun 15s infinite linear both;
+				        animation: moveYun 15s infinite linear both;
+			}
+			.j-wx-code>.code-wxm{
+				text-align: center;
+				margin-bottom: -6px;
+				margin-top: -16px;
+
+			}
+			.j-wx-code>.code-wxm>img{
+				width: 200px;
+				height: 200px;
+				margin-top: -5px;
+			}
+			.j-wx-code>.code-text{
+				font: 16px "microsoft yahei";
+				text-align: center;
+				color: #252627;
+			}
+			.j-wx-code>.code-bottom{
+				width: 470px;
+				height: 211px;
+				position: absolute;
+				bottom: -113px;
+				left: -73px;
+				background: url(/images/j-wx-code-bottom.png) 0 0 no-repeat;
+			}
+			.j-wx-code>.code-bottom>img{
+				position: absolute;
+				left: 280px;
+				top: 88px;
+				-webkit-animation: codeWxMove 10s linear both;
+				   -moz-animation: codeWxMove 10s linear both;
+				     -o-animation: codeWxMove 10s linear both;
+				        animation: codeWxMove 10s linear both;
+				-webkit-animation-fill-mode:forwards;
+				   -moz-animation-fill-mode:forwards;
+				     -o-animation-fill-mode:forwards;
+				        animation-fill-mode:forwards;
+			}
+			#keyImg{
+				width:198px;
+			}
+			/*
+			#layerImg{
+				position:absolute;
+				width: 150px !important;
+			    height: 150px !important;
+			    left: 198px;
+			    top: 148px;
+			}*/
+			#labmodalbody .code-close{
+				width: 40px;
+			    height: 40px;
+			    position: absolute;
+			    right: 40px;
+			    top: -20px;
+			    cursor: pointer;
+			    -webkit-transition: all 1s;
+			    -o-transition: all 1s;
+			    -moz-transition: all 1s;
+			    transition: all 1s;
+			}
+			#labmodalbody .code-close:hover{
+				-webkit-transform: scale(1.2);
+				   -moz-transform: scale(1.2);
+				    -ms-transform: scale(1.2);
+				     -o-transform: scale(1.2);
+				        transform: scale(1.2);
+			}
+			.layheader{
+				position: absolute;
+			    color: #fff;
+			    left: 138px;
+			    top: 40px;
+			    line-height: 32px;
+			    font-family: 微软雅黑;
+			    font-weight: bold;
+			}
+
+			.layheader div:nth-child(1){
+				font-size:20px;
+				width:272px;
+			}
+			.layheader div:nth-child(2){
+				font-size:16px;
+				margin-top:10px;
+				width:272px;
+			}
+			.modal-footer{
+				text-align: center;
+			    position: absolute;
+			    bottom: 65px;
+			    left: 110px;
+			    font-size: 14px;
+			    line-height: 22px;
+			    color: #686868;
+			}
+			.modal-dialog{
+				width:500px;
+			}
+			/*add*/
+			.searchSlideText ul li{
+				float: none;
+			}
+			/*功能提示*/
+			#labwelcomebody .welcomeImg{
+				width: 335px;
+    			height: 402px;
+			}
+			#labwelcomebody .code-close{
+				width: 40px;
+			    height: 40px;
+			    position: absolute;
+			    right: 63px;
+			    top: -20px;
+			    cursor: pointer;
+				-webkit-transition: all 1s;
+   				-o-transition: all 1s;
+   				-moz-transition: all 1s;
+    			transition: all 1s;
+			}
+			.modal-footer-welcome{
+				width:273px;
+				margin:auto;
+			    font-size: 16px;
+			    line-height: 26px;
+				margin-top: -133px;
+			}
+
+			#labwelcomebody .code-close:hover{
+				 -webkit-transform: scale(1.2);
+	   				-moz-transform: scale(1.2);
+	   				 -ms-transform: scale(1.2);
+	     			  -o-transform: scale(1.2);
+	        			 transform: scale(1.2);
+			}
+			/*价格*/
+			.minwy{
+				position: absolute;
+			    left: 124px;
+			    top: 7.5px;
+			    color: #ccc;
+			}
+			.maxwy{
+				position: absolute;
+			    right: 8px;
+			    top: 7.5px;
+			    color: #ccc;
+			}
+			.PriceInput{
+				position:relative;
+			}
+			.j-clearicon {
+			    right: 118px !important;
+			}
+			.lucene-table tr{
+				cursor: pointer;
+			}
+			#labImg {
+			    position: absolute;
+			    width: 150px !important;
+			    height: 150px !important;
+			    left: 198px;
+			    top: 148px;
+			}
+			#searchInner .searchControl .seaTender-inner .tabContainer .lucene-table.entlist table{
+				width: 1200px;
+			}
+			.working{
+				border: 1px solid #e0e0e0 !important;
+			}
+		</style>
+	</head>
+    <!-- 中标企业搜索页面 -->
+	<body>
+	{{include "/common/pchead.html"}}
+		<div class="modal fade" id="labModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		    <div class="modal-dialog">
+		        <div class="modal-content" id="labmodalcont">
+		            <div class="modal-body" id="labmodalbody">
+					<img class="code-close" src="{{Msg "seo" "cdn"}}/images/j-wx-code-close.png" alt="" onclick="labClose();">
+						<div class="layheader">
+							<div>超级搜索</div>
+							<div>按行业、金额搜索,结果可按表格显示</div>
+						</div>
+						<img src="{{Msg "seo" "cdn"}}/images/biddingSearch/labbkimg.png"/>
+						<img id="labImg" src=""/>
+					</div>
+		            <div class="modal-footer">
+		                此功能尚处在实验阶段,请扫码进入<br>剑鱼标讯实验室,打开相应开关后,即可体验!
+		            </div>
+		        </div><!-- /.modal-content -->
+		    </div><!-- /.modal -->
+		</div>
+		<div class="modal fade" id="myModal"  tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" >
+			<div class="modal-dialog" style="width:400px;border:0px;" >
+				<div class="j-wx-code" id="myModal-div">
+					<img class="code-close" src="{{Msg "seo" "cdn"}}/images/j-wx-code-close.png" alt="" onclick="layerClose();"/>
+					<div class="code-title"></div>
+					<div class="code-wxm"><img id="layerImg" src="/front/share/{{.T.shareid}}"/></div>
+					<div class="code-text">
+						<span><img id="wxpng" src="{{Msg "seo" "cdn"}}/images/wx1.png"/>微信扫码登录</span>
+						<br/>
+						<span id="freetext">立即免费使用</span>
+					</div>
+					<div class="code-bottom">
+						<img src="{{Msg "seo" "cdn"}}/images/j-wx-cose-move.png" alt=""/>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="modal fade" id="welcome" tabindex="-1" role="dialog" aria-labelledby="welcome" aria-hidden="false">
+		    <div class="modal-dialog">
+		        <div class="modal-content" id="labmodalcont">
+		            <div class="modal-body" id="labwelcomebody">
+					<img class="code-close" src="{{Msg "seo" "cdn"}}/images/j-wx-code-close.png" alt="" onclick="labWelClose();">
+					<img class="welcomeImg" src="{{Msg "seo" "cdn"}}/images/biddingSearch/welcomeusejylab.png"/>
+		           		<div class="modal-footer-welcome">
+							欢迎体验剑鱼标讯实验室—中标企业搜索功能。实验随时可能结束,或者进行调整,请密切关注剑鱼标讯通知。
+		           		</div>
+					</div>
+		        </div><!-- /.modal-content -->
+		    </div><!-- /.modal -->
+		</div>
+		<section id="searchInner">
+			<!--搜索头部 START-->
+			<div class="searchHeader">
+				<div class="w searchHeader-container">
+					<!--搜索-->
+					<div class="searchInput clearfix">
+						<form action="/jylab/bidsearchforent/index.html" method="post" id="zbSeatchT" class="clearfix">
+							<input class="searchname" autocomplete="off" type="search" name="keywords" id="searchinput" value="{{.T.searchvalue}}" placeholder="中标企业搜索" />
+
+							<input type="submit" class="searchBtn" value="搜索"/>
+							<img src="{{Msg "seo" "cdn"}}/images/pc_20.png" id="t-clear" class="j-clearicon" style="display:none;">
+							<div class="searchSlideText">
+								<ul>
+								</ul>
+							</div>
+							<input type="hidden" name="searchvalue" value="{{.T.searchvalue}}">
+							<input type="hidden" name="area" value="{{.T.area}}">
+							<input type="hidden" name="minprice" value="{{.T.minprice}}">
+							<input type="hidden" name="maxprice" value="{{.T.maxprice}}">
+							<input type="hidden" name="pricetype" value="{{.T.pricetype}}">
+						</form>
+						<!--筛选-->
+						<div id="screenBtn" class="screen down">
+							筛选
+						</div>
+						<!--二维码-->
+						<div class="search-right-wx">
+							<img src="{{Msg "seo" "cdn"}}/images/biddingSearch/sea-right-wx.png" />
+							<div class="search-right-wx-inner">
+								<div class="wx-inner-title">
+									扫码关注剑鱼标讯
+								</div>
+								<div class="wx-inner-ewm">
+									<img  id="keyImg" src="/front/share/{{.T.shareid}}"/>
+								</div>
+								<div class="wx-inner-bottom"  style="font-size:14px">
+									微信扫一扫<br>随时随地掌握招标信息
+		<!--						微信扫一扫,及时获取及时获取<i>"1"</i>相关招标信息-->
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<!--整体页面切换tab-->
+					<div class="control-tabBtn">
+						<span class="bidbutdir" style="left:187px;"></span>
+						<a class="supbtn" left="50" href="javascript:void(0)">
+							<i></i><font>招标搜索</font>
+						</a>
+						<a href="#" class="on" left="187"><i></i>中标企业搜索</a>
+						<a href="{{Msg "seo" "url.portrait_winner"}}"{{if not .T.portraitpower}} class="hidden"{{end}} left="335"><i></i>中标企业画像</a>
+						<a href="{{Msg "seo" "url.portrait_buyer"}}"{{if not .T.portraitpower}} class="hidden"{{end}} left="485"><i></i>采购单位画像</a>
+					</div>
+				</div>
+			</div>
+
+	<!--招标搜索页面 START-->
+	<div class="searchControl">
+		<!--头部功能-->
+		<div class="searchTender w" style="display:none;">
+			<!--价格区间-->
+			<div class="Price clearfix">
+				<div class="leftTitle">
+					价格区间:
+				</div>
+				<div class="Price-content clearfix">
+					<span class="active">全部</span>
+					<div class="pricefat">
+						<div class="PriceInput">
+							<input type="text" name="minprice" id="minprice" value="{{.T.minprice}}" placeholder="" />
+							<font class="minwy">万元</font>
+							<span></span>
+							<font class="maxwy">万元</font>
+							<input type="text" name="maxprice" id="maxprice" value="{{.T.maxprice}}" placeholder="" />
+						</div>
+						<button class="pricebut" style="display:none;">确定</button>
+					</div>
+				</div>
+			</div>
+			<!--项目地区-->
+			<div class="region clearfix" style="border: none;">
+				<div class="leftTitle">
+					项目地区:
+				</div>
+				<div class="region-content">
+					<span id="regionBtn" class=" active">全国</span>
+					<i class="diver">A</i>
+					<font>安徽</font>
+					<font>澳门</font>
+					<i class="diver">B</i>
+					<font>北京</font>
+					<i class="diver">C</i>
+					<font>重庆</font>
+					<i class="diver">F</i>
+					<font>福建</font>
+					<i class="diver">G</i>
+					<font>广东</font>
+					<font>广西</font>
+					<font>贵州</font>
+					<font>甘肃</font>
+					<i class="diver">H</i>
+					<font>河北</font>
+					<font>湖北</font>
+					<font>黑龙江</font>
+					<font>海南</font>
+					<font>河南</font>
+					<font  style="margin-right: 45px;">湖南</font>
+					<i class="diver">J</i>
+					<font>吉林</font>
+					<br>
+					<font>江苏</font>
+					<font>江西</font>
+					<i class="diver">L</i>
+					<font>辽宁</font>
+					<i class="diver">N</i>
+					<font>内蒙古</font>
+					<font>宁夏</font>
+					<i class="diver">Q</i>
+					<font>青海</font>
+					<i class="diver">S</i>
+					<font>山西</font>
+					<font>陕西</font>
+					<font>上海</font>
+					<font>山东</font>
+					<font>四川</font>
+					<i class="diver">T</i>
+					<font>天津</font>
+					<font>台湾</font>
+					<i class="diver">X</i>
+					<font>西藏</font>
+					<font>新疆</font>
+					<font>香港</font>
+					<i class="diver">Y</i>
+					<font>云南</font>
+					<i class="diver">Z</i>
+					<font>浙江</font>
+				</div>
+			</div>
+		</div>
+		<!--招标搜索列表内容-->
+		<div class="seaTender-inner w">
+			<!--招标tab切换-->
+			<div class="tabTitle clearfix">
+				<ul>
+					<li>
+						<a class="active" href="javascript:;" style="width:100px;">最新招标信息</a>
+					</li>
+				</ul>
+				<div class="right-tabBtn">
+					<button id="right-list" class="active">列表</button>
+					<button id="right-table">表格</button>
+				</div>
+			</div>
+			<!--tab切换内容-->
+			<div class="tabContainer tabContainer-2"  id="allnews">
+				<!--全文搜索 列表-->
+				<div class="lucene">
+					<ul id="ul_list">
+
+					</ul>
+				</div>
+				<!--全文搜索 表格 展示中标企业搜索数据-->
+				<div class="lucene-table" style="display: none;">
+					<table>
+						<thead>
+						<tr>
+						{{if .T.searchvalue}}
+							<td width="45">序号</td>
+							<td width="150" style="border-top: 4px solid #2C90CB;">中标日期</td>
+							<td width="854">项目名称</td>
+							<td width="150" style="border-top: 4px solid #2C90CB;">中标金额(万元)</td>
+						{{else}}
+							<td width="48">序号</td>
+							<td width="315" style="border-top: 3px solid #2C90CB;">项目名称</td>
+							<td width="84">公告类型</td>
+							<td width="73" style="border-top: 3px solid #2C90CB;">预算<br>(万元)</td>
+							<td width="181">招标单位</td>
+							<td width="103" style="border-top: 3px solid #2C90CB;">开标时间</td>
+							<td width="174">中标单位</td>
+							<td width="76" style="border-top: 3px solid #2C90CB;">中标金额<br>(万元)</td>
+							<td width="103">发布时间</td>
+						{{end}}
+						</tr>
+						</thead>
+					</table>
+					<table>
+						<tbody class="formTable" id="formTable">
+
+						</tbody>
+					</table>
+          <div class="shade_table" style="">
+            <div class="more" data-need-bind-phone>
+              查看更多&gt;
+            </div>
+          </div>
+				</div>
+			</div>
+			<div class="hasNoData" style="display: none;">
+				<img style="width: 216px;margin: 45px auto;" src="{{Msg "seo" "cdn"}}/images/pc_12.png" id="hasNoData">
+				<div style="color:#2cb7ca;">没有找到与该关键词匹配的信息</div>
+			</div>
+			<div class="working" style="display: none;">
+				<img style="width: 216px;margin: 45px auto;" src="{{Msg "seo" "cdn"}}/images/wx/working.gif">
+				<div style="color:#2cb7ca;">剑鱼标讯正在努力工作中···</div>
+			</div>
+		</div>
+		<!--分页-->
+		<div class="pagination clearfix w" style="display:none;">
+			<div class="pagination-inner fr">
+				<a class="nbprev disabled" href="#"><i><</i>上一页</a>
+				<span class="currentPage">1</span>
+				<a class="nbnext" href="#">下一页<i>></i></a>
+			</div>
+		</div>
+	</div>
+	<!--招标搜索页面 END-->
+</section>
+
+    {{include "/common/pcbottom.html"}}
+    {{include "/common/baiducc.html"}}
+
+    <script>
+    $(".shade_table .more").on('click', toPaydataExport)
+	var searchVal = ""
+    $(function() {
+		$(".control-tabBtn>a").hover(function(){
+			$(".control-tabBtn>a").removeClass("on");
+			$(this).addClass("on");
+			$(".control-tabBtn>.bidbutdir").css("left",$(this).attr("left"));
+		},function(){
+			$(".control-tabBtn>a").removeClass("on");
+			$(".control-tabBtn>a:eq(1)").addClass("on");
+			$(".control-tabBtn>.bidbutdir").css("left",$(".control-tabBtn>a:eq(1)").attr("left"));
+		});
+		var oInput=document.getElementById("searchinput");
+		moveEnd(oInput)
+		priceTime();
+		$(".searchname").focus();
+		new JyWebScoket.qrToLab();
+		var recList = "";
+		var len = "";
+        $("#searchinput").on("input propertychange",function(){
+			var searchInput = $("#searchinput").val().trim();
+            if(searchInput == searchVal){
+                return false;
+            }
+            searchVal = searchInput;
+            if($.trim(searchInput).length > 0){
+				$("#t-clear").show();
+                getRecList(searchInput);
+            }else{
+				$("#t-clear").hide();
+                $(".searchSlideText").hide();
+            }
+        });
+
+		$("#t-clear").click(function(){
+			$("#t-clear").hide();
+			$("#searchinput").val("").focus();
+		})
+        //隐藏企业推荐列表
+        $("body").on("click",function (e) {
+            if(e.target.id != "searchinput") {
+                $(".searchSlideText").hide();
+            }
+        });
+    });
+	var scIndex = "";
+	var selected = false;
+	var prevDiff = null;
+	var firstItem = 0;
+	var index = -1;
+	var con = 10;
+	var backbottomFlag = false;
+    //企业推荐列表
+   	 function getRecList(entName_key) {
+		prevDiff = null;
+		firstItem = 0;
+		index = -1;
+		con = 10;
+		backbottomFlag = false;
+        $(".searchSlideText ul").html("");
+        $.post("/jylab/bidsearchforent/recList",{entName:entName_key},function(r){
+            if(r){
+                if(typeof (r.recList)!="undefined"){
+                    recList = r.recList;
+					len = recList.length;
+					var html = "";
+                    for(var i=0;i<recList.length;i++){
+                        var entName = recList[i].name;
+                        if(entName!="" && entName.length>36){
+                            entName = entName.substr(0,36)+"...";
+                        }
+                        html += "<li>"+entName.replace(entName_key,"<i>"+entName_key+"</i>")+"</li>";
+                    }
+					var htmlObj = $(html);
+					htmlObj.mouseover(function(){
+						var currentDiff = $(this).index() - firstItem;
+						if(prevDiff != null && backbottomFlag){
+							backbottomFlag = false;
+							prevDiff = $(this).index() - firstItem;
+							return;
+						}
+						if(prevDiff != null && currentDiff == prevDiff){
+							return;
+						}
+						index = $(this).index();
+						prevDiff = $(this).index() - firstItem;
+						$(".searchSlideText").find("li").css("background-color","")
+						$(this).css("background-color","#f4f4f7");
+					});
+					$(".searchSlideText ul").append(htmlObj);
+                }
+            }
+            if($(".searchSlideText ul li").length>=10){
+                $(".searchSlideText").css("height","400px");
+            }else{
+                $(".searchSlideText").css("height","auto");
+            }
+            $(".searchSlideText").show();
+
+            $(".searchSlideText ul li").click(function(){
+                if($(this).text()!=""){
+                    $("#searchinput").val($(this).text());
+                    $(".searchSlideText").hide();
+                    $(".searchBtn").click();
+                }
+            });
+        });
+    }
+
+	$(".searchSlideText").scroll(function(){
+		var d = $(this).scrollTop() / 40;
+		var s = parseInt(d);
+		if(d-s == 0){
+			con = 10;
+			firstItem = s;
+		}else if(d-s >= 0.5){
+			con = 9;
+			firstItem = s + 1;
+		}else{
+			con = 10;
+			firstItem = s;
+		}
+	});
+
+	//方向键选择
+	$(".searchname").keydown(function(event){
+		var key = event.keyCode;
+		var $scrollTop = $(".searchSlideText").scrollTop();
+		if($.trim($(this).val()).length == 0){
+			return;
+		}
+		if(key == 38){ //向上按钮
+			event.preventDefault();
+			if(index < firstItem && index != -1){
+				index = firstItem+1;
+			}else if(index > firstItem+con){
+				index = firstItem+con;
+				if(index > len-1){
+					index = len-1;
+				}
+			}
+			index--;
+			if(index < 0){
+				index = len-1;
+				$(".searchSlideText").scrollTop(len*40);
+				backbottomFlag = true;
+			}else{
+				if(index == 0){ //到顶了
+					$(".searchSlideText").scrollTop(0);
+				}else if(index == firstItem - 1){
+					$scrollTop -= 40;
+					$(".searchSlideText").scrollTop($scrollTop);
+				}
+			}
+			selected = true;
+			scIndex = index;
+		}else if(key == 40){ //向下按钮
+			event.preventDefault();
+			index++;
+			//处理滚动滑轮淹没上次选中li情况
+			if(index < firstItem){
+				index = firstItem;
+			}else if(index > firstItem+con){
+				index = firstItem+con-1;
+				if(index > len-1){
+					index = len-1;
+				}
+			}
+			if(index-firstItem == con){
+				$scrollTop += 40;
+				$(".searchSlideText").scrollTop($scrollTop);
+			}
+			if(index == len-1){
+				if(prevDiff != null){
+					backbottomFlag = true;
+				}
+			}
+			if(index == len){ //到底了
+				index = 0;
+				$(".searchSlideText").scrollTop(0);
+			}
+			selected = true;
+			scIndex = index;
+		}
+
+		$(".searchSlideText li").css("background", "");
+		$(".searchSlideText").find("li:eq("+index+")").css("background", "#f4f4f7");
+	})
+	</script>
+
+	<script>
+		var mainList = {{.T.list}};
+		var totalPage = {{.T.totalPage}};
+		var submitflag = true;
+		var pricetype = "";
+		var areas = {{.T.area}};
+		var searchvalue = {{.T.searchvalue}};
+		var currentPage = 1;//当前页
+		var pageSize = 50;
+		var tabularflag = "Y";
+		var dataId="";
+		$(function(){
+			new TableHeadFixed("tabContainer-2",searchvalue=="",false);
+			haslogin({{.T.logid}});
+			if(mainList != "" && mainList != null){
+				getSearchTable(mainList);
+			}
+			$(".j-nav .j-nav-link:eq(2)").addClass("active");
+			$(window).scroll(function(){
+				if($(this).scrollTop() > 0){
+				$("#backTop").show();
+				}else{
+					$("#backTop").hide();
+				}
+			});
+
+			//判断用户是否搜索中标企业,调整二维码样式
+			if(searchvalue != "" && searchvalue.length > 0){
+				$("#t-clear").show();
+				$(".wx-inner-title").html("扫码关注企业");
+				$(".wx-inner-bottom").html('扫码即可实时接收<span style="color:#2cb7ca">'+'"'+searchvalue+'"'+'</span>的中标信息!');
+			}
+
+			//地区回显样式设置
+			if(areas != ""){
+				$("#regionBtn").removeClass("active");
+				areas = areas.split(",");
+				for(var i=0;i<areas.length;i++){
+					$(".region-content>font:not('.parent-node')").each(function(){
+						if($(this).text() == areas[i]){
+							$(this).addClass("active");
+							return false;
+						}
+					});
+				}
+			}
+			//地区回显样式设置
+			$(".region-content .parent-node").each(function(){
+				var fontLen = $(this).nextUntil(".parent-node").filter("font").length;
+				var activeLen = $(this).nextUntil(".parent-node").filter(".active").length;
+				if(fontLen == activeLen){
+					$(this).addClass("active");
+				}
+				if(activeLen >0 && activeLen < fontLen){
+					$(this).addClass("secondActice");
+				}
+			});
+
+			//点击搜索 数据回显页面样式设置
+			if(mainList != "" && mainList != null && searchvalue != "" && searchvalue != null){
+				$(".seaTender-inner").css({'border':'0'});
+				$(".lucene-table").css({'padding':'0px','border-bottom':'0px','display':'block'});
+				$(".tabTitle").addClass("hidden");
+				$("#searchInner .searchControl .seaTender-inner .tabContainer .lucene-table table thead tr").css('border-top','4px solid #2cb7ca');
+				$(".lucene").attr("style","display:none");
+				$(".tabContainer").show(); //表格信息
+				$(".pagination").show();   //上、下页
+				$(".hasNoData").hide();    //数据为空图片
+			}
+			if(mainList == null || mainList.length == 0){
+				$(".tabTitle").addClass("hidden");
+				$(".tabContainer").hide();
+				$(".pagination").hide();
+				$(".hasNoData").show();
+			}
+
+
+			//价格回显样式设置
+			if({{.T.pricetype}} == "y"){
+				$(".Price-content").find("span:first-child").removeClass("active");
+				$(".pricefat").addClass("active");
+				$("#minprice").css({"border-color":"#2cb7ca"});
+				$("#maxprice").css({"border-color":"#2cb7ca"});
+			}
+
+			//筛选关闭和打开
+			//根据cookie值设置筛选是否显示
+			var rsw = localStorage.getItem("entstore");
+			if(rsw=="U"){
+				$("#screenBtn").addClass("down");
+				$(".searchTender").show();
+			}else{
+				$("#screenBtn").removeClass("down");
+				$(".searchTender").hide();
+			}
+
+			//记录用户刷选按钮状态
+			$("#screenBtn").click(function(){
+				if($(this).attr("class").indexOf("down")>0){
+					localStorage.setItem("entstore", "U");
+				}else{
+					localStorage.setItem("entstore", "D");
+				}
+			})
+
+			//价格
+			$("#minprice").click(function(){
+				$(".pricebut").show();
+				$(".pricefat").addClass("customtime-active");
+			})
+			$("#maxprice").click(function(){
+				$(".pricebut").show();
+				$(".pricefat").addClass("customtime-active");
+			})
+			//价格的全部按钮
+			$(".Price-content").find("span:first-child").click(function(){
+				priceshow=false;
+				$("#minprice").css({"border-color":""});
+				$("#maxprice").css({"border-color":""});
+				$(".pricebut").hide();
+				$(".pricefat").removeClass("customtime-active");
+				$(this).addClass("active");
+				$(".pricefat").removeClass("active");
+				pricetype = "n"
+				$("#zbSeatchT input[name='pricetype']").val(pricetype);
+				beforeSubmit();
+			})
+			//价格的确定按钮
+			$(".pricebut").click(function(){
+				var min = $("#minprice").val();
+				var max = $("#maxprice").val();
+				priceCss();
+				beforeSubmit();
+			})
+
+			//设置输入价格的格式
+			var reg = /^[\u4e00-\u9fa5]+$/;
+			var minnum = {{.T.minprice}};
+			$("#minprice").on("input propertychange",function(){
+				var minp = $.trim($(this).val()).replace(/\s/g,"");
+				$(this).val(minp)
+				if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
+					$("#minprice").blur();
+					if((reg.test(minp)||isNaN(minp)||minp.indexOf("e")>0)&&minp.indexOf(".")<0){
+						$(this).val(minnum)
+					}else{
+						//minp = minp.substr(0,minp.length-1);
+						if(reg.test(minp)||isNaN(minp)||minp.indexOf("e")>0){
+							$(this).val(minnum)
+						}else{
+							if(minp.indexOf(".")>0){
+								var offront = minp.split(".")[0];
+								var ofafter = minp.split(".")[1];
+								if(offront.length>9||ofafter.length>2){
+									//if(offront.length>9){
+										$(this).val(minnum)
+									//}else{
+									//	$(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2))
+									//	minnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+									//}
+								}else{
+									$(this).val(minp)
+									minnum = minp;
+								}
+							}else{
+								if(minp.length>9){
+									$(this).val(minnum)
+								}else{
+									$(this).val(minp)
+									minnum = minp;
+								}
+							}
+
+						}
+					}
+				}else{
+					minnum = minp;
+				}
+
+			})
+
+			//
+			var maxnum = {{.T.maxprice}};
+			$("#maxprice").on("input propertychange",function(){
+				var maxp = $.trim($(this).val()).replace(/\s/g,"");
+				$(this).val(maxp)
+				if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(maxp)){
+					$("#maxprice").blur();
+					if((reg.test(maxp)||isNaN(maxp)||maxp.indexOf("e")>0)&&maxp.indexOf(".")<0){
+						$(this).val(maxnum)
+					}else{
+						//maxp = maxp.substr(0,maxp.length-1);
+						if(reg.test(maxp)||isNaN(maxp)||maxp.indexOf("e")>0){
+							$(this).val(maxnum)
+						}else{
+							if(maxp.indexOf(".")>0){
+								var offront = maxp.split(".")[0];
+								var ofafter = maxp.split(".")[1];
+								if(offront.length>9||ofafter.length>2){
+									//if(offront.length>9){
+										$(this).val(maxnum);
+									//}else{
+									//	$(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2))
+									//	maxnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+									//}
+								}else{
+									$(this).val(maxp)
+									maxnum = maxp;
+								}
+							}else{
+								if(maxp.length>9){
+									$(this).val(maxnum)
+								}else{
+									$(this).val(maxp)
+									maxnum = maxp;
+								}
+
+							}
+
+						}
+					}
+				}else{
+					maxnum = maxp;
+				}
+			})
+
+			//搜索按钮
+			$(".searchBtn").click(function(r){
+				preSearchJd(r);
+
+			})
+
+			//招标搜索页面跳转
+			$(".bidbtn").click(function(){
+				window.location.href = "/jylab/supsearch/index.html";
+			})
+
+			//
+			$(".bidbut").click(function(){
+				window.location.href = "/jylab/supsearch/index.html";
+			})
+			//点击搜索框上方显示超级搜索
+			$(".supbtn").click(function(){
+					window.location.href = "/jylab/supsearch/index.html";
+			})
+
+			//下一页
+			$(".nbnext").click(function(){
+            	$(window).scrollTop(0);
+          		next();
+        	})
+			//上一页
+       		$(".nbprev").click(function(){
+           		$(window).scrollTop(0);
+           		prev();
+        	})
+        });
+
+		$(function(){
+			$(document).keydown(function(e){
+			    if(e.keyCode == "13"){
+					if($("#bidLogin").is(":visible")){
+						return;
+					}
+					if(selected){
+						var selecteSearch  = $(".searchSlideText").find("li").eq(scIndex).text();
+						$(".searchname").val(selecteSearch);
+					}
+					preSearchJd(e);
+
+				};
+			});
+		})
+
+		function preSearchJd(r){
+			var searchname = $("#zbSeatchT input[name='keywords']").val();
+			$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
+			$("#zbSeatchT").submit();
+		}
+
+		function priceCss(){
+			priceshow=false;
+			var minp = $("#minprice").val();
+			var maxp = $("#maxprice").val();
+			if(minp!=""&&isNaN(minp)){
+				$("#minprice").val("")
+			}
+			if(maxp!=""&&isNaN(maxp)){
+				$("#maxprice").val("")
+			}
+			if ($("#minprice").val()==""&&$("#maxprice").val()==""){
+				$(".pricefat").removeClass("active");
+				$(".Price-content").find("span:first-child").addClass("active");
+				$("#minprice").css({"border-color":""})
+				$("#maxprice").css({"border-color":""})
+				$(".pricefat").removeClass("customtime-active");
+				$(".pricebut").hide();
+				pricetype = "n";
+				$("#zbSeatchT input[name='pricetype']").val(pricetype);
+				return false;
+			}
+			if (parseInt(minp)>parseInt(maxp)){
+				$("#minprice").val(maxp);
+				$("#maxprice").val(minp);
+			}
+			$(".pricebut").hide();
+			$(".pricefat").addClass("active");
+			$(".Price-content").find("span:first-child").removeClass("active");
+			$(".pricefat").removeClass("customtime-active");
+			pricetype = "y";
+			$("#zbSeatchT input[name='pricetype']").val(pricetype);
+			return true;
+		}
+
+		//取redis里的数据
+		function getNewBids(pnum){
+			$.post("/jylab/supsearch/getNewBids",{pageNumber:pnum},function(r){
+				if(r.list == null || r.list.length == 0){
+					$(".seaTender-inner").css({'border':''});
+	                $(".tabContainer").hide();
+	                $(".pagination").hide();
+	                $(".hasNoData").show();
+	            }else{
+	                $(".tabContainer").show();
+	                $(".pagination").show();
+	                $(".hasNoData").hide();
+	                getSearchTable(r.list);
+	            }
+			})
+		}
+		//---取VIP数据---
+		function getVIPData(){
+			if(!$(".tabTitle").hasClass("hidden")){
+				return true;
+			}
+			if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='searchvalue']").val()==""){
+				$(".working").hide();
+				return true;
+			}
+			var tabflag = false;
+			if(currentPage==1){
+				$(".nbprev").addClass("disabled");
+			}
+			var param = {
+						currentPage: currentPage,
+			            searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+			            area: $("#zbSeatchT [name='area']").val(),
+			            minprice: $("#zbSeatchT [name='minprice']").val(),
+			            maxprice: $("#zbSeatchT [name='maxprice']").val(),
+			            pricetype: $("#zbSeatchT [name='pricetype']").val(),
+						tabularflag : tabularflag,
+					};
+			$.ajax({
+		       type:'post',
+		       url:'/jylab/pcSearchZbqyAjax',
+		       async:false,
+			   data:param,
+		       dataType:'json',
+		       success:function(r){
+					if(currentPage == 1){
+						totalPage = r.totalPage;
+					}
+					if(r.list == null || r.list.length == 0){
+						$(".seaTender-inner").css({'border':''});
+		                $(".tabContainer").hide();
+		                $(".pagination").hide();
+		                $(".hasNoData").show();
+		            }else{
+		                $(".tabContainer").show();
+		                $(".pagination").show();
+		                $(".hasNoData").hide();
+		                getSearchTable(r.list);
+		            }
+					tabflag = true;
+				}
+			})
+			return tabflag
+		}
+		//
+		function beforeSubmit(){
+			$(".seaTender-inner").css({'border':''});
+			$(".hasNoData").hide();
+			$(".tabContainer").hide();
+			$(".pagination").hide();
+			$(".working").show();
+			$(".tabContainer-2 .lucene ul").html("");
+			$(".tabContainer-2 .lucene-table table tbody").html("");
+			$("#right-list").addClass("active").siblings().removeClass("active");
+			$(".tabContainer .lucene").show().siblings().hide();
+			if(submitflag){
+				//地区
+				var selectAreas = "";
+				$(".region-content .active:not(.parent-node)").each(function(){
+					var thisText = $(this).text();
+					if(thisText != "全国"){
+						if(selectAreas != ""){
+							selectAreas += ",";
+						}
+						selectAreas += thisText;
+					}
+				});
+				$("#zbSeatchT [name='area']").val(selectAreas);
+
+				//价格
+				var selectMinPrices = $(".PriceInput [name='minprice']").val();
+				var selectMaxPrices =  $(".PriceInput [name='maxprice']").val();
+				$("#zbSeatchT [name='minprice']").val(selectMinPrices);
+				$("#zbSeatchT [name='maxprice']").val(selectMaxPrices);
+
+				//搜索关键词
+        var searchname = "";
+				searchname = searchvalue;
+				$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
+
+
+				currentPage=1;
+				if(currentPage==1){
+					$(".nbprev").addClass("disabled");
+				}
+				if($("#zbSeatchT [name='searchvalue']").val()==""){
+					getNewBids(currentPage)
+				}else{
+					if($.trim(searchname) != ""){
+						getTableInfo();
+					}else{
+						$(".tabTitle").removeClass("hidden");
+						//$(".lucene").attr("style","display:block");
+						//$(".lucene-table").attr("style","display:none");
+						$(".wx-inner-title").html("扫码关注剑鱼标讯");
+						$(".wx-inner-bottom").html("微信扫一扫<br>随时随地掌握招标信息");
+            currentPage = 1;
+            $(".currentPage").text(currentPage);
+            $(".nbprev").addClass("disabled");
+						searchOnsubmit();
+					}
+				}
+				submitflag=false;
+			}
+			setTimeout(function(){
+				submitflag=true
+			},200);
+			return true
+		}
+
+    function getTableInfo(){
+        //$(".seaTender-inner").css({'border':'0'});
+        $(".lucene-table").css({'padding':'0px','border-bottom':'0px','display':'block'});
+        $(".tabTitle").addClass("hidden");
+        $(".lucene").attr("style","display:none");
+		//判断用户是否搜索中标企业,调整二维码样式
+		$(".wx-inner-title").html("扫码关注企业");
+		$(".wx-inner-bottom").html('扫码即可实时接收<span style="color:#2cb7ca">'+'"'+searchvalue+'"'+'</span>的中标信息!');
+        currentPage = 1;
+        $(".currentPage").text(currentPage);
+        $(".nbprev").addClass("disabled");
+		searchOnsubmit();
+    }
+
+	function reStyle(){
+		$("#bidLogin .code-text").html('<span class="reStyle_c"><img id="wxpng" style="width:24px;margin-right:5px;" src="{{Msg "seo" "cdn"}}/images/wx1.png"/>请先微信扫码登录</span>')
+		$(".reStyle_c").css({
+			'color':'#252627',
+			'font':'22px microsoft yahei',
+			'display': 'inline-block',
+			'margin-top':'10px'
+		})
+	}
+
+    //页面跳转相关
+    function next(){
+        if($(".nbnext").hasClass("disabled")){
+            return false;
+        }
+		$(".tabContainer").hide();
+		$(".hasNoData").hide();
+		$(".pagination").hide();
+		$(".working").show();
+        if(currentPage<10){
+            currentPage++;
+		}
+        //currentPage = parseInt($(".pagination-inner").find("span").text())+parseInt(1)
+        if(currentPage==10){
+            $(".nbnext").addClass("disabled");
+        }else if(currentPage==2){
+            $(".nbprev").removeClass("disabled");
+        }
+        $(".currentPage").text(currentPage);
+		if(!$(".tabTitle").hasClass("hidden") || $("#zbSeatchT [name='searchvalue']").val()==""){
+			getNewBids(currentPage)
+		}else{
+			if($("#right-table").hasClass("active")){
+				getVIPData();
+			}else{
+	        	searchOnsubmit();
+			}
+		}
+    }
+
+    function prev(){
+        if($(".nbprev").hasClass("disabled")){
+            return false;
+        }
+		$(".tabContainer").hide();
+		$(".hasNoData").hide();
+		$(".pagination").hide();
+		$(".working").show();
+        if(currentPage>1){
+            currentPage--;
+		}
+        //currentPage = parseInt($(".pagination-inner").find("span").text())-parseInt(1)
+        if(currentPage==1){
+            $(".nbprev").addClass("disabled");
+        }else if(currentPage<10){
+            $(".nbnext").removeClass("disabled");
+        }
+        $(".currentPage").text(currentPage);
+		if(!$(".tabTitle").hasClass("hidden") || $("#zbSeatchT [name='searchvalue']").val()==""){
+			getNewBids(currentPage)
+		}else{
+			if($("#right-table").hasClass("active")){
+				getVIPData();
+			}else{
+				searchOnsubmit();
+			}
+		}
+    }
+
+    function searchOnsubmit(){
+        var param = {
+            searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+            area: $("#zbSeatchT [name='area']").val(),
+            minprice: $("#zbSeatchT [name='minprice']").val(),
+            maxprice: $("#zbSeatchT [name='maxprice']").val(),
+            pricetype: $("#zbSeatchT [name='pricetype']").val(),
+            currentPage: currentPage
+        };
+        $.post("/jylab/pcSearchZbqyAjax",param,function(r){
+			if(currentPage == 1){
+				totalPage = r.totalPage;
+			}
+            if(r.list == null || r.list.length == 0){
+				$(".seaTender-inner").css({'border':''});
+                $(".tabContainer").hide();
+                $(".pagination").hide();
+                $(".working").hide();
+                $(".hasNoData").show();
+            }else{
+                //$(".pagination").show();
+                $(".hasNoData").hide();
+				setTimeout(function(){
+					getSearchTable(r.list);
+				},3000)
+
+            }
+        });
+    }
+
+    function getSearchTable(datas) {
+		$(".tabContainer-2 .entlist").removeClass("tabfixed");
+		$(".tabContainer-2 .entlist").removeClass("tababsolute");
+		$(".tabContainer-2 .entlist").children("table").eq(0).css("top","");
+		$(".working").hide();
+		$(".hasNoData").hide();
+		$(".pagination").show();
+		$(".tabContainer").show();
+		if(searchvalue==""){
+			if(currentPage == 10 || datas.length < pageSize){
+				$(".nbnext").addClass("disabled");
+			}else{
+				$(".nbnext").removeClass("disabled");
+			}
+		}else{
+			if(currentPage == totalPage){
+				$(".nbnext").addClass("disabled");
+			}else{
+				$(".nbnext").removeClass("disabled");
+			}
+		}
+        var listItem = "";
+        var formItem = "";
+		var tableHtml = "";
+		$(".currentPage").text(currentPage);
+		listItem += '<ul>';
+		for(var i=0; i<datas.length; i++){
+			var index = (currentPage - 1) * pageSize + i + 1;
+			if(searchvalue==""){
+				listItem +='<li>'
+							+'<div class="liLuceneList">'
+							+'<div class="luce-left">'
+							+'<div class="left-title">'
+							+'<em>'+index+'.</em>'
+							+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" target="_blank">'+datas[i].title+'</a>'
+							+'</div>'
+							+'</div>'
+							+'<div class="luce-right">'
+				if(typeof(datas[i].area) != "undefined" &&datas[i].area != "" && datas[i].area != null&&datas[i].area != "A" ){
+					listItem +='<a href="/list/area/'+datas[i].areaadd+'.html">'+datas[i].area+'</a>'
+				}else{
+					listItem +='<a href="javascript:volid(0);" style="display:none;"></a>'
+				}
+				//
+				var stype = datas[i].subtype
+				if(stype==""){
+					stype==datas[i].toptype
+				}
+				if(stype==""){
+					if(datas[i].bidtype == "bid"){
+						stype = "中标";
+						datas[i].stypeadd="ZHB"
+					}else if(datas[i].bidtype == "tender"){
+						datas[i].stypeadd="ZB"
+						stype = "招标";
+					}else{
+						stype = "";
+					}
+				}
+				if(typeof(stype) != "undefined" &&stype != "" && stype != null){
+					listItem +='<a href="/list/stype/'+datas[i].stypeadd+'.html">'+stype+'</a>'
+				}else{
+					listItem +='<a href="javascript:volid(0);" style="display:none;"></a>'
+				}
+				//
+				if(typeof(datas[i].industry) != "undefined" && datas[i].industry != null && datas[i].industry != ""){
+					listItem += '<a href="/list/industry/'+datas[i].indadd+'.html">'+datas[i].industry+'</a>';
+				}else{
+					listItem += '<a href="javascript:volid(0);" style="display:none;"></a>';
+				}
+        //
+        var amount= getacount(datas[i].bidamount,datas[i].budget)
+  			if(amount!=""){
+  				listItem += '<a>'+conversionMoeny(amount)+'</a>';
+  			}else{
+  				listItem += '<a href="javascript:volid(0);" style="display:none;"></a>';
+  			}
+				//
+				if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
+					var diff = timeDiff(new Date(Number(datas[i].publishtime+"000")));
+					if(diff != null){
+						listItem += '<span class="com-time">'+diff+'</span>';
+					}
+				}
+				listItem+='</div></div></li>'
+        if (i >= 20||currentPage!=1){
+    			continue
+    		}
+				tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank">'
+						+'<td width="48"><div>'+index+'</div></td>'
+
+				if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
+					tableHtml += '<td class="tt-l" width="315"><div>'+datas[i].projectname+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-l" width="315"><div>'+datas[i].title+'</div></td>';
+				}
+
+				if(typeof(stype) != "undefined" && stype != null && stype != ""){
+					tableHtml += '<td width="84"><div>'+stype+'公告</div></td>';
+				}else{
+					tableHtml += '<td width="84"><div></div></td>';
+				}
+
+				if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
+          var budget = tableFormatMoney(datas[i].budget, {
+            type: 'number',
+            digit: 2,
+            level: 1
+          })
+					tableHtml += '<td class="tt-r" width="73"><div>'+budget+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-r" width="73"><div></div></td>';
+				}
+				if(typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
+					tableHtml += '<td class="tt-l" width="181"><div>'+datas[i].buyer+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-l" width="181"><div></div></td>';
+				}
+				if(typeof(datas[i].bidopentime) != "undefined" && datas[i].bidopentime != null && datas[i].bidopentime != ""){
+					var diff = formatDate(Number(datas[i].bidopentime),"l");
+					tableHtml += '<td width="103"><div>'+diff+'</div></td>';
+				}else{
+					tableHtml += '<td width="103"><div></div></td>';
+				}
+				if(typeof(datas[i].winner) != "undefined" && datas[i].winner != null && datas[i].winner != ""){
+					tableHtml += '<td class="tt-l" width="174"><div>'+datas[i].winner+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-l" width="174"><div></div></td>';
+				}
+				if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
+          var bidamount = tableFormatMoney(datas[i].bidamount, {
+            type: 'number',
+            digit: 2,
+            level: 1
+          })
+					tableHtml += '<td class="tt-r" width="76"><div>'+bidamount+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-r" width="76"><div></div></td>';
+				}
+
+				if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
+					var diff = formatDate(Number(datas[i].publishtime),"s");
+					if(diff != null){
+						tableHtml += '<td width="103"><div>'+diff+'</div></td>';
+					}
+				}else{
+					tableHtml += '<td width="103"><div></div></td>';
+				}
+					tableHtml+='</tr>'
+			}else{
+				 formItem += '<tr onclick="noIn(this)" dataid="'+datas[i].linkid+'">'+
+							'<td width="45">'+index+'</td>'
+				//
+				var bidtime = datas[i].jgtime||datas[i].zbtime;
+				var diff = bidtime&&formatDate(Number(bidtime),"s");
+				if(diff){
+					formItem += '<td width="150">'+diff+'</td>';
+				}else{
+					formItem += '<td width="150"></td>';
+				}
+				formItem +='<td class="tt-l" width="854">'+datas[i].projectname+'</td>'
+				//
+				if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
+					var bidamount = parseInt(datas[i].bidamount)/10000;
+					formItem += '<td class="tt-r" width="150">'+bidamount+'</td>';
+				}else{
+					formItem += '<td width="150"></td>';
+				}
+				formItem +='</tr>'
+			}
+		}
+		listItem += '</ul>';
+		$(".lucene").html(listItem);
+		if(searchvalue==""){
+			$(".lucene-table").removeClass("entlist");
+      if(currentPage==1){
+  			$(".formTable").html(tableHtml);
+      }
+      $(".shade_table").show();
+      $(".lucene-table").css({"margin-bottom":"60px"});
+		}else{
+			$(".lucene-table").addClass("entlist");
+			$(".formTable").html(formItem);
+      $(".shade_table").hide();
+      //$(".tabContainer").css({"margin-bottom":"30px"});
+		}
+    }
+
+    //关闭超级搜索遮罩层
+    function labClose(){
+        $("#labModal").modal("hide");
+    }
+
+	//关闭实验室功能弹框提示
+	function labWelClose(){
+		$("#welcome").modal("hide");
+	}
+	//
+	function formatDate(date,sl)   {
+		var myDate = new Date(date*1000);
+	    var   year=myDate.getFullYear();
+	    var   month=myDate.getMonth()+1;
+	    var   date=myDate.getDate();
+		var hour = myDate.getHours()
+		var min = myDate.getMinutes()
+		if(sl=="l"){
+			if(hour<10){
+				hour="0"+hour
+			}
+			if(min<10){
+				min="0"+min
+			}
+			return   year+"-"+month+"-"+date+"<br>"+hour+":"+min;
+		}else{
+			return   year+"-"+month+"-"+date;
+		}
+	}
+	//未登录
+	function noIn(p){
+		var thisId = $(p).attr("dataId");
+		var dataindustry = $(p).attr("dataindustry");
+		dataId = thisId;
+		if(loginflag){
+			var aHref = "";
+			if(searchvalue != ""){
+				if(dataindustry!=""&&dataindustry!=undefined){
+					aHref += '.html?kds='+searchvalue+'&industry='+dataindustry;
+				}else{
+					aHref += '.html?kds='+searchvalue;
+				}
+			}else{
+				if(dataindustry!=""&&dataindustry!=undefined){
+					aHref += '.html?industry='+dataindustry;
+				}else{
+					aHref += '.html';
+				}
+			}
+			window.open("/article/content/"+thisId+aHref);
+		}else{
+			$('#bidLogin').modal("show");
+		}
+	}
+
+	//关闭遮罩层
+	function layerClose(){
+		$("#myModal").modal("hide");
+	}
+
+  function getacount(bidamount,budget){
+  	if(typeof(bidamount) != "undefined" && bidamount != null && bidamount != ""){
+  		return bidamount
+  	}
+  	if(typeof(budget) != "undefined" && budget != null && budget != ""){
+  		return budget
+  	}
+  	return ""
+  }
+
+  //金额转化   金额:0-万元以下单位为元  ,万元以上至亿元以下单位为万元 ,亿元以上单位为亿元。保留 小数点后 2 位,不进行四舍五入。
+  function conversionMoeny(money){
+  	var m = ""+money;
+  	var m_arr = m.split(".")
+  	var m_1 = m_arr[0]
+  	var len_m1 = m_1.length;
+  	if (len_m1 >= 9 ){
+  		m = m_1.substring(0,len_m1-8) + "." + m_1.substring(len_m1-8,len_m1-6) + "亿元"
+  	} else if (len_m1 >= 5) {
+  		m =m_1.substring(0,len_m1-4) + "." + m_1.substring(len_m1-4,len_m1-2) + "万元"
+  	} else {
+  		if(m_arr.length == 1) {
+  			return m + ".00元"
+  		}
+  		var m_2 = m_arr[1]
+  		if (m_2.length > 1) {
+  			m_2 = m_2.substring(0,2)
+  		} else {
+  			m_2 = m_2.substring(0,1) + "0"
+  		}
+  		m = m_1 + "." + m_2 + "元"
+  	}
+  	return m
+  }
+
+</script>
+
+</body>
+
+</html>
+

+ 10 - 16
src/web/templates/pc/classifylist.html

@@ -1026,14 +1026,11 @@ function appendDatas(datas){
 		}
 
 		if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
-			var budget =parseInt(datas[i].budget)/10000
-			if(budget.toString().length>6){
-				if(budget.toString().indexOf(".")==5){
-					budget=budget.toString().substr(0,7)
-				}else{
-					budget=budget.toString().substr(0,6)
-				}
-			}
+      var budget = tableFormatMoney(datas[i].budget, {
+        type: 'number',
+        digit: 2,
+        level: 1
+      })
 			tableHtml += '<td class="tt-r" width="73"><div>'+budget+'</div></td>';
 		}else{
 			tableHtml += '<td class="tt-r" width="73"><div></div></td>';
@@ -1055,14 +1052,11 @@ function appendDatas(datas){
 			tableHtml += '<td class="tt-l" width="174"><div></div></td>';
 		}
 		if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
-			var bidamount = parseInt(datas[i].bidamount)/10000;
-			if(bidamount.toString().length>6){
-				if(bidamount.toString().indexOf(".")==5){
-					bidamount=bidamount.toString().substr(0,7);
-				}else{
-					bidamount=bidamount.toString().substr(0,6);
-				}
-			}
+      var bidamount = tableFormatMoney(datas[i].bidamount, {
+        type: 'number',
+        digit: 2,
+        level: 1
+      })
 			tableHtml += '<td class="tt-r" width="76"><div>'+bidamount+'</div></td>';
 		}else{
 			tableHtml += '<td class="tt-r" width="76"><div></div></td>';

+ 1 - 13
src/web/templates/pc/member_orderDetail.html

@@ -219,19 +219,7 @@
                     }
                     $(".real_cycle").text(member_endtime);
                     if (r.data.order_status === 1) {
-                        var customIsAll = 0
-                        if (filterObj.isAll){
-                          customIsAll=filterObj.isAll
-                        }
-                        if (customIsAll == 2){
-                          $("#status_wait_pay").removeClass("hide");
-                          $("#bg").addClass("yellowBg").removeClass("greenBg");
-                        }else if (customIsAll == 3){
-                          $("#status_wait_pay").removeClass("hide").text("待付完");
-                          $("#bg").addClass("yellowBg").removeClass("greenBg");
-                        }else{
-                          $("#status_success").removeClass("hide");
-                        }
+                        $("#status_success").removeClass("hide");
                         if (r.data.pay_time){
                             $(".pay_time_p").css("display", "");
                             $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));

+ 25 - 9
src/web/templates/pc/myOrder.html

@@ -280,7 +280,7 @@
                                     <p>关键词:@#item.filter_keys ? item.filter_keys : '-'#@</p>
                                     <p>数据量:@#item.data_count#@条</p>
                                     <p>数据规格:@#item.data_spec#@</p>
-                                    <p>筛选时间:@#item.filter_publishtime#@</p>
+                                    <p>筛选时间:@#dateFormat(item.filter_publishtime)#@</p>
                                 </div>
                                 <div class="fl shop_main" v-if="item.product_type === '数据流量包'">
                                     <p>产品类型:数据流量包</p>
@@ -403,9 +403,8 @@
                                         <span v-else-if="item.course_status === 3" style='color: #FE737A'>未收到转账</span>
                                     </div>
                                     <div v-if="item.order_status === 1">
-                                        <p class="finish_status" v-if="item.filter.isAll == 2 || item.return_status === 0">待付款</p>
-                                        <p class="finish_status" v-else-if="item.filter.isAll == 3 || item.return_status === 2">待付完</p>
-                                        <p class="finish_status" v-else>已完成</p>
+                                        <!--v4.7.17 产品要求只根据订单状态order_status判断,其他的不判断-->
+                                        <p class="finish_status">已完成</p>
                                     </div>
                                     <p v-if="item.order_status === -2 || item.order_status === -3" class="finish_status">已取消</p>
                                     <p><a data-jy-track="click-hover" @click="goDetail(item)">查看详情</a></p>
@@ -418,9 +417,8 @@
                                                             || item.product_type === '大会员-招标文件解读'
                                                             || item.product_type === '数据文件'">
                                     <div v-if="item.order_status === 1">
-                                        <p class="finish_status" v-if="item.filter.isAll == 2">待付款</p>
-                                        <p class="finish_status" v-else-if="item.filter.isAll == 3">待付完</p>
-                                        <p class="finish_status" v-else>已完成</p>
+                                        <!--v4.7.17 产品要求只根据订单状态order_status判断,其他的不判断-->
+                                        <p class="finish_status">已完成</p>
                                     </div>
                                     <p v-if="item.order_status === -2 || item.order_status === -3" class="finish_status">已取消</p>
                                     <p><a data-jy-track="click-hover" @click="goDetail(item)">查看详情</a></p>
@@ -428,10 +426,11 @@
                                 <div class="stateBox" v-else>
                                     <!--待支付-->
                                     <p class="finish_status" v-if="item.order_status === 0">待付款</p>
+                                    <!--v4.7.17 产品要求只根据订单状态order_status判断,其他的不判断-->
                                     <!--已开通未付钱-->
-                                    <p class="finish_status" v-else-if="item.order_status === 1 && item.return_status === 0">待付款</p>
+                                    <!--<p class="finish_status" v-else-if="item.order_status === 1 && item.return_status === 0">待付款</p>-->
                                     <!--已开通未付完-->
-                                    <p class="finish_status" v-else-if="item.order_status === 1 && item.return_status === 2">待付完</p>
+                                    <!--<p class="finish_status" v-else-if="item.order_status === 1 && item.return_status === 2">待付完</p>-->
                                     <!--已完成-->
                                     <p class="finish_status" v-else-if="item.order_status === 1">已完成</p>
                                     <!--已取消-->
@@ -1456,6 +1455,23 @@
               clearInterval(this.timerId)
             }
           }
+        },
+        dateFormat(t){
+          if (!t) {
+            t = '全部'
+          } else {
+            if (t.indexOf('_') !== -1) {
+              var pbt = t.split('_')
+              if (pbt[0] && !pbt[1]) {
+                t = new Date(pbt[0] * 1000).pattern('yyyy.MM.dd')
+                t = t + '-'
+              } else if (!pbt[0] && !pbt[0]) {
+                t = new Date(pbt[1] * 1000).pattern('yyyy.MM.dd')
+                t = t + '前全部'
+              }
+            }
+          }
+          return t
         }
       }
     })

+ 1 - 14
src/web/templates/pc/subAccount_orderDetail.html

@@ -175,20 +175,7 @@
                     $(".pay_num").text(filterObj.pay_sub_num+"个");
 
                     if (r.data.order_status === 1) {
-                        var customIsAll = 0
-                        if (filterObj.isAll){
-                          customIsAll=filterObj.isAll
-                        }
-                        if (customIsAll == 2){
-                          $("#status_wait_pay").removeClass("hide");
-                          $("#bg").addClass("yellowBg").removeClass("greenBg");
-                        }else if (customIsAll == 3){
-                          $("#status_wait_pay").removeClass("hide").text("待付完");
-                          $("#bg").addClass("yellowBg").removeClass("greenBg");
-                        }else{
-                          $("#status_success").removeClass("hide");
-                        }
-
+                        $("#status_success").removeClass("hide");
                         if (r.data.pay_time){
                             $(".pay_time_p").css("display", "");
                             $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));

+ 1 - 1
src/web/templates/pc/supsearch.html

@@ -919,7 +919,7 @@ var IframeOnClick = {
             <div class="info-content">
               <span id="infoBtn" class=" active">全部</span>
               <i class="diver"></i>
-              <font class="parent-node infoFist">拟建项目</font>
+              <font class="parent-node">拟建项目</font>
               <font data-value="拟建" class="hidden">拟建</font>
               <a id="whole"><img class="q-mark" id="q-mark"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
               <i class="diver"></i>

+ 9 - 9
src/web/templates/pc/vip_orderDetail.html

@@ -252,16 +252,16 @@
 
 
                     if (r.data.order.order_status === 1) {
-                        if(r.data.order.return_status === 0 ||r.data.order.return_status === 2 ){
-                            $("#bg").addClass("yellowBg").removeClass("greenBg");
-                            if (r.data.order.return_status === 0){
-                                $("#status_wait_pay").removeClass("hide");
-                            }else if (r.data.order.return_status === 2 ){
-                                $("#status_wait_payfull").removeClass("hide");
-                            }
-                        }else {
+                        //if(r.data.order.return_status === 0 ||r.data.order.return_status === 2 ){
+                        //  $("#bg").addClass("yellowBg").removeClass("greenBg");
+                        //    if (r.data.order.return_status === 0){
+                        //        $("#status_wait_pay").removeClass("hide");
+                        //    }else if (r.data.order.return_status === 2 ){
+                        //        $("#status_wait_payfull").removeClass("hide");
+                        //    }
+                        //}else {
                             $("#status_success").removeClass("hide");
-                        }
+                        //}
 
                         if (r.data.order.pay_time){
                             $(".pay_time_p").css("display", "");

+ 0 - 12
src/web/templates/weixin/member/aiForecastPackdetail.html

@@ -214,18 +214,6 @@
                     $("#card-header-bg").addClass("bg finish-bg")
                     $("#pageTitle").addClass("status")
                     $("#pageTitle").text("已完成");
-    
-                    var customIsAll = 0
-                    if (filterObj.isAll){
-                      customIsAll=filterObj.isAll
-                    }
-                    if (customIsAll == 2){
-                      $("#pageTitle").text("待付款");
-                      $("#card-header-bg").addClass("bg nopay-bg")
-                    }else if (customIsAll == 3){
-                      $("#pageTitle").text("待付完");
-                      $("#card-header-bg").addClass("bg nopay-bg")
-                    }
                     //有效周期
                     //$(".line_cycle").css("display", "");
     

+ 1 - 11
src/web/templates/weixin/member/memberdetail.html

@@ -278,17 +278,7 @@
                 $("#card-header-bg").addClass("bg finish-bg")
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
-                var customIsAll = 0
-                if (filterObj.isAll){
-                  customIsAll=filterObj.isAll
-                }
-                if (customIsAll == 2){
-                  $("#pageTitle").text("待付款");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }else if (customIsAll == 3){
-                  $("#pageTitle").text("待付完");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }
+               
                 //发票
                 if (source === "") {
                   var pay_again = ""

+ 0 - 12
src/web/templates/weixin/member/subAccountDetail.html

@@ -210,18 +210,6 @@
                 $("#card-header-bg").addClass("bg finish-bg");
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
-
-                var customIsAll = 0
-                if (filterObj.isAll){
-                  customIsAll=filterObj.isAll
-                }
-                if (customIsAll == 2){
-                  $("#pageTitle").text("待付款");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }else if (customIsAll == 3){
-                  $("#pageTitle").text("待付完");
-                  $("#card-header-bg").addClass("bg nopay-bg")
-                }
                 //有效周期
                 $(".line_cycle").css("display", "");
 

+ 3 - 13
src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -669,19 +669,9 @@
                     }
                     $(".payPrice").text("¥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
                     $("#card-header-bg").addClass("bg finish-bg")
-
-
-                    if (r.data.order.return_status === 0||r.data.order.return_status === 2){
-                        $("#card-header-bg").addClass("bg nopay-bg")
-                        if (r.data.order.return_status === 0){
-                            $("#pageTitle").text("待付款");
-                        }else if (r.data.order.return_status === 2){
-                            $("#pageTitle").text("待付完");
-                        }
-                    }else{
-                        $("#card-header-bg").addClass("bg finish-bg")
-                        $("#pageTitle").text("已完成");
-                    }
+             
+                    $("#card-header-bg").addClass("bg finish-bg")
+                    $("#pageTitle").text("已完成");
                     $("#pageTitle").addClass("status")
 
                     //支付时间