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

src/jfw/modules/bigmember/src/entity/portrait_screen.go

@@ -19,7 +19,7 @@ const (
 	must_match                = `{"bool":{"must":[%s]}}`
 	should_match              = `{"bool":{"should":[%s],"minimum_should_match": 1}}`
 	NewMustSearch             = `{"query":{"bool":{"must":[%s]}}%s}`
-	ListSearchLimit           = `,"_source":[%s],"sort":[{"publishtime":{"order":"desc"}}],"from":%d,"size":%d`
+	ListSearchLimit           = `,"_source":[%s],"sort":[{"%s":{"order":"desc"}}],"from":%d,"size":%d`
 
 	newBiddingSearchShowSql = `{"query":{"filtered":{"filter":{"bool":{"must":[%s,{"range":{"firsttime":{"gte":"%d"}}}]}}}},"aggs":{"group_area":{"terms":{"field":"area","size":40}},"group_scopeArr":{"terms":{"field":"subscopeclass","size":20}}}}`
 )
@@ -219,8 +219,8 @@ func (pwp *PortraitProjectScreen) GetWinnerList() (list []map[string]interface{}
 	}
 	start, limit := (pwp.PageNum-1)*pwp.PageSize, pwp.PageSize
 	//列表查询
-	listQuery := fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), fmt.Sprintf(ListSearchLimit, `"_id","projectname","bidamount","title","publishtime","subtype","toptype","area"`, start, limit))
-	log.Printf("PortraitWinnerProject GetList Sql %s\n", listQuery)
+	listQuery := fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), fmt.Sprintf(ListSearchLimit, `"_id","projectname","bidamount","title","publishtime","subtype","toptype","area"`, "publishtime", start, limit))
+	//log.Printf("PortraitWinnerProject GetList Sql %s\n", listQuery)
 	newData := elastic.Get(biddingIndex, biddingType, listQuery)
 
 	if newData == nil || len(*newData) == 0 {
@@ -316,7 +316,7 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 	if pwp.PageNum == 1 {
 		total = elastic.Count(projectIndex, projectIndex, fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), ""))
 		if total <= 0 {
-			log.Println(fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), ""))
+			//log.Println(fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), ""))
 			return
 		}
 	} else {
@@ -325,8 +325,8 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 	start, limit := (pwp.PageNum-1)*pwp.PageSize, pwp.PageSize
 
 	//列表查询
-	listQuery := fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), fmt.Sprintf(ListSearchLimit, `"bidstatus","list.infoid","list.title","list.subtype","projectname","list.area","firsttime","area"`, start, limit))
-	log.Printf("PortraitWinnerProject GetList Sql %s\n", listQuery)
+	listQuery := fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), fmt.Sprintf(ListSearchLimit, `"bidstatus","list.infoid","list.title","list.subtype","projectname","list.area","firsttime","area"`, "firsttime", start, limit))
+	//log.Printf("PortraitWinnerProject GetList Sql %s\n", listQuery)
 	newData := elastic.Get(projectIndex, projectType, listQuery)
 
 	if newData == nil || len(*newData) == 0 {

src/jfw/modules/bigmember/src/service/analysis/forecastproject.go

@@ -93,7 +93,7 @@ func (this *Analysis) ForPList() {
 				if pageNum == 1 {
 					if (*o_member_jy)["a_items"] != nil {
 						a_items := qutil.ObjArrToMapArr((*o_member_jy)["a_items"].([]interface{}))
-						if len(a_items) == 0 {
+						if len(a_items) == 0 || a_items[0]["a_key"] == nil || len(a_items[0]["a_key"].([]interface{})) == 0 {
 							msg = "暂无设置订阅关键词，无法进行预测"
 							code = 1
 						} else if (list == nil || len(list) == 0) && len(flist) == 0 {
@@ -436,6 +436,9 @@ func getKeyWordArr(a_items []interface{}, item string, index int) (arr []util.Vi
 		if item != "" && index >= 0 && item != qutil.ObjToString(vm["s_item"]) {
 			continue
 		}
+		if vm["a_key"] == nil {
+			continue
+		}
 		kwsArr := vm["a_key"]
 		for i, k := range kwsArr.([]interface{}) {
 			if item != "" && index >= 0 && i != index {

src/web/staticres/common-module/big-member/js/high_set.js

@@ -78,7 +78,7 @@ var highSet = new Vue({
   watch: {
     // 监听初始时间 如果结束时间小于初始时间 则两个调换位置
     'conf.start': function(newVal) {
-      console.log(this.conf.end, newVal)
+      // console.log(this.conf.end, newVal)
       if (this.conf.end < newVal) {
         this.conf.start = this.conf.end
         this.conf.end = newVal
@@ -232,7 +232,8 @@ var highSet = new Vue({
           success: function (res) {
             if (res.error_code == 0) {
               loading.clear()
-              _this.filterInitData = res.data
+              _this.filterInitData.areaArr = res.data.areaArr || []
+              _this.filterInitData.scopeArr = res.data.scopeArr || []
               // _this.initSelector(res.data)
             } else {
               _this.showToast(res.error_msg)
@@ -356,8 +357,9 @@ var highSet = new Vue({
         obj[s.name] = s.value
         resArr.push(obj)
       })
-      console.log(resArr, '过滤好的行业数据')
+      // console.log(resArr, '过滤好的行业数据')
       this.$refs.industryCom.formatIndustryData(resArr)
+      this.$refs.industryCom.canClick = false
       // this.$refs.industryCom.setState(this.selectIndustryList)
     },
     // 分析方式
@@ -376,11 +378,13 @@ var highSet = new Vue({
         this.$refs.projectAreaSelector.setState(this.selectAreaList)
       } else if (data.name == 'industryItem') {
         this.$refs.industryCom.setState([])
+        this.$refs.industryCom.canClick = false
       } else if (data.name == 'dateItem') {
         
       }
     },
     onConfirm: function (data) {
+      // console.log(data, 'data')
       if (data.name === 'areaItem') {
         if (data.data.length === 0) {
           this.conf.area = '全国'
@@ -401,6 +405,7 @@ var highSet = new Vue({
       } else if (data.name === 'industryItem') {
         if (data.data.length === 0) {
           this.conf.industry = '全部'
+          this.selectIndustryList = data.data
         } else {
           this.conf.industry = data.data.join(',')
           this.selectIndustryList = data.data

src/web/templates/pc/biddetail_rec.html

@@ -616,7 +616,7 @@ function isWechat() {
                               <span class="bid_phonetext">咨询 400-108-6670 了解更多</span>
                             </div>
                             <div class="contacts" v-if="buyerInfo && buyerInfo.contactList">
-                              <p class="contacts-title">历史项目联系方式</p>
+                              <p class="contacts-title">采购单位通讯录</p>
                               <p class="contacts-list" v-for="item in buyerInfo.contactList">
                                 <span class="c-l-time" v-if="item.date">成交时间：<span v-html="item.date"></span></span>
                                 <span class="c-l-way" v-if="item.contact">联系方式：<span v-html="item.contact"></span></span>
@@ -750,7 +750,7 @@ function isWechat() {
                             <span class="bid_phonetext">咨询 400-108-6670 了解更多</span>
                           </div>
                           <div class="contacts" v-if="winnerInfo && winnerInfo.contactList">
-                            <p class="contacts-title">历史项目联系方式</p>
+                            <p class="contacts-title">企业通讯录</p>
                             <p class="contacts-list" v-for="item in winnerInfo.contactList">
                               <span class="c-l-time" v-if="item.date">成交时间：<span v-html="item.date"></span></span>
                               <span class="c-l-way" v-if="item.contact">联系方式：<span v-html="item.contact"></span></span>

src/web/templates/weixin/commonPay/paySuccess.html

@@ -79,7 +79,7 @@
             继续浏览
         </button>
     </div>
-    {{else if or .T.doType "dataPack" .T.doType "areaPack"}}
+    {{else if or (eq .T.doType "dataPack") (eq .T.doType "areaPack")}}
         <div class="bottom_button j-button-group">
             <button id ="order" class="j-button-confirm" onclick="window.location.href = '/weixin/common/{{.T.doType}}/orderDetail?order_code={{.T.orderCode}}'">
                 查看订单