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

src/jfw/front/shorturl.go

@@ -179,17 +179,20 @@ func (s *Short) Article(stype, id string) error {
 		//判断用户是否是vip
 		res, _ = public.MQFW.FindById("user", userId, `{"i_vip_status":1,"i_member_status":1,"s_m_phone":1,"s_phone":1}`)
 	}
-	isVip, isMember, isEntniche := false, false, false
+	isVip, isMember, isEntniche, := false, false, false
+	isEntnicheNew := false
 
 	isVip = util.IntAll((*res)["i_vip_status"]) == 1 || util.IntAll((*res)["i_vip_status"]) == 2
 	isMember = util.IntAll((*res)["i_member_status"]) > 0
 
 	if phone, _ := util.If(util.ObjToString((*res)["s_phone"]) != "", util.ObjToString((*res)["s_phone"]), util.ObjToString((*res)["s_m_phone"])).(string); phone != "" {
 		isEntniche = public.Mysql.CountBySql(`SELECT count(1) from entniche_user a INNER JOIN entniche_info b on (a.phone=? and a.power=1 and a.ent_id=b.id and b.status>0)`, phone) > 0
+		isEntnicheNew = public.Mysql.CountBySql(`SELECT count(1) from entniche_user a INNER JOIN entniche_info b on (a.phone=? and a.power=1 and a.ent_id=b.id and b.status>0 and b.isNew > 0)`, phone) > 0
 	}
 	s.T["isVip"] = isVip
 	s.T["isMember"] = isMember
 	s.T["isEntniche"] = isEntniche
+	s.T["isEntnicheNew"] = isEntnicheNew
 
 	if bm {
 		//判断有没有取关，取关的话，跳转到关于剑鱼标讯页面

src/web/staticres/js/ent-search-index-pc.js

@@ -286,7 +286,7 @@ var vm = new Vue({
         industryTab() {
             $.ajax({
                 type:'POST',
-                url:'/entnichenew/buy/whetherbuy',
+                url:'/entnicheNew/buy/whetherbuy',
                 success:function (res) {
                   if (res.data.isNew) {
                     this.industryShow = true

src/web/staticres/js/pur-search-index-pc.js

@@ -437,6 +437,9 @@ var vm = new Vue({
                         })
                         if (arrs.length == 0) {
                             this.listState.list = []
+                            if (res.error_msg) {
+                                toastFn(res.error_msg, 2000)
+                            }
                         } else {
                             _this.attentionCheck(arrs, String(arr1))
                         }
@@ -455,11 +458,7 @@ var vm = new Vue({
             this.getList(p)
         },
         goTitle(name) {
-            // const urls = this.$router.resolve({path:'/swordfish/page_big_pc/ent-bus_portrayal/' + name})
-            // window.open(urls.href, '_blank')
-            // const reff = this.$router.resolve({path:'/swordfish/page_big_pc/ent-bus_portrayal/' + name});
-            // window.open(reff.href,'_blank');
-            location.href = '/swordfish/page_big_pc/client_portrayal/' + name
+            location.href = '/unit_portrayal/' + name
         },
         // 全选
         allChange() {

src/web/templates/pc/supsearch.html

@@ -841,7 +841,7 @@ var IframeOnClick = {
   .control-tabBtn a{
     margin-top: 0!important;
   }
-  #pursearch {
+  #searchInner .searchHeader .searchHeader-container .control-tabBtn #pursearch {
     display: none;
   }
   .bidbutdir{