Merge branch 'dev4.5' of ssh://192.168.3.207:10022/qmx/jy into dev4.5

src/jfw/front/frontRouter.go

@@ -155,7 +155,7 @@ func (this *CommonRouter) BigpcPage(htmlPage string) error {
 	return this.doPcBigPage(htmlPage)
 }
 
-var bigVipFreePageReg = regexp.MustCompile(`set_*|free_*|ent_portrait`)
+var bigVipFreePageReg = regexp.MustCompile(`set_*|free_*`)
 
 func (this *CommonRouter) doPcBigPage(pageSign string) error {
 	userid, _ := this.GetSession("userId").(string)
@@ -164,17 +164,19 @@ func (this *CommonRouter) doPcBigPage(pageSign string) error {
 		return this.Redirect("/notin/page")
 	}
 	//没有购买大会员跳转大会员介绍页
-	if array := strings.Split(pageSign, "/"); len(array) > 0 {
-		pageSign = array[0]
-	}
-	if !bigVipFreePageReg.MatchString(pageSign) {
-		bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
-		if bigBaseMsg.Status <= 0 && !bigBaseMsg.Viper {
-			return this.Redirect("/big/page/index")
+	if !strings.HasPrefix(pageSign, "svip/ent_ser_portrait") {
+		if array := strings.Split(pageSign, "/"); len(array) > 0 {
+			pageSign = array[0]
 		}
-		//大会员页面权限判断
-		if !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
-			return this.Redirect("/big/page/index")
+		if !bigVipFreePageReg.MatchString(pageSign) {
+			bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
+			if bigBaseMsg.Status <= 0 && !bigBaseMsg.Viper {
+				return this.Redirect("/big/page/index")
+			}
+			//大会员页面权限判断
+			if !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
+				return this.Redirect("/big/page/index")
+			}
 		}
 	}
 	return this.Render(fmt.Sprintf("/frontRouter/pc/page_big_pc/sess/index.html"))

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

@@ -14,7 +14,7 @@ type NewBigMemberAction struct {
 	powerClear     xweb.Mapper `xweb:"/jyapp/bigMember/powerClear"` //大会员清除redis 服务id缓存
 }
 
-var freePageReg = regexp.MustCompile(`full|landingPage|buy_commit|contrast|orderdetail_*|write_infor|init|set_*|ontrial_commit|bid_*|free_*`)
+var freePageReg = regexp.MustCompile(`full|landingPage|buy_commit|contrast|orderdetail_*|write_infor|init|set_*|ontrial_commit|bid_*|free_*|ent_portrait`)
 
 func init() {
 	jy.InitBigVipService(public.Mysql)
@@ -34,12 +34,12 @@ func (s *NewBigMemberAction) PowerClear() {
 	})
 }
 
-//
+var bigVipFreePageReg = regexp.MustCompile(`free_*|ent_portrait`)
+
 func (s *NewBigMemberAction) VipPageManager(htmlName string) error {
 	if !freePageReg.MatchString(htmlName) {
 		userid, _ := s.GetSession("userId").(string)
 		bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
-
 		//大会员页面权限判断
 		if !bigBaseMsg.CheckBigVipFrontPower(htmlName) {
 			//main_root页面大会员主页面 只要是大会员都可以进入

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -225,6 +225,7 @@ var SuperSearch = {
       if ($(this).text().trim() !== '筛选' || $("#search-header-input").val().trim() === '') {
         return
       }
+      $("#supersearchPage input[name=super_searchinput]").blur();
       if (vMainSearchComponent) {
         vMainSearchComponent.toggleEntShow(true)
       }

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -271,10 +271,12 @@ $(function () {
             }
 
             //升级续费
+            var effectiveBool = true; 
             var fnewBuyset = filterObj.newBuyset;
             if (!$.isEmptyObject(fnewBuyset)) {
                 //续费升级逻辑修改后判断是否不延期
                 if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
+                	effectiveBool = false;
                     $(".cyclecount").text("不延期");
                 }
             }
@@ -350,23 +352,25 @@ $(function () {
                     $(".line_paytime").css("display", "none");
                 }
 
-                //有效周期
-                $(".line_cycle").css("display", "");
-                //有效日期
-                if (r.data.time.vip_starttime && r.data.time.vip_endtime) {
-                    var vip_starttime = r.data.time.vip_starttime + "";
-                    var vip_endtime = r.data.time.vip_endtime + "";
-                    vip_starttime = vip_starttime.split(" ")[0].replace(/-/g, ".");
-                    vip_endtime = vip_endtime.split(" ")[0].replace(/-/g, ".");
-                    var serviceTime = vip_starttime + " - " + vip_endtime;
-                    $(".serviceTime").text(serviceTime)
+				if (effectiveBool){
+	                //有效周期
+	                $(".line_cycle").css("display", "");
+	                //有效日期
+	                if (r.data.time.vip_starttime && r.data.time.vip_endtime) {
+	                    var vip_starttime = r.data.time.vip_starttime + "";
+	                    var vip_endtime = r.data.time.vip_endtime + "";
+	                    vip_starttime = vip_starttime.split(" ")[0].replace(/-/g, ".");
+	                    vip_endtime = vip_endtime.split(" ")[0].replace(/-/g, ".");
+	                    var serviceTime = vip_starttime + " - " + vip_endtime;
+	                    $(".serviceTime").text(serviceTime)
+	                }
                 }
                 //支付方式
-                if (r.data.order.pay_way.indexOf("wx") > -1) {
+                if (r.data.order.pay_way&&r.data.order.pay_way.indexOf("wx") > -1) {
                     $(".line_payway").css("display", "");
                     $(".payWay").text("微信支付");
                     pay_way = "wx_app"
-                } else if (r.data.order.pay_way.indexOf("ali") > -1) {
+                } else if (r.data.order.pay_way&&r.data.order.pay_way.indexOf("ali") > -1) {
                     $(".payWay").text("支付宝支付");
                     $(".line_payway").css("display", "");
                     pay_way = "ali_app"

src/jfw/modules/app/src/web/templates/commonPay/myOrder.html

@@ -1702,8 +1702,11 @@
                         + '<p class="item-ifo ellipsis">订阅周期：' + effectiveduration_vip
                         + (can1111 ? ('&nbsp;+&nbsp;' + '<span style="color: #2ABED1;">赠送' + (giveCycle < 12 ? (giveCycle + '个月') : '1年') + '</span>') : '')
                         + '</p>'
-                        + '<p class="item-ifo ellipsis">有效日期：' + effectivetime_vip + '</p>'
-                        + '</div>'
+                        
+                      if (effectiveduration_vip != "不延期"){
+                        listhtml += '<p class="item-ifo ellipsis">有效日期：' + effectivetime_vip + '</p>';
+                      }
+                      listhtml += '</div>'
                         + '</a>'
                     listhtml += '<div class="price">'
                     if (can1111 || isLiveActive) {

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -875,9 +875,13 @@
             window.event.returnValue = false;
             //超级搜索
             if(SuperSearch.isMyPage){
+              if ($("#search-header-input").val().trim() === '') {
+                return
+              }
               var isNowIndex = $(".tabs-box .tabs-nav .active").index()
                 if (!$(".tabs-box").hasClass('hidden') && isNowIndex !== 0) {
                     if (isNowIndex === 1) {
+                      $("#supersearchPage input[name=super_searchinput]").blur();
                       window.isKeyDownToEntSearch = true
                       if (vEntSearchComponent) {
                         vEntSearchComponent.toggleEntShow(true)

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -651,7 +651,7 @@
                                 <industry-component v-show="activeTabIndex === 1" :key="'industry' + industryComponentKey" ref="industryComponent"></industry-component>
                                 <date-component v-show="activeTabIndex === 3" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
                                 <notice-component v-show="activeTabIndex === 5" :key="'notice' + noticeComponentKey" ref="noticeComponent"></notice-component>
-                                <cate-component v-show="activeTabIndex === 7" :key="'cate' + cateComponentKey" ref="cateComponent"></cate-component>
+                                <cate-component v-show="!isWaitBuy && activeTabIndex === 7" :key="'cate' + cateComponentKey" ref="cateComponent"></cate-component>
                             </div>
                             <area-component ref="areaComponent" @select="updateScrollTop" v-show="activeTabIndex === 4"></area-component>
                             <money-component extra="万元" :tags="moneyTags" ref="moneyComponent"  v-show="activeTabIndex === 2"></money-component>
@@ -1470,6 +1470,7 @@
             }
             $("#search-ent-list").html('')
             $("#search-buyer-list").html('')
+            window.isKeyDownToEntSearch = false
             createSearchResultList()
 
             // KB需求:#12441 (清空输入框显示历史记录)

src/jfw/modules/publicapply/src/enterpriseSearch/entity/entQuery.go

@@ -1,10 +1,13 @@
 package entity
 
 import (
+	"config"
+	"encoding/json"
 	"fmt"
 	"log"
 	qutil "qfw/util"
 	"qfw/util/elastic"
+	"qfw/util/redis"
 	"strings"
 )
 
@@ -26,8 +29,10 @@ type EnterpriseSearch struct {
 }
 
 const (
-	searchMaxLimit = 100 //最大查询数量限制
-	freeSearchNum  = 5   //免费查询数量限制
+	searchMaxLimit    = 100 //最大查询数量限制
+	freeSearchNum     = 5   //免费查询数量限制
+	entSearchCacheDB  = "other"
+	entSearchCacheKey = "entSearchIndexCache"
 
 	index, itype = "qyxy", "qyxy"
 	entQuery     = `{"query":{"bool":{"must":[%s]}},"_source":["_id","company_name","company_status","legal_person","capital","company_address","company_shortname"]}`
@@ -103,11 +108,26 @@ func (es *EnterpriseSearch) Check() (*EnterpriseSearch, error) {
 	return es, nil
 }
 
+//判断是否是空查询
+func (es *EnterpriseSearch) isEmptySearch() bool {
+	if es.Match == "" &&
+		es.EntArea == "" &&
+		es.EntCity == "" &&
+		es.EntCapital == "" &&
+		es.EntType == "" &&
+		es.EntStatus == "" &&
+		es.BiddingArea == "" &&
+		es.EntClass == "" &&
+		es.EntContact == "" {
+		return true
+	}
+	return false
+}
+
 //GetQuerySql 获取检索语句
 //return  company_name、company_status、legal_person、capital、company_address、id、company_shortname
 //返回字段 企业名称、企业状态、法人、注册资本、地址、企业id、企业简称
 func (es *EnterpriseSearch) GetQuerySql() string {
-
 	musts := make([]string, 0, 0)
 	//输入查询
 	if es.Match != "" { //或关系 仅需满足一个
@@ -188,6 +208,10 @@ func (es *EnterpriseSearch) GetQuerySql() string {
 
 //DoQuery 根据EnterpriseSearch参数进行企业相关查询
 func (es *EnterpriseSearch) DoQuery() (list *[]map[string]interface{}, total int64, err error) {
+	if es.isEmptySearch() { //是否是空查询,返回默认企业
+		list = GetEntIndexShow()
+		return
+	}
 	sql := es.GetQuerySql()
 	log.Println("EnterpriseSearch DoQuery sql", sql)
 
@@ -213,21 +237,37 @@ func formatData(list *[]map[string]interface{}) *[]map[string]interface{} {
 	if list != nil {
 		for index, _ := range *list {
 			(*list)[index]["id"] = qutil.EncodeArticleId2ByCheck(qutil.ObjToString((*list)[index]["_id"]))
-			//if shortname, ok := ((*list)[index]["company_shortname"]).(string); !ok || shortname == "" {
-			//	(*list)[index]["company_shortname"] = getCompanyShortName(qutil.ObjToString((*list)[index]["company_name"]))
-			//}
+			if shortname, ok := ((*list)[index]["company_shortname"]).(string); !ok || shortname == "" {
+				(*list)[index]["company_shortname"] = getCompanyShortName(qutil.ObjToString((*list)[index]["company_name"]))
+			}
 			delete((*list)[index], "_id")
 		}
 	}
 	return list
 }
 
-//func getCompanyShortName(entName string) string {
-//	if entName == "" {
-//		return ""
-//	}
-//	//去掉省、市、县、区、路
-//
-//	//截取四个字符
-//	return "shortName"
-//}
+//暂不处理前端处理
+func getCompanyShortName(entName string) string {
+	if entName == "" {
+		return ""
+	}
+	//去掉省、市、县、区、路
+	//截取四个字符
+	return ""
+}
+
+func GetEntIndexShow() (list *[]map[string]interface{}) {
+	bytes, err := redis.GetBytes(entSearchCacheDB, entSearchCacheKey)
+	if err == nil {
+		if err = json.Unmarshal(*bytes, &list); err == nil && list != nil && len(*list) > 0 {
+			return
+		}
+	}
+	sql := fmt.Sprintf(entQuery, fmt.Sprintf(`{"terms":{"_id":["%s"]}}`, strings.Join(config.Config.DefaultEntList, "\",\"")))
+	listTmp := elastic.Get(index, itype, sql)
+	if listTmp != nil && len(*listTmp) > 0 {
+		list = formatData(listTmp)
+		redis.Put(entSearchCacheDB, entSearchCacheKey, list, 60*60*10)
+	}
+	return
+}

src/jfw/modules/publicapply/src/enterpriseSearch/entity/indexShow.go

@@ -1,31 +0,0 @@
-package entity
-
-import (
-	"encoding/json"
-	"fmt"
-	"jfw/modules/publicapply/src/config"
-	"qfw/util/elastic"
-	"qfw/util/redis"
-	"strings"
-)
-
-const (
-	entSearchCacheDB  = "other"
-	entSearchCacheKey = "entSearchIndexCache"
-)
-
-func GetEntIndexShow() (list *[]map[string]interface{}) {
-	bytes, err := redis.GetBytes(entSearchCacheDB, entSearchCacheKey)
-	if err == nil {
-		if err = json.Unmarshal(*bytes, &list); err == nil && list != nil && len(*list) > 0 {
-			return
-		}
-	}
-	sql := fmt.Sprintf(entQuery, fmt.Sprintf(`{"terms":{"_id":["%s"]}}`, strings.Join(config.Config.DefaultEntList, "\",\"")))
-	listTmp := elastic.Get(index, itype, sql)
-	if listTmp != nil && len(*listTmp) > 0 {
-		list = formatData(listTmp)
-		redis.Put(entSearchCacheDB, entSearchCacheKey, list, 60*60*10)
-	}
-	return
-}

src/jfw/modules/publicapply/src/enterpriseSearch/service/search.go

@@ -12,8 +12,7 @@ import (
 
 type EnterpriseSearchAction struct {
 	*xweb.Action
-	doEntSearch     xweb.Mapper `xweb:"/enterpriseSearch/doQuery"` //企业搜索
-	defaultEntIndex xweb.Mapper `xweb:"/enterpriseSearch/index"`   //企业搜索-默认展示
+	doEntSearch xweb.Mapper `xweb:"/enterpriseSearch/doQuery"` //企业搜索
 }
 
 //企业搜索

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -346,12 +346,12 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 				"i_isvalid": 1,
 			},
 		}, false, true) {
-		log.Printf("%s vip_upgrade 更新失败\n", userId)
+		log.Printf("%s vip_upgrade 更新失败  时间：%d\n", userId, endTime.Unix())
 		return false
 	}
 	updata := map[string]interface{}{
 		"o_vipjy.o_buyset": vmsg.NewBuyset,
-		"l_vip_endtime":    endTime.Unix(),
+		// "l_vip_endtime":    endTime.Unix(),//升级不再续费
 		"i_vip_expire_tip": 0,
 		"i_vip_status":     2,
 	}

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -179,7 +179,7 @@ func (this *SubscribeChange) Upgrade() {
 			filter.Area = area
 		}
 
-		var startTime, endTime time.Time
+		var startTime, endTime time.Time = now, now
 		if needRenew {
 			startTime = now
 			if needRenew {
@@ -198,7 +198,6 @@ func (this *SubscribeChange) Upgrade() {
 		//老用户 0元升级
 		if req_price == 0 && 0 == final_price {
 			if oldBuyset.Upgrade == 0 {
-				order_status = 1
 			} else {
 				return &entity.FuncResult{false, errors.New("超级订阅升级异常"), nil}
 			}

src/jfw/modules/subscribepay/src/util/vrew.go

@@ -260,14 +260,14 @@ func MergeKws(userId string) {
 	}
 }
 
-//m 月 超过一年传12+n月 如14; endtime 当前周期结束时间戳 int64 ;val -   1:年 2:月 3:季度
+//m 月 超过一年传12+n月 如14; endtime 当前周期结束时间戳 int64 ;val -   1:年 2:月 4:季度
 func GetDATE(val int, m int, endtime int64) (_endtime time.Time) {
 	//一年12个月
 	if val == 1 {
 		m = m * 12
 	}
 	//一个季度3个月
-	if val == 3 {
+	if val == 4 {
 		m = m * 3
 	}
 	endFormat := qutil.FormatDateByInt64(&endtime, qutil.Date_Short_Layout)

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -93,16 +93,16 @@ var vEntSearchComponent = new Vue({
             checked: false,
             key: 'B'
           },
-          {
-            title: '股东',
-            checked: false,
-            key: 'C'
-          },
-          {
-            title: '高管',
-            checked: false,
-            key: 'D'
-          },
+          // {
+          //   title: '股东',
+          //   checked: false,
+          //   key: 'C'
+          // },
+          // {
+          //   title: '高管',
+          //   checked: false,
+          //   key: 'D'
+          // },
           {
             title: '中标项目/标的物',
             disabled: true,
@@ -259,7 +259,7 @@ var vEntSearchComponent = new Vue({
     },
     changePower (type) {
       this.entTabs[6].disabled = type
-      this.conditionMap[1][4].disabled = type
+      this.conditionMap[1][2].disabled = type
     },
     getMoreListToStr (key) {
       if (typeof this.conditionMap[key] !== "undefined" && this.conditionMap[key].length) {
@@ -430,6 +430,7 @@ var vEntSearchComponent = new Vue({
       $("#v-ent-search-group .ent-search-pop").css({height: 'unset'})
     },
     fixedScroll () {
+      console.log('fix view Height for EntSearch')
       $(".app-layout-content-b").scrollTop(0)
       $(".app-layout-content-b").addClass('ent-stop-scroll')
       var isMaxHeight = $(".app-layout-content-b").height() - $(".tabs-nav").height() - $("#v-ent-search-group .van-tabs.van-tabs--line").height()
@@ -501,6 +502,9 @@ var vEntSearchComponent = new Vue({
         this.entSearchKey = new Date().getTime()
         $("#supersearchPage input[name=super_searchinput]").blur();
         this.doQueryList()
+        $(window).on('resize', this.fixedScroll.bind(this))
+      } else {
+        $(window).off('resize', this.fixedScroll.bind(this))
       }
       var _this = this
       this.$nextTick(function () {
@@ -510,6 +514,15 @@ var vEntSearchComponent = new Vue({
           _this.removeFixedScroll()
         }
       })
+      setTimeout(function () {
+        _this.$nextTick(function () {
+          if (type) {
+            _this.fixedScroll()
+          } else {
+            _this.removeFixedScroll()
+          }
+        })
+      }, 300)
     }
   }
 })
@@ -928,21 +941,21 @@ var vMainSearchComponent = new Vue({
     },
     removeFixedScroll () {
       $("#selLable").show()
-      // $(".app-layout-content-b").scrollTop(0)
+      $(".app-layout-content-b").scrollTop(0)
       $(".app-layout-content-b").removeClass('ent-stop-scroll')
       $("#v-search-group .ent-search-list").css({height: 'unset'})
       $("#v-search-group .ent-search-pop").css({height: 'unset'})
     },
     fixedScroll () {
       $("#selLable").hide()
-      // $(".app-layout-content-b").scrollTop(0)
+      $(".app-layout-content-b").scrollTop(0)
       $(".app-layout-content-b").addClass('ent-stop-scroll')
       var isMaxHeight = $(".app-layout-content-b").height()  - $("#v-search-group .van-tabs.van-tabs--line").height()
       $("#v-search-group .ent-search-list").css({height: isMaxHeight})
       $("#v-search-group .ent-search-pop").css({height: isMaxHeight})
     },
     updateScrollTop () {
-      // $(".app-layout-content-b").scrollTop(0)
+      $(".app-layout-content-b").scrollTop(0)
     },
     selectEnt (ent) {
       console.log(ent)

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -114,8 +114,7 @@ var tempStyleComponent = `<style>
         line-height: 0.52rem;
         color: #F7F9FA;
         border-color: #2ABED1;
-        padding-top: 0.44rem;
-        padding-bottom: 0.44rem;
+        height: 0.92rem;
     }
     #v-keep-component .keep-component-bottom .van-button__loading {
         font-size: 0.32rem;
@@ -212,6 +211,7 @@ var tempStyleComponent = `<style>
         border-color: #2ABED1;
     }
     #v-keep-component .keep-component-input-group  input {
+        width: 100%;
         -webkit-transition: width 0.2s;
         transition: width 0.2s;
         -webkit-box-flex: 1;

src/web/templates/pc/entsearchindex.html

@@ -187,7 +187,7 @@
                             @click="toDetail(item.id)"
                             :key="item.id">
                             <div class="ei-i-left">
-                                <div class="ei-i-l-container" :class="randomBgc()">${ item.company_shortname.slice(0,4) }</div>
+                                <div class="ei-i-l-container" :class="randomBgc()">${ item.company_shortname ? item.company_shortname.slice(0,4) : item.company_name.slice(0,4) }</div>
                             </div>
                             <div class="ei-i-right">
                                 <div class="ei-r-title-container flex">

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

@@ -1239,7 +1239,9 @@
                         + '<p class="item-ifo ellipsis">订阅周期：' + effectiveduration_vip
                         + (can1111 ? ('&nbsp;+&nbsp;' + '<span style="color: #2ABED1;">赠送' + (giveCycle < 12 ? (giveCycle + '个月') : '1年') + '</span>') : '')
                         + '</p>'
-                        + '<p class="item-ifo ellipsis">有效日期：' + effectivetime_vip + '</p>';
+                      if (effectiveduration_vip != "不延期"){
+                        listhtml += '<p class="item-ifo ellipsis">有效日期：' + effectivetime_vip + '</p>';
+                      }
                     //}
                     listhtml += '</div></a>'
                     listhtml += '<div class="price">'

src/web/templates/weixin/search/mainSearch.html

@@ -1005,9 +1005,13 @@
             window.event.returnValue = false;
 			//超级搜索
 			if(SuperSearch.isMyPage){
+			  if ($("#search-header-input").val().trim() === '') {
+			    return
+              }
               var isNowIndex = $(".tabs-box .tabs-nav .active").index()
                 if (!$(".tabs-box").hasClass('hidden') && isNowIndex !== 0) {
                     if (isNowIndex === 1) {
+                      $("#supersearchPage input[name=super_searchinput]").blur();
                       window.isKeyDownToEntSearch = true
                       if (vEntSearchComponent) {
                         vEntSearchComponent.toggleEntShow(true)

src/web/templates/weixin/search/tabSearch.html

@@ -659,7 +659,7 @@
                                 <industry-component v-show="activeTabIndex === 1" :key="'industry' + industryComponentKey" ref="industryComponent"></industry-component>
                                 <date-component v-show="activeTabIndex === 3" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
                                 <notice-component v-show="activeTabIndex === 5" :key="'notice' + noticeComponentKey" ref="noticeComponent"></notice-component>
-                                <cate-component v-show="activeTabIndex === 7" :key="'cate' + cateComponentKey" ref="cateComponent"></cate-component>
+                                <cate-component v-show="!isWaitBuy && activeTabIndex === 7" :key="'cate' + cateComponentKey" ref="cateComponent"></cate-component>
                             </div>
                             <area-component ref="areaComponent" @select="updateScrollTop" v-show="activeTabIndex === 4"></area-component>
                             <money-component extra="万元" :tags="moneyTags" ref="moneyComponent"  v-show="activeTabIndex === 2"></money-component>
@@ -1479,6 +1479,7 @@
             }
             $("#search-ent-list").html('')
             $("#search-buyer-list").html('')
+            window.isKeyDownToEntSearch = false
             createSearchResultList()
 
             // KB需求:#12441 (清空输入框显示历史记录)

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -460,6 +460,12 @@
 
                 }
 
+                var effectiveBool = true; 
+                //续费升级逻辑修改后判断是否不延期
+                if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
+                  effectiveBool=false;
+                  $(".cyclecount").text("不延期");
+                }
                 //周期
                 if ((r.data.order.vip_starttime != undefined) && (r.data.order.vip_endtime != undefined)) {
                     var start_time_vip = r.data.order.vip_starttime;
@@ -535,10 +541,6 @@
                     } else if (filterObj.cycleunit == -1) {
                         $(".cyclecount").text("不延期");
                     }
-                    //续费升级逻辑修改后判断是否不延期
-                    if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
-                        $(".cyclecount").text("不延期");
-                    }
                     $(".dyqy").text("升级区域：");
                     $(".dyhy").text("升级采购单位行业：");
                     $(".dyzq").text("延长周期：");
@@ -630,23 +632,25 @@
                         $(".line_paytime").css("display", "none");
                     }
 
-                    //有效周期
-                    $(".line_cycle").css("display", "");
-                    //有效日期
-                    if (r.data.time.vip_starttime && r.data.time.vip_endtime) {
-                        var vip_starttime = r.data.time.vip_starttime + "";
-                        var vip_endtime = r.data.time.vip_endtime + "";
-                        vip_starttime = vip_starttime.split(" ")[0].replace(/-/g, ".");
-                        vip_endtime = vip_endtime.split(" ")[0].replace(/-/g, ".");
-                        var serviceTime = vip_starttime + " - " + vip_endtime;
-                        $(".serviceTime").text(serviceTime)
+                    if (effectiveBool){
+                      //有效周期
+                      $(".line_cycle").css("display", "");
+                      //有效日期
+                      if (r.data.time.vip_starttime && r.data.time.vip_endtime) {
+                          var vip_starttime = r.data.time.vip_starttime + "";
+                          var vip_endtime = r.data.time.vip_endtime + "";
+                          vip_starttime = vip_starttime.split(" ")[0].replace(/-/g, ".");
+                          vip_endtime = vip_endtime.split(" ")[0].replace(/-/g, ".");
+                          var serviceTime = vip_starttime + " - " + vip_endtime;
+                          $(".serviceTime").text(serviceTime)
+                      }
                     }
 
                     //支付方式
-                    if (r.data.order.pay_way.indexOf("wx") > -1) {
+                    if (r.data.order.pay_way&&r.data.order.pay_way.indexOf("wx") > -1) {
                         $(".line_payway").css("display", "");
                         $(".payWay").text("微信支付");
-                    } else if (r.data.order.pay_way.indexOf("ali") > -1) {
+                    } else if (r.data.order.pay_way&&r.data.order.pay_way.indexOf("ali") > -1) {
                         $(".payWay").text("支付宝支付");
                         $(".line_payway").css("display", "");
                     } else {//试用用户