Merge remote-tracking branch 'origin/dev4.5.2' into dev4.5.2

src/jfw/front/supsearch.go

@@ -271,6 +271,11 @@ func (p *Pcsearch) PcSearchIndex() error {
 	if isPayedUser {
 		buyerclass = p.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = p.GetString("buyertel"), p.GetString("winnertel")
+	} else {
+		//时间自定义选择默认是vip 大会员 等权限
+		if len(strings.Split(publishtime, "_")) == 2 {
+			publishtime = ""
+		}
 	}
 
 	b_word, s_word := "", ""

src/jfw/front/swordfish.go

@@ -126,6 +126,11 @@ func (m *Front) PcAjaxReq() {
 	if isPayedUser {
 		buyerclass = m.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+	} else {
+		//时间自定义选择默认是vip 大会员 等权限
+		if len(strings.Split(publishtime, "_")) == 2 {
+			publishtime = ""
+		}
 	}
 
 	m.SetSession("selectType", selectType)
@@ -447,6 +452,11 @@ func (m *Front) WxsearchlistPaging() {
 			if isPayedUser {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+			} else {
+				//时间自定义选择默认是vip 大会员 等权限
+				if len(strings.Split(publishtime, "_")) == 2 {
+					publishtime = ""
+				}
 			}
 
 			//全文检索限制

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

@@ -280,6 +280,11 @@ func (m *Front) WxsearchlistPaging() {
 			if isPayedUser {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+			} else {
+				//时间自定义选择默认是vip 大会员 等权限
+				if len(strings.Split(publishtime, "_")) == 2 {
+					publishtime = ""
+				}
 			}
 			//校验是否有大会员中标企业查询权限
 			if jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW).CheckBigVipBackPower("search") {

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

@@ -834,7 +834,7 @@
     padding: .16rem;
     margin-top: .44rem;
     width: 100%;
-    min-height: 1.6rem;
+    /* min-height: 1.6rem; */
     background: #f7f9fa;
     border-radius: .16rem;
 }

src/web/staticres/common-module/collection/js/history-project.js

@@ -22,7 +22,7 @@ var historyProTemplate = `
                           <div class="con-right"></div>
                       </a>
                   </div>
-                  <div class="his-deal">
+                  <div class="his-deal" v-if="!!item.date">
                       <div class="deallabel">成交时间：</div>
                       <div class="deal-time">{{item.date}}</div>
                   </div>
@@ -95,12 +95,28 @@ var hisproComponent = {
           if(res.error_code == 0) {
             loading.clear()
             if(res.data && res.data.list && res.data.list.length !== 0) {
+              res.data.list = [
+                {
+                  "contacts": {
+                      "0351-5685774": "段晓娟"
+                  },
+                  "date": 1508413417,
+                  "id": "ABCY2FdcC4eIyA6RGRlc1wOCjMvDSB3V3h%2FPw4oPyEgWXxzdR1UCcU%3D",
+                  "projectname": "山西省教育数据中心运维服务及深度防护升级项目"
+                }
+              ]
+              let phoneArr = []
               res.data.list.forEach(function(item, i) {
-                item.date = new Date(item.date * 1000).pattern('yyyy-MM-dd')
-                item.contacts = [
-                  {[Object.keys(item.contacts)[0].split(',')[0]]: item.contacts[Object.keys(item.contacts)]},
-                  {[Object.keys(item.contacts)[0].split(',')[1]]: item.contacts[Object.keys(item.contacts)]}
-                ]
+                if(item.date) {
+                  item.date = new Date(item.date * 1000).pattern('yyyy-MM-dd')
+                } else {
+                  item.date = ''
+                }
+                Object.keys(item.contacts)[0].split(',').forEach(function(items, i) {
+                  console.log(item.contacts)
+                  phoneArr.push({[items]: item.contacts[Object.keys(item.contacts)[0]]})
+                })
+                item.contacts = phoneArr
               })
               if(res.data.list.length <= 3) {
                 _this.hisData.showMoreBtn = false