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

src/jfw/front/shorturl.go

@@ -215,35 +215,28 @@ func (s *Short) Article(stype, id string) error {
 			s.T["obj"] = obj
 			if obj["entidlist"] != nil { //大会员中标企业跳转至画像
 				if winner := util.ObjToString(obj["winner"]); winner != "" {
-					//临时更改为企业名称查询企业id
-					rData := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"should":[{"term":{"company_name":"%s"}},{"term":{"hname":"%s"}}],"minimum_should_match":1}},"_source":["name","_id","capital","company_phone"],"size":1}`, winner, winner))
-					if rData != nil && len(*rData) == 1 {
-						if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
-							obj["entId"] = util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
+					s_winner := util.ObjToString(obj["s_winner"])
+					idObjs, _ := obj["entidlist"].([]interface{})
+					winnerId := ""
+					if names := strings.Split(s_winner, ","); len(names) > 1 {
+						index := 0
+						for i := 0; i < len(names); i++ {
+							if names[i] == winner {
+								index = i
+								break
+							}
 						}
+						if len(idObjs) > index {
+							winnerId = util.ObjToString(idObjs[index])
+						}
+					} else { //中标企业仅一个
+						if len(idObjs) > 0 {
+							winnerId = util.ObjToString(idObjs[0])
+						}
+					}
+					if winnerId != "" && winnerId != "-" {
+						obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
 					}
-					//s_winner := util.ObjToString(obj["s_winner"])
-					//idObjs, _ := obj["entidlist"].([]interface{})
-					//winnerId := ""
-					//if names := strings.Split(s_winner, ","); len(names) > 1 {
-					//	index := 0
-					//	for i := 0; i < len(names); i++ {
-					//		if names[i] == winner {
-					//			index = i
-					//			break
-					//		}
-					//	}
-					//	if len(idObjs) > index {
-					//		winnerId = util.ObjToString(idObjs[index])
-					//	}
-					//} else { //中标企业仅一个
-					//	if len(idObjs) > 0 {
-					//		winnerId = util.ObjToString(idObjs[0])
-					//	}
-					//}
-					//if winnerId != "" {
-					//	obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
-					//}
 				}
 			}
 			if from_userid != "" && se.Decode4Hex(from_userid) != "" && se.Decode4Hex(from_userid) != userId && util.ObjToString(obj["subtype"]) != "拟建" { //分享开打的
@@ -266,7 +259,6 @@ func (s *Short) Article(stype, id string) error {
 		}
 	} else {
 		sids := util.CommonDecodeArticle(stype, id)
-		log.Println(sids)
 		if len(sids) == 0 || (len(sids) > 0 && sids[0] == "") {
 			s.Redirect("/notin/page", 302)
 			return nil
@@ -334,29 +326,30 @@ func (s *Short) Article(stype, id string) error {
 					s.SetSession("projectname", obj["projectname"])
 				}
 				if obj["entidlist"] != nil { //大会员中标企业跳转至画像
-					winner := util.ObjToString(obj["winner"])
-					s_winner := util.ObjToString(obj["s_winner"])
-					idObjs, _ := obj["entidlist"].([]interface{})
-					winnerId := ""
-					if names := strings.Split(s_winner, ","); len(names) > 1 {
-						index := 0
-						for i := 0; i < len(names); i++ {
-							if names[i] == winner {
-								index = i
-								break
+					if winner := util.ObjToString(obj["winner"]); winner != "" {
+						s_winner := util.ObjToString(obj["s_winner"])
+						idObjs, _ := obj["entidlist"].([]interface{})
+						winnerId := ""
+						if names := strings.Split(s_winner, ","); len(names) > 1 {
+							index := 0
+							for i := 0; i < len(names); i++ {
+								if names[i] == winner {
+									index = i
+									break
+								}
+							}
+							if len(idObjs) > index {
+								winnerId = util.ObjToString(idObjs[index])
+							}
+						} else { //中标企业仅一个
+							if len(idObjs) > 0 {
+								winnerId = util.ObjToString(idObjs[0])
 							}
 						}
-						if len(idObjs) > index {
-							winnerId = util.ObjToString(idObjs[index])
-						}
-					} else { //中标企业仅一个
-						if len(idObjs) > 0 {
-							winnerId = util.ObjToString(idObjs[0])
+						if winnerId != "" && winnerId != "-" {
+							obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
 						}
 					}
-					if winnerId != "" {
-						obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
-					}
 				}
 				s.T["url"] = s.Uri()
 

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_buyer-example.js

@@ -5,7 +5,7 @@ var vipDialog = `
       <img class="vip_img" :src="imgurl" />
       <span class="vip_example">示例</span>
     </div>
-  </div>  
+  </div>
   <div class="vip_head">
       <span style="display:none;">{{getTextMap.titleText}}</span>
       <span class="vip_extend"><span>{{getTextMap.headText.top}}</span><br/>{{getTextMap.headText.bot}}</span>
@@ -137,6 +137,13 @@ var buyerExample = {
           textMap.headText.bot = '与企业关系远近，辅助投标决策！'
           textMap.source = 'buyer_portrait_topShow_freeuser'
           break
+        }
+        // 首次合作企业
+        case 'item_88': {
+          textMap.headText.top = '通过挖掘首次合作企业，直观了解采购单位'
+          textMap.headText.bot = '现阶段密切合作企业，辅助投标决策！'
+          textMap.source = 'buyer_portrait_firstShow_freeuser'
+          break
         }
           // 合作企业注册资本分布
         case 'item_9': {

src/web/staticres/public-pc/js/article-content.js

@@ -587,7 +587,7 @@ if(adv[x]== zb_adv){
 }
 if (adv[x]==any_adv[0]){
   btn_text="立即查看";
-} 
+}
 
 $(".adv_tosieve-btn").text(btn_text)
 $(".join").attr("adv_name",fromwhere(adv[x]));
@@ -1328,6 +1328,9 @@ $(function(){
         return
       }
     }
+    if(!goTemplateData.params.obj.entId){
+      return;
+    }
     if (isMember) {
       // 如果是专家版、智慧版 跳大会员页面
       if(window.memberStatus > 0 && window.memberPower && window.memberPower.indexOf(4) !== -1) {

src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -761,10 +761,15 @@
                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_12" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/12.png'></buyer-example>
             </div>
             <!-- 重点合作企业 -->
-            <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/08-bg.png') no-repeat;background-size:100% 100%">
+            <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/08-bg.png') no-repeat;background-size:100% 100%;background-position: top 30px center;background-color: white;margin-top: 2px;">
               <p class="example-title">重点合作企业</p>
                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_8" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/08.png'></buyer-example>
             </div>
+            <!-- 首次合作企业 -->
+            <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/08-bg.png') no-repeat;background-size:100% 100%;background-position: top 30px center;background-color: white;margin-top: 2px;">
+              <p class="example-title">首次合作企业</p>
+              <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_88" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/088.png'></buyer-example>
+            </div>
             <!-- 各行业项目规模占比 -->
             <div class="vip_component" style="height:11.2rem;background:url('/common-module/collection/image/buyer/07-bg.png') no-repeat;background-size:100% 100%">
               <p class="example-title">各行业项目规模占比</p>

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -537,7 +537,7 @@
                     <vip-component data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_6" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card customers client"  v-show="conf._4 && importantCustomers.length !== 0  && !getStatus">
-                    <div class="tab-card-title">重点客户</div>
+                    <div class="tab-card-title">重点及首次合作客户</div>
                     <div class="tab-card-content">
                         <div class="client-list" v-for="c in importantCustomers">
                             <div class="c-thead">