Переглянути джерело

Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

xuzhiheng 5 роки тому
батько
коміт
b025d4b665

+ 3 - 0
src/jfw/modules/subscribepay/src/a/init.go

@@ -29,6 +29,9 @@ func init() {
 	xweb.AddRouter("/subscribepay", &service.OrderListDetails{}) //订单详情&列表
 	xweb.AddRouter("/subscribepay", &service.RenewUpgrade{})     //续费&升级
 
+	//p1
+	xweb.AddRouter("/subscribepay", &service.IndexSearch{})     //续费&升级
+
 	//数据导出
 	xweb.AddRouter("/jypay", &service.DataExportPayMobile{})
 	xweb.AddRouter("/jypay", &service.DataExportPayPC{})

+ 9 - 7
src/jfw/modules/subscribepay/src/entity/dataExportSearch.go

@@ -47,13 +47,15 @@ type SieveCondition struct {
 
 //VIP订单
 type VipFilter struct {
-	Area        map[string]interface{} `json:"area"`     //地区
-	Industry    []string               `json:"industry"` //
-	Cyclecount  int                    `json:"cyclecount"`
-	Cycleunit   int                    `json:"cycleunit"`
-	Ordertype   int                    `json:"ordertype"`
-	Addarea     map[string]interface{} `json:"addarea"`     //新增地区
-	Addindustry []string               `json:"addindustry"` //新增行业
+	Area               map[string]interface{} `json:"area"`     //地区
+	Industry           []string               `json:"industry"` //
+	Cyclecount         int                    `json:"cyclecount"`
+	Cycleunit          int                    `json:"cycleunit"`
+	Ordertype          int                    `json:"ordertype"`
+	Addarea            map[string]interface{} `json:"addarea"`            //新增地区
+	Addindustry        []string               `json:"addindustry"`        //新增行业
+	Addareacount       map[string]interface{} `json:"addareacount"`       //新增地区数量
+	Addbuyerclasscount int                    `json:"addbuyerclasscount"` //新增地区数量
 }
 
 const (

+ 19 - 41
src/jfw/modules/subscribepay/src/entity/dataexport.go

@@ -342,7 +342,7 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 			//vip开发票内容
 			subscription_area, industry, subscription_cycle, effective_date, payment_number := "", "", "", "", ""
 			display_a, display_b, display_c := "none", "none", "none" //a:正常购买 b:续费 c:升级
-			city_count := 0
+			city_count, province_count := 0, 0
 			filter := qutil.ObjToString((*order)["filter"])
 			vip_starttime := qutil.ObjToString((*order)["vip_starttime"])
 			vip_endtime := qutil.ObjToString((*order)["vip_endtime"])
@@ -352,51 +352,30 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 			err := json.Unmarshal([]byte(filter), &vf)
 			if err == nil && vf != nil {
 				if vip_type == 2 { //升级查新订单
-					addarea := vf.Addarea         //区域
-					addindustry := vf.Addindustry //行业
-					log.Println(addarea)
-					//升级区域显示
-					if (addarea)["no"] != "no" {
-						addarea_upgrade := JyVipSubStruct.NewBuySet(&addarea, addindustry)
-						if addarea_upgrade != nil {
-							if addarea_upgrade.Citys != nil {
-								for _, v := range addarea_upgrade.Citys {
-									city_count += v.(int)
-								}
-							}
-							//订阅区域
-							if addarea_upgrade.AreaCount == -1 {
-								subscription_area = "全国"
-							} else {
-								if city_count != 0 && addarea_upgrade.AreaCount == 0 {
-									subscription_area = fmt.Sprintf("%d个地市", city_count)
-								} else if city_count == 0 && addarea_upgrade.AreaCount != 0 {
-									subscription_area = fmt.Sprintf("%d个省级区域", addarea_upgrade.AreaCount)
-								} else if city_count != 0 && addarea_upgrade.AreaCount != 0 {
-									subscription_area = fmt.Sprintf("%d个省级区域、%d个地市", addarea_upgrade.AreaCount, city_count)
-								}
-							}
+					addareacount := vf.Addareacount             //区域数量
+					addbuyerclasscount := vf.Addbuyerclasscount //行业数量
+					if len(addareacount) != 0 {
+						province_count = qutil.IntAll((addareacount)["province"])
+						city_count = qutil.IntAll((addareacount)["city"])
+						//升级区域显示
+						if city_count != 0 && province_count == 0 {
+							subscription_area = fmt.Sprintf("%d个地市", city_count)
+						} else if city_count == 0 && province_count != 0 {
+							subscription_area = fmt.Sprintf("%d个省级区域", province_count)
+						} else if city_count != 0 && province_count != 0 {
+							subscription_area = fmt.Sprintf("%d个省级区域、%d个地市", province_count, city_count)
+						} else if city_count == 0 && province_count == 0 {
+							subscription_area = "全国"
 						}
 					} else {
 						subscription_area = "无"
 					}
-
 					//升级行业显示
-					industry_upgrade := 0
-					if len(addindustry) != 0 {
-						if addindustry[0] != "no" { //等于no 为 无新增区域
-							industry_upgrade = len(addindustry)
-						} else {
-							industry_upgrade = -2 //无新增
-						}
-					} else {
-						industry_upgrade = -1 //全行业
-					}
-					if industry_upgrade != -1 && industry_upgrade != -2 {
-						industry = fmt.Sprintf("%d个行业", industry_upgrade)
-					} else if industry_upgrade == -2 {
+					industry = fmt.Sprintf("%d个行业", addbuyerclasscount)
+					if addbuyerclasscount == 0 {
 						industry = "无"
-					} else {
+					}
+					if addbuyerclasscount == -1 {
 						industry = "全行业"
 					}
 				} else { //非升级
@@ -465,7 +444,6 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 							subscription_cycle = fmt.Sprintf("%d年", year)
 						}
 					} else {
-						log.Println(vf.Cyclecount, "---", vf.Cycleunit)
 						if vf.Cycleunit == 1 {
 							subscription_cycle = fmt.Sprintf("%d年", vf.Cyclecount)
 						} else if vf.Cycleunit == 2 {

+ 255 - 0
src/jfw/modules/subscribepay/src/service/index_p1.go

@@ -0,0 +1,255 @@
+package service
+
+import (
+	"entity"
+	"fmt"
+	"github.com/go-xweb/xweb"
+	"log"
+	qutil "qfw/util"
+	"qfw/util/elastic"
+	"qfw/util/redis"
+	"strings"
+	"util"
+)
+
+type IndexSearch struct {
+	*xweb.Action
+	getIndexMessage xweb.Mapper `xweb:"/index/getIndexMessage"` //首页p1数据
+}
+
+const (
+	search_index = "bidding"
+	search_type  = "bidding"
+	search_field = `"_id","title","publishtime","toptype","subtype","type","city","s_subscopeclass","budget"`
+
+	query               = `{"query":{"bool":{"should":[%s]}},"highlight": {"pre_tags": ["<a>"],"post_tags": ["</a>"],"fields": {"title": {"fragment_size": 0,"number_of_fragments": 1}}},"_source":[` + search_field + `],"sort":[{"publishtime":"desc"},{"budget":"desc"}],"from":0,"size":50}`
+	multi_match         = `{"multi_match": {"query": %s,"type": "phrase", "fields": ["title"]}}`
+	query_bool_must     = `{"terms":{"%s":[%s]}}`
+	query_bool_must_and = `{"bool":{"must":[%s]%s}}`
+	query_bool_should   = `{"bool":{"should":[%s],"minimum_should_match": 1}}`
+)
+
+/* p1获取信息
+  return
+	  success : true or false
+	  errMsh : 错误信息
+	  data  :{
+		isVip: true or false,
+		weekNullData:true or false,
+		list:[{},{},{}]
+	 }
+*/
+func (this *IndexSearch) GetIndexMessage() {
+	userId := qutil.ObjToString(this.GetSession("userId"))
+	areaCity := this.GetString("city")
+	log.Println(userId, "=== 地区:", areaCity)
+	r := func() *entity.FuncResult {
+		SearchType := 0 //订阅 0 > 搜索 1(有无订阅)> 无搜索 2(有无订阅)
+		doSearchStr := ""
+		isVip := false
+		//获取订阅信息
+		userMap, ok := util.MQFW.FindById("user", userId, `{"o_jy":1,"o_vipjy":1,"i_vip_status":1}`)
+		if !ok || userMap == nil || len(*userMap) == 0 {
+			SearchType++
+		}
+		//根据订阅词获取查询语句
+		if SearchType == 0 {
+			vipStatus := qutil.IntAll((*userMap)["i_vip_status"])
+			if vipStatus > 0 { //vip用户
+				isVip = true
+				o_msgset := qutil.ObjToMap((*userMap)["o_vipjy"])
+				vip_items, ok := (*o_msgset)["a_items"].([]interface{})
+				if !ok || len(vip_items) == 0 {
+					SearchType++
+				} else {
+					//拼接查询语句-vip订阅词
+					doSearchStr = getVipSubscribeSql(o_msgset)
+					log.Println("getVipSubscribeSql SearchStr===", doSearchStr)
+				}
+			} else { //普通用户
+				o_msgset := qutil.ObjToMap((*userMap)["o_jy"])
+				items, ok := (*o_msgset)["a_key"].([]interface{})
+				if !ok || len(items) == 0 {
+					SearchType++
+				} else {
+					//拼接查询语句-普通用户订阅词
+					doSearchStr = getNormalSubscribeSql(items)
+					log.Println("getNormalSubscribeSql SearchStr===", doSearchStr)
+				}
+			}
+		}
+		//根据搜索历史获取查询语句
+		if SearchType == 1 {
+			h := redis.GetStr("other", "s_"+userId)
+			if h == "" {
+				SearchType++
+			} else {
+				history := strings.Split(h, ",")
+				//拼接查询语句-普通用户订阅词
+				doSearchStr = getSimpleSql(areaCity, history)
+				log.Println(history)
+			}
+		}
+		//无订阅无搜索历史
+		if SearchType == 2 {
+			doSearchStr = getSimpleSql(areaCity, []string{})
+		}
+		list := elastic.Get(search_index, search_type, doSearchStr)
+		return &entity.FuncResult{true, nil, map[string]interface{}{
+			"isVip": isVip,
+			"list":  list,
+		}}
+	}()
+	if r.Err != nil {
+		log.Printf("%s CreateOrder err:%v\n", userId, r.Err.Error())
+	}
+	this.ServeJson(r.Format())
+}
+
+func getVipSubscribeSql(vipSets *map[string]interface{}) string {
+	items := qutil.ObjArrToMapArr((*vipSets)["a_items"].([]interface{}))
+	bools := []string{}
+	musts := []string{}
+
+	//订阅词
+	for _, v := range items {
+		a_key := (*qutil.ObjToMap(v))["a_key"]
+		keysets := qutil.ObjArrToMapArr(a_key.([]interface{}))
+		for _, keyset := range keysets {
+			musts := []string{}
+			must_not := []string{}
+
+			allKeys := []string{}
+			//关键词
+			keys := qutil.ObjArrToStringArr(keyset["key"].([]interface{}))
+			if len(keys) == 0 {
+				continue
+			}
+			allKeys = append(allKeys, keys...)
+			//附加次
+			appendkeys := qutil.ObjArrToStringArr(keyset["appendkey"].([]interface{}))
+			allKeys = append(allKeys, appendkeys...)
+
+			for _, key := range allKeys {
+				musts = append(musts, fmt.Sprintf(multi_match, "\""+key+"\""))
+			}
+			//排除词
+			notkeys := qutil.ObjArrToStringArr(keyset["notkey"].([]interface{}))
+			for _, notkey := range notkeys {
+				must_not = append(must_not, fmt.Sprintf(multi_match, "\""+notkey+"\""))
+			}
+
+			if len(musts) > 0 {
+				notStr := ""
+				if len(must_not) > 0 {
+					notStr = fmt.Sprintf(`,"must_not":[%s]`, strings.Join(must_not, ","))
+				}
+				bools = append(bools, fmt.Sprintf(query_bool_must_and, strings.Join(musts, ","), notStr))
+			}
+		}
+	}
+	//地区
+	areaMap := qutil.ObjToMap((*vipSets)["o_area"])
+	var areas, citys, areaSql []string
+	for k, v := range (*areaMap) {
+		tmp := qutil.ObjArrToStringArr(v.([]interface{}))
+		if len(tmp) == 0 {
+			areas = append(areas, k)
+		} else {
+			citys = append(citys, tmp...)
+		}
+	}
+
+	if len(areas) > 0 {
+		areaSql = append(areaSql, fmt.Sprintf(query_bool_must, "area", `"`+strings.Join(areas, `","`)+`"`))
+	}
+	if len(citys) > 0 {
+		areaSql = append(areaSql, fmt.Sprintf(query_bool_must, "city", `"`+strings.Join(citys, `","`)+`"`))
+	}
+
+	if len(areaSql) > 0 {
+		musts = append(musts, fmt.Sprintf(query_bool_should, strings.Join(areaSql, ",")))
+	}
+
+	//类型
+	infotypes := qutil.ObjArrToStringArr((*vipSets)["a_infotype"].([]interface{}))
+	if len(infotypes) > 0 {
+		musts = append(musts, fmt.Sprintf(query_bool_must, "toptype", `"`+strings.Join(infotypes, `","`)+`"`))
+	}
+	//行业
+	buyerclasses := qutil.ObjArrToStringArr((*vipSets)["a_buyerclass"].([]interface{}))
+	if len(buyerclasses) > 0 {
+		musts = append(musts, fmt.Sprintf(query_bool_must, "buyerclass", `"`+strings.Join(infotypes, `","`)+`"`))
+	}
+	return fmt.Sprintf(query, strings.Join(musts, ","), strings.Join(bools, ","))
+}
+
+func getNormalSubscribeSql(keySets []interface{}) string {
+	bools := []string{}
+	for _, v := range keySets {
+		keySet := qutil.ObjToMap(v)
+		if keySet == nil || len(*keySet) == 0 {
+			continue
+		}
+		var keywords, notkeys, areas, infotypes []string
+		if val, ok := (*keySet)["key"]; ok {
+			keywords = qutil.ObjArrToStringArr(val.([]interface{}))
+		} else {
+			continue
+		}
+		if val, ok := (*keySet)["notkey"]; ok {
+			notkeys = qutil.ObjArrToStringArr(val.([]interface{}))
+		}
+		if val, ok := (*keySet)["area"]; ok {
+			areas = qutil.ObjArrToStringArr(val.([]interface{}))
+		}
+		if val, ok := (*keySet)["infotype"]; ok {
+			infotypes = qutil.ObjArrToStringArr(val.([]interface{}))
+		}
+		log.Println(keywords, notkeys, areas, infotypes)
+
+		musts := []string{}
+		must_not := []string{}
+		//关键词
+		for _, key := range keywords {
+			musts = append(musts, fmt.Sprintf(multi_match, "\""+key+"\""))
+		}
+		//排除词
+		for _, notkey := range notkeys {
+			must_not = append(must_not, fmt.Sprintf(multi_match, "\""+notkey+"\""))
+		}
+		//地区
+		if len(areas) > 0 {
+			musts = append(musts, fmt.Sprintf(query_bool_must, "area", `"`+strings.Join(areas, `","`)+`"`))
+		}
+		//类型
+		if len(infotypes) > 0 {
+			musts = append(musts, fmt.Sprintf(query_bool_must, "toptype", `"`+strings.Join(infotypes, `","`)+`"`))
+		}
+
+		//添加
+		if len(musts) > 0 {
+			notStr := ""
+			if len(must_not) > 0 {
+				notStr = fmt.Sprintf(`,"must_not":[%s]`, strings.Join(must_not, ","))
+			}
+			bools = append(bools, fmt.Sprintf(query_bool_must_and, strings.Join(musts, ","), notStr))
+		}
+	}
+	return fmt.Sprintf(query, strings.Join(bools, ","))
+}
+
+func getSimpleSql(city string, history []string) string {
+	musts := []string{}
+	if len(history) > 0 {
+		for _, key := range history {
+			musts = append(musts, fmt.Sprintf(multi_match, "\""+key+"\""))
+		}
+
+	}
+	if city != "" {
+		musts = append(musts, fmt.Sprintf(query_bool_must, "area", `"`+city+`"`))
+	}
+	bools := fmt.Sprintf(query_bool_must_and, strings.Join(musts, ","), "")
+	return fmt.Sprintf(query, bools)
+}

+ 2 - 1
src/web/staticres/css/wx/home.css

@@ -82,7 +82,7 @@
   width: 0.08rem;
   height: 0.08rem;
   background: #fff;
-  opacity: 0.4;
+  opacity: 0.6;
 }
 
 .home .top .home_banner .lunbo .custorm_dot .swiper-pagination-bullet-active {
@@ -129,6 +129,7 @@
   padding: .32rem .3rem 0.08rem;
   font-size: .4rem;
   color: #1D1D1D;
+font-weight: bold;
 }
 
 .home .home_data .data_list {

+ 3 - 3
src/web/staticres/css/wxsearch.css

@@ -386,12 +386,12 @@ form{
 }
 /**引导页**/
 .swiper-pagination{
-	top: 80px !important;
+/*	top: 80px !important;*/
 	transition: 0ms !important;
 	-webkit-transition: 0ms !important;
 }
 .swiper-pagination-bullet{
-	margin-bottom: 15px !important;
+	margin-bottom: 5px !important;
 }
 .swiper-slide{
 	text-align: center;
@@ -482,7 +482,7 @@ form{
 	height: 100%;
 }
 .swiper-pagination-bullet-active{
-	background-color: #35c5da !important;
+/*	background-color: #35c5da !important;*/
 }
 .swiper-pagination-bullet{
 	opacity: .1;

+ 3 - 0
src/web/staticres/js/wxSupersearch.js

@@ -1929,5 +1929,8 @@ var SuperSearch = {
 			$("#wrapper").css("margin-bottom","52px");
 			$("#supersearchPage .resbm").addClass("hidden");
 		}
+	},
+	getHomeList:function(){
+		
 	}
 };

+ 2 - 2
src/web/staticres/vipsubscribe/css/keyWord.css

@@ -566,7 +566,7 @@ bottom:0px;
     width: 1.7rem;
     text-align: center;
     color: #2CB7CA;
-    font-size: 0.2rem;
+    font-size: 0.26rem;
     padding: 0rem 0rem 0.1rem;
     float: right;
 }
@@ -592,7 +592,7 @@ bottom:0px;
 }
 .classify-fast-pop .weui-dialog .weui-dialog__bd p {
         color: #888;
-    font-size: .2rem;
+    font-size: .26rem;
     margin-top: .2rem;
     letter-spacing: 0.01rem;
 }

+ 18 - 1
src/web/staticres/wxswordfish/share.js

@@ -11,7 +11,7 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 	}
 	if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
 		wx.config({
-		    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+		    debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
 		    appId: signature[0], // 必填,公众号的唯一标识
 		    timestamp:signature[1], // 必填,生成签名的时间戳
 		    nonceStr: signature[2], // 必填,生成签名的随机串
@@ -195,6 +195,23 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 					// 用户取消分享后执行的回调函数
 				}
 			});
+			wx.getLocation({
+			  	type: 'wgs84', // 默认为wgs84的gps坐标,如果要返回直接给openLocation用的火星坐标,可传入'gcj02'
+			  	success: function (res) {
+			    	var latitude = res.latitude; // 纬度,浮点数,范围为90 ~ -90
+			    	var longitude = res.longitude; // 经度,浮点数,范围为180 ~ -180。
+					//生成地理位置
+                    var fname = '';
+                    var point = new BMap.Point(longitude, latitude);
+                    var geoc = new BMap.Geocoder();
+                    geoc.getLocation(point, function(rs) {
+                        var addComp = rs.addressComponents;
+                        //alert(addComp.province + ", "+addComp.city + ", "+addComp.district + ", "+addComp.street + ", "+addComp.streetNumber);
+                        fname = addComp.district;
+                        alert('您现在所处位置:'+JSON.stringify(addComp));
+                    });
+			  }
+			});
 	    });
 		wx.error(function(res){
 		    // config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名。

+ 26 - 37
src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -1117,48 +1117,37 @@
 			                        }
 							    }
 	                       }else{
+								//新增全部行业:-1  新增部分行业:123   		无新增:0
+								//新增全国{"province":0,"city":0}  无新增:{}
+	                       		//升级订单 单独处理
 	                       		//区域
 	                       		var filterObj =filter_vip;
 	                       		var region_vip ="";
-	                       		//升级订单 单独处理
-					         	if(!$.isEmptyObject(filterObj.addarea)){
-					              	var cityNum_u=0;
-					              	var provinceNum_u=0;
-						         	for(var i in filterObj.addarea) {
-						                let citys_u=filterObj.addarea[i];
-						                if (citys_u=="no"){
-						                	 region_vip="无"
-						                }else{
-						                	if (citys_u.length>0){
-							                	cityNum_u+=citys_u.length;
-							                }else{
-							                	provinceNum_u++;
-							                }
-						                }
-					                }
-					                if(provinceNum_u>0) region_vip= region_vip + provinceNum_u+"个省级区域";
-					                if(cityNum_u>0){
-					                	if(provinceNum_u>0) region_vip= region_vip+"、"
-					                	region_vip = region_vip+ cityNum_u+"个地市";
-					                }
-					         	}else {
-					         		region_vip="全国";
-					         	}
+								if(!$.isEmptyObject(filterObj.addareacount)){
+									if((filterObj.addareacount.province==0)&&(filterObj.addareacount.city==0)){
+										region_vip="全国";
+									}
+									if((filterObj.addareacount.province!=0)&&(filterObj.addareacount.city==0)){
+										region_vip=filterObj.addareacount.province+"个省级区域";
+									}
+									if((filterObj.addareacount.province==0)&&(filterObj.addareacount.city!=0)){
+										region_vip=filterObj.addareacount.city+"个地市";
+									}
+									if((filterObj.addareacount.province!=0)&&(filterObj.addareacount.city!=0)){
+										region_vip=filterObj.addareacount.province+"个省级区域、"+filterObj.addareacount.city+"个地市";
+									}
+								}else{
+									region_vip="无";
+								}
 					         	//行业
 					         	var industry_vip="";
-					         	if(!$.isEmptyObject(filterObj.addindustry)) {
-					         		if(filterObj.addindustry[0]=="no"){
-						         		industry_vip="无";
-						         	}else{
-						         		if(filterObj.addindustry.length==0){
-						         			industry_vip="全行业";
-						         		}else{
-						         			industry_vip=filterObj.addindustry.length+"个行业";
-						         		}
-						         	}
-					         	}else{
-				         			industry_vip="全行业";
-					         	}
+								industry_vip=filterObj.addbuyerclasscount+"个行业";
+								if(filterObj.addbuyerclasscount==0){
+									industry_vip="无";
+								}
+								if(filterObj.addbuyerclasscount==-1){
+									industry_vip="全行业";
+								}
 					         	//延长周期
 					         	var effectiveduration_vip="";
 					        	if(filterObj.cycleunit==1){

+ 43 - 25
src/web/templates/weixin/search/mainSearch.html

@@ -19,10 +19,11 @@
 <script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
 {{include "/common/weixin.html"}}
-<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=DD279b2a90afdf0ae7a3796787a0742e"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}1022"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}112"></script>
 <!--2.8-->
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
@@ -65,7 +66,7 @@
 	$(function(){
 		//dev2.8.5
         var swiper1 = new Swiper('#swiper1',{
-            autoplay: 5000,
+            autoplay: 3000,
             effect: 'fade',
             pagination: '.swiper-pagination',
             paginationClickable: true,
@@ -281,7 +282,7 @@
 	<div class="home">
         <div class="top">
             <div class="home_search">
-                <div class="home_search_left">
+                <div class="home_search_left inp-search">
                     <img class="icon_search" src="/images/search/home_search.png" alt="">
                     <span>示例:税务局 软件</span>
                 </div>
@@ -292,14 +293,31 @@
             <div class="home_banner">
                 <div class="swiper-container lunbo" id="swiper1">
                     <div class="swiper-wrapper">
-                        <div class="swiper-slide"><a href="#"><img src="/images/search/banner_1.png" alt=""></a></div>
-                        <div class="swiper-slide"><a href="#"><img src="/images/search/banner_2.png" alt=""></a></div>
-                        <div class="swiper-slide"><a href="#"><img src="/images/search/banner_3.png" alt=""></a></div>
+						<!--轮播广告-->
                     </div>
                     <div class="swiper-pagination custorm_dot"></div>
                 </div>
             </div>
         </div>
+		{{$s_top:=(Ad "jy-wxsearch-home-top" -1)}}
+		<script>
+			$(function(){
+				SuperSearch.getHomeList()
+			})
+			var ADTopList={{$s_top}}
+			if (ADTopList!=null){
+				var adhtml = '';
+				for(var i=0;i<ADTopList.length;i++){
+					adhtml+='<div class="swiper-slide">'
+						+'<a href="'+ADTopList[i]["s_link"]+'">'
+						+'<img src="'+ADTopList[i]["s_pic"]+'" alt="">'
+						+'</a></div>'
+				}
+				if(adhtml!=""){
+					$(".home_banner .swiper-wrapper").html(adhtml);
+				}
+			}
+		</script>
         <!-- 导航菜单 -->
         <div class="home_tab">
             <div class="tab_container">
@@ -365,20 +383,20 @@
 	<!--2.8.5  end-->
 	<!--<div onclick="window.location.href='/supportJy'" style="font-size:15px;background-color: #FFB900;line-height: 40px;z-index: 99;color: #fff;border-radius: 3px;bottom: 80px;right: 10px;left:10px;position: fixed;"><img src="/images/search/laba.png" style="width: 23px;margin:0px 10px;">好几天没有推送消息了,真相是......</div>-->
 	<!--头部-->
-		<div class="search-header">
+	<div class="search-header hide">
 		<!--搜索-->
-			<div class="search-tontrol">
-				<div>
-					<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例:税务局 软件" readonly/>
-				</div>
-				<!--点击关闭-->
-				<span id="seaClose" class="close"></span>
-				<a class="rightHref">
-				</a>
+		<div class="search-tontrol">
+			<div>
+				<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例:税务局 软件" readonly/>
 			</div>
+			<!--点击关闭-->
+			<span id="seaClose" class="close"></span>
+			<a class="rightHref">
+			</a>
 		</div>
+	</div>
 
-	<section class="content">
+	<section class="content hide">
 		<ul>
 			<li>
 				<a>
@@ -1089,23 +1107,23 @@
             SuperSearch.init(true,true,true);
         });
 		//点击帮助
-	    $(".rightHref").click(function(){
+	    $(".home_search_right").click(function(){
 	        window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=2&sn=379fc869080a36d9d0798a3d4fb9a63a#wechat_redirect");
 			event.stopPropagation();
 	    });
 	    //数据导出页面
-	    $(".content ul li a:eq(1)").on('click', function () {
+	    $(".tab_container  a:eq(1)").on('click', function () {
 			window.location.href='/front/wx_dataExport/toSieve';
 	    });
+	    //剑鱼标讯
+	    $(".tab_container a:eq(2)").on('click', function () {
+			window.location.href='/swordfish/historypush';
+	    });
 	    //APP下载跳转到关于剑鱼标讯
-	    $(".content ul li a:eq(2)").on('click', function () {
+	    $(".tab_container a:eq(3)").on('click', function () {
 			// window.location.href='https://www.jianyu360.com/jyapp/free/download/normal?source=weixinAutoRpl';
 			window.location.href='/swordfish/about?flag=1&come=1';
 	    });
-		//拉新 2019-10-21 拉新活动结束 注释
-	    //$(".content ul li a:eq(3)").on('click', function () {
-		//	window.location.href='https://mp.weixin.qq.com/s/ACvQRxKeLYl_DuPuvvqIXQ';
-	    //});
 	//});
 	function checkIsOpen(){
 		$(".content ul li a:eq(0)").unbind("tap");
@@ -1115,7 +1133,7 @@
 	    $.post("/jylab/supsearch/getstatus?t="+new Date().getTime(),function(result){
 			onceFlag_tablepro=result.tablepro;
 			//中标企业搜索跳转
-		    $(".content ul li a:eq(0)").on("tap",function(){
+		    $(".tab_container a:eq(0)").on("tap",function(){
 				EntSearch.clearSessionStorage();
 				EntSearch.init(true,true,true);
 		    });	  

+ 2 - 2
src/web/templates/weixin/vipsubscribe/keyWord.html

@@ -138,7 +138,7 @@
                     <strong class="weui-dialog__title">快速导入</strong>
                 </div>
                 <div class="weui-dialog__bd">
-                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“未分类"关键词分类内,无需再次手动输入,简化您的订阅过程。
+                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“未分类"关键词分类内,无需再次手动输入,简化您的订阅过程。
 					<p style="color:#888;">注:地区与行业分类以VIP订阅设置内为准,不做导入。</p>
                 </div>
                 <div class="weui-dialog__ft">
@@ -722,7 +722,7 @@
 		    var agent = navigator.userAgent.toLowerCase();
 		    var dialog = $('.classify-fast-pop .weui-dialog')
 		    if( /iphone|ipod|ipad|ios/.test(agent) ){
-		        dialog.css({ 'top': '30%' })
+		        dialog.css({ 'top': '40%' })
 		    } else {
 		        dialog.css({ 'top': '50%' })
 		    }

+ 56 - 77
src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -231,85 +231,64 @@ try{
         if(r.data.order.filter){
             var filterObj=JSON.parse(r.data.order.filter);
         	if (r.data.order.vip_type!=2){
-            //省份数 城市数
-            if(!$.isEmptyObject(filterObj.area)){
-              var cityNum=0;
-              var provinceNum=0;
-              for(var i in filterObj.area) {
-                let citys=filterObj.area[i];
-                if(citys.length>0){
-                  cityNum+=citys.length;
-                }else{
-                  provinceNum++;
-                }
-              }
-              var areaText="";//1个省级区域、4个地市
-              if(provinceNum>0) areaText= areaText + provinceNum+"个省级区域";
-              if(cityNum>0){
-                if(provinceNum>0) areaText= areaText+"、"
-                areaText = areaText+ cityNum+"个地市";
-              }
-              $(".areaNum").text(areaText);
-            }else{
-              $(".areaNum").text("全国");
-            }
-            //行业数
-	        if(filterObj.industry.length!=0){
-	            $(".industryNum").text(filterObj.industry.length+"个行业");
+	            //省份数 城市数
+	            if(!$.isEmptyObject(filterObj.area)){
+	              	var cityNum=0;
+	              	var provinceNum=0;
+	              	for(var i in filterObj.area) {
+		                let citys=filterObj.area[i];
+		                if(citys.length>0){
+		                  cityNum+=citys.length;
+		                }else{
+		                  	provinceNum++;
+		                }
+	              	}
+	              	var areaText="";//1个省级区域、4个地市
+	              	if(provinceNum>0) areaText= areaText + provinceNum+"个省级区域";
+	              	if(cityNum>0){
+	                	if(provinceNum>0) areaText= areaText+"、"
+	                	areaText = areaText+ cityNum+"个地市";
+	            	}
+	              	$(".areaNum").text(areaText);
+	            }else{
+	            	$(".areaNum").text("全国");
+	            }
+	            //行业数
+		        if(filterObj.industry.length!=0){
+		            $(".industryNum").text(filterObj.industry.length+"个行业");
+		        }else{
+		            $(".industryNum").text("全行业");
+		        }
 	        }else{
-	            $(".industryNum").text("全行业");
+	         	//升级订单 单独处理
+				if(!$.isEmptyObject(filterObj.addareacount)){
+					if((filterObj.addareacount.province==0)&&(filterObj.addareacount.city==0)){
+						areaText="全国";
+					}
+					if((filterObj.addareacount.province!=0)&&(filterObj.addareacount.city==0)){
+						areaText=filterObj.addareacount.province+"个省级区域";
+					}
+					if((filterObj.addareacount.province==0)&&(filterObj.addareacount.city!=0)){
+						areaText=filterObj.addareacount.city+"个地市";
+					}
+					if((filterObj.addareacount.province!=0)&&(filterObj.addareacount.city!=0)){
+						areaText=filterObj.addareacount.province+"个省级区域、"+filterObj.addareacount.city+"个地市";
+					}
+				}else{
+					areaText="无";
+				}
+				$(".areaNum").text(areaText);
+	         	//行业
+	         	var industry_vip="";
+				industry_vip=filterObj.addbuyerclasscount+"个行业";
+				if(filterObj.addbuyerclasscount==0){
+					industry_vip="无";
+				}
+				if(filterObj.addbuyerclasscount==-1){
+					industry_vip="全行业";
+				}
+				$(".industryNum").text(industry_vip);
 	        }
-         }else{
-         	//升级订单 单独处理
-         	if(!$.isEmptyObject(filterObj.addarea)){
-              var cityNum_u=0;
-              var provinceNum_u=0;
-         	for(var i in filterObj.addarea) {
-                let citys_u=filterObj.addarea[i];
-                if (citys_u=="no"){
-                	$(".areaNum").text("无");
-                }else{
-                	 if (citys_u.length>0){
-	                	cityNum_u+=citys_u.length;
-	                }else{
-	                	provinceNum_u++;
-	                }
-	                var areaText_u="";//1个省级区域、4个地市
-	                if(provinceNum_u>0) areaText_u= areaText_u + provinceNum_u+"个省级区域";
-	                if(cityNum_u>0){
-	                  if(provinceNum_u>0) areaText_u= areaText_u+"、"
-	                  areaText_u = areaText_u+ cityNum_u+"个地市";
-	                }
-              		$(".areaNum").text(areaText_u);
-              	}
-              }
-         	}else {
-         		$(".areaNum").text("全国");
-         	}
-         	//行业
-         	if(filterObj.addindustry[0]=="no"){
-         		$(".industryNum").text("无");
-         	}else{
-         		if(filterObj.addindustry.length==0){
-         			$(".industryNum").text("全行业");
-         		}else{
-         			$(".industryNum").text(filterObj.addindustry.length+"个行业");
-         		}
-         	}
-
-//			if(filterObj.addindustry.length==0){
-//       		$(".industryNum").text("全行业");
-//          }else{
-//          	if(filterObj.addindustry[0]=="no"){
-//          		$(".industryNum").text("无");
-//          	}else{
-//          		$(".industryNum").text(filterObj.addindustry.length+"个行业");
-//          	}
-//          }
-         }
-          
-          
-          
         }
         
         //周期