Эх сурвалжийг харах

Merge branch 'release' into dev4.5.4

luwenna 4 жил өмнө
parent
commit
6bb4d81774
100 өөрчлөгдсөн 1224 нэмэгдсэн , 943 устгасан
  1. 2 0
      src/config.json
  2. 3 1
      src/jfw/front/dataExport.go
  3. 5 0
      src/jfw/front/front.go
  4. 1 1
      src/jfw/front/frontRouter.go
  5. 2 2
      src/jfw/front/pcIndex.go
  6. 25 0
      src/jfw/front/shorturl.go
  7. 40 23
      src/jfw/front/supsearch.go
  8. 89 52
      src/jfw/front/swordfish.go
  9. 4 1
      src/jfw/front/ws_dataExport.go
  10. 47 26
      src/jfw/modules/app/src/app/front/swordfish.go
  11. 4 1
      src/jfw/modules/app/src/app/front/ws_dataExport.go
  12. 1 0
      src/jfw/modules/app/src/config.json
  13. 61 4
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  14. 3 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js
  15. 20 0
      src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css
  16. 40 19
      src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js
  17. 13 25
      src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js
  18. 8 16
      src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js
  19. 17 1
      src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js
  20. 1 1
      src/jfw/modules/app/src/web/templates/_err.html
  21. 1 1
      src/jfw/modules/app/src/web/templates/active/explain.html
  22. 1 1
      src/jfw/modules/app/src/web/templates/active/pullnew/datapacket.html
  23. 1 1
      src/jfw/modules/app/src/web/templates/active/pullnew/helpfriends.html
  24. 1 1
      src/jfw/modules/app/src/web/templates/active/pullnew/index.html
  25. 1 1
      src/jfw/modules/app/src/web/templates/active/pullnew/invite.html
  26. 1 1
      src/jfw/modules/app/src/web/templates/app/update.html
  27. 12 12
      src/jfw/modules/app/src/web/templates/big-member/component_keywords_group.html
  28. 13 13
      src/jfw/modules/app/src/web/templates/big-member/component_set_area.html
  29. 12 12
      src/jfw/modules/app/src/web/templates/big-member/component_set_cate.html
  30. 12 12
      src/jfw/modules/app/src/web/templates/big-member/component_set_industry.html
  31. 13 13
      src/jfw/modules/app/src/web/templates/big-member/component_set_infotype.html
  32. 14 14
      src/jfw/modules/app/src/web/templates/big-member/component_set_money.html
  33. 12 12
      src/jfw/modules/app/src/web/templates/big-member/component_set_scope.html
  34. 1 1
      src/jfw/modules/app/src/web/templates/big-member/meta.html
  35. 21 21
      src/jfw/modules/app/src/web/templates/big-member/page_ai_add.html
  36. 14 14
      src/jfw/modules/app/src/web/templates/big-member/page_ai_balance.html
  37. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_ai_result.html
  38. 19 19
      src/jfw/modules/app/src/web/templates/big-member/page_ai_search.html
  39. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_ai_unit.html
  40. 13 13
      src/jfw/modules/app/src/web/templates/big-member/page_analysis_filter.html
  41. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_analysis_result.html
  42. 14 14
      src/jfw/modules/app/src/web/templates/big-member/page_analysis_search.html
  43. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_bid_balance.html
  44. 16 16
      src/jfw/modules/app/src/web/templates/big-member/page_bid_recharge.html
  45. 16 16
      src/jfw/modules/app/src/web/templates/big-member/page_bid_use_intro.html
  46. 14 14
      src/jfw/modules/app/src/web/templates/big-member/page_bigVip_detail.html
  47. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_big_subscribe.html
  48. 13 13
      src/jfw/modules/app/src/web/templates/big-member/page_bigvip_subreport_month.html
  49. 13 13
      src/jfw/modules/app/src/web/templates/big-member/page_bigvip_subreport_week.html
  50. 1 1
      src/jfw/modules/app/src/web/templates/big-member/page_bigvip_viewpage.html
  51. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_buy_commit.html
  52. 4 4
      src/jfw/modules/app/src/web/templates/big-member/page_contrast.html
  53. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_demo.html
  54. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_ent_follow.html
  55. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_ent_follow_search.html
  56. 60 87
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html
  57. 103 14
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait_change.html
  58. 17 17
      src/jfw/modules/app/src/web/templates/big-member/page_forecast_detail.html
  59. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_forecast_list.html
  60. 6 6
      src/jfw/modules/app/src/web/templates/big-member/page_free_contrast_trial.html
  61. 1 1
      src/jfw/modules/app/src/web/templates/big-member/page_full.html
  62. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_init.html
  63. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_land_setting.html
  64. 13 13
      src/jfw/modules/app/src/web/templates/big-member/page_landingPage.html
  65. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_landingPage_old.html
  66. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_main_root.html
  67. 6 6
      src/jfw/modules/app/src/web/templates/big-member/page_ontrial_commit.html
  68. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_ontrial_landingPage.html
  69. 4 4
      src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_aiForecastPack.html
  70. 3 3
      src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html
  71. 4 4
      src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_subAccount.html
  72. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_potential_cor.html
  73. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_potential_cor_list.html
  74. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html
  75. 15 15
      src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_list.html
  76. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_push_setting_detail.html
  77. 12 12
      src/jfw/modules/app/src/web/templates/big-member/page_push_settings.html
  78. 24 24
      src/jfw/modules/app/src/web/templates/big-member/page_report_detail_month.html
  79. 19 19
      src/jfw/modules/app/src/web/templates/big-member/page_report_detail_week.html
  80. 18 12
      src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html
  81. 16 16
      src/jfw/modules/app/src/web/templates/big-member/page_voucher_center.html
  82. 1 1
      src/jfw/modules/app/src/web/templates/common/nnc.html
  83. 1 1
      src/jfw/modules/app/src/web/templates/common/pnc.html
  84. 2 2
      src/jfw/modules/app/src/web/templates/commonPay/bidfile/bidfileDetail.html
  85. 1 1
      src/jfw/modules/app/src/web/templates/commonPay/checkout.html
  86. 11 11
      src/jfw/modules/app/src/web/templates/commonPay/integral/integralDetail.html
  87. 7 7
      src/jfw/modules/app/src/web/templates/commonPay/myOrder.html
  88. 1 1
      src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html
  89. 1 1
      src/jfw/modules/app/src/web/templates/commonPay/transferAccounts.html
  90. 1 1
      src/jfw/modules/app/src/web/templates/commonPay/transferAccountsResult.html
  91. 1 1
      src/jfw/modules/app/src/web/templates/course/applyInvoice.html
  92. 1 1
      src/jfw/modules/app/src/web/templates/course/course_detail.html
  93. 1 1
      src/jfw/modules/app/src/web/templates/course/course_list.html
  94. 1 1
      src/jfw/modules/app/src/web/templates/course/optionPay.html
  95. 1 1
      src/jfw/modules/app/src/web/templates/course/orderDetail.html
  96. 1 1
      src/jfw/modules/app/src/web/templates/course/payError.html
  97. 1 1
      src/jfw/modules/app/src/web/templates/course/paySuccess.html
  98. 1 1
      src/jfw/modules/app/src/web/templates/course/publicToPublic.html
  99. 1 1
      src/jfw/modules/app/src/web/templates/course/refund.html
  100. 1 1
      src/jfw/modules/app/src/web/templates/course/refundVerify.html

+ 2 - 0
src/config.json

@@ -220,6 +220,7 @@
         "count": 3,
         "timeout": 60,
         "totalPage": 10,
+        "percentage":80,
         "userIds": [
         ],
         "msg": "f 开关状态:%s //-2 从配置文件重置,-1 关闭,1 打开<br><br>c 并发数:%d //-2 不限制并发数,-1 无条件直接限制,>0 限制并发数<br><br>t 个人查询限制时间:%ds //-1 不限制<br><br>p 限制页数:%d"
@@ -286,6 +287,7 @@
     "uploadPath": "./web/staticres/upload/res/",
     "redisSessionLockSize":20,
     "accountMergeOnline":"2055-03-30 00:00:00",
+    "bidSearchOldUserLimit": 1626105600,
     "firstBindPop":3,
     "maxBindPop":111111111111115,
     "nsq":"192.168.3.240:4260",

+ 3 - 1
src/jfw/front/dataExport.go

@@ -366,6 +366,8 @@ func (d *DataExport) SuperSearchExport() error {
 	d.SetSession("Echo_hasWinnertel", reqData.Haswinnertel)
 
 	saveData := reqData.PassBidSearchExport()
+	saveData["selectType"] = strings.Join(jy.GetVipState(public.Mysql, public.MQFW, userId).
+		GetQueryItems(d.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
 	saveData["s_openid"] = openid
 	saveData["s_userid"] = userId
 	saveData["comeinfrom"] = "supersearchPage"
@@ -515,7 +517,7 @@ func (d *DataExport) PreviewData(source, _id string) error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
+	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错", res)
 		return d.Render("/pc/dataExport_noDataErr.html", &d.T)

+ 5 - 0
src/jfw/front/front.go

@@ -1276,6 +1276,11 @@ func (f *Front) LimitSearchText() {
 	if totalPage > 0 && public.Lst.Flag {
 		public.Lst.TotalPage = totalPage
 	}
+	//vip 大会员等用户 单独通道占比
+	percentage, _ := f.GetInteger("pct")
+	if percentage > 0 && public.Lst.Flag {
+		public.Lst.Percentage = percentage
+	}
 	f.Write("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\">" + fmt.Sprintf(public.Lst.Msg, status, public.Lst.Count, public.Lst.TimeOut, public.Lst.TotalPage))
 }
 

+ 1 - 1
src/jfw/front/frontRouter.go

@@ -171,7 +171,7 @@ func (this *CommonRouter) doPcBigPage(pageSign string) error {
 		}
 		if !bigVipFreePageReg.MatchString(pageSign) {
 			bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
-			if bigBaseMsg.Status <= 0 && !bigBaseMsg.Viper {
+			if bigBaseMsg.Status <= 0 && bigBaseMsg.Vip_BuySet.Upgrade != 1 {
 				return this.Redirect("/big/page/index")
 			}
 			//大会员页面权限判断

+ 2 - 2
src/jfw/front/pcIndex.go

@@ -151,7 +151,7 @@ func GetNewArticle(typ int) (list []map[string]interface{}) {
 	if l, ok := redis.Get("other", rediskey).([]interface{}); ok && l != nil && len(l) > 0 {
 		list = util.ObjArrToMapArr(l)
 	} else {
-		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", subtype, "", "", "", "", "", "", "", 1, bidsearch.SearchPageSize_PC, false, "", bidSearch_field_1)
+		_, _, lists := bidsearch.GetPcBidSearchData("", "", "", subtype, "", "", "", "", "", "", "", 1, bidsearch.SearchPageSize_PC, false, nil, bidSearch_field_1)
 		if lists != nil && len(*lists) > 5 {
 			*lists = (*lists)[0:6]
 			for _, v := range *lists {
@@ -415,7 +415,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 
 			} else {
 				//关键词
-				_, _, datas = bidsearch.GetPcBidSearchData(keywords, "", "", "", key_industry, "", "", "", "", "", "", 0, bidsearch.SearchPageSize_PC, false, "title", bidSearch_field_1)
+				_, _, datas = bidsearch.GetPcBidSearchData(keywords, "", "", "", key_industry, "", "", "", "", "", "", 0, bidsearch.SearchPageSize_PC, false, nil, bidSearch_field_1)
 				if datas != nil && len(*datas) > limitcount {
 					*datas = (*datas)[0:limitcount]
 				}

+ 25 - 0
src/jfw/front/shorturl.go

@@ -264,6 +264,31 @@ func (s *Short) Article(stype, id string) error {
 			}
 
 			s.T["obj"] = obj
+			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 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) != "" && from_userid != userId && util.ObjToString(obj["subtype"]) != "拟建" { //分享开打的
 				article_id := util.CommonDecodeArticle(stype, id)[0]
 				key := fmt.Sprintf("integral_article_%s_%s_%s", article_id, from_userid, userId)

+ 40 - 23
src/jfw/front/supsearch.go

@@ -113,7 +113,7 @@ func (p *Pcsearch) ProposedProject() error {
 	if len(s_word) > 0 {
 		status = 2
 		var count int64
-		count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, "", "", "", "", "", "", "", 0, bidsearch.SearchPageSize_PC, true, "", bidSearch_field_1)
+		count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, "", "", "", "", "", "", "", 0, bidsearch.SearchPageSize_PC, true, nil, bidSearch_field_1)
 		listSize := 0
 		if list != nil {
 			listSize = len(*list)
@@ -248,12 +248,7 @@ func (p *Pcsearch) PcSearchIndex() error {
 	//高级筛选 仅vip用户可查询
 	var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 	var buyerclass string = ""                    //采购单位类别
-	isPayedUser := jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser()
-	if isPayedUser {
-		buyerclass = p.GetString("buyerclass")
-		hasBuyerTel, hasWinnerTel = p.GetString("buyertel"), p.GetString("winnertel")
-	}
-	selectType := "title"
+	selectType := p.GetString("selectType")
 
 	//历史导出数据回显
 	if strings.Contains(p.Url(), "?goback") {
@@ -270,6 +265,19 @@ func (p *Pcsearch) PcSearchIndex() error {
 		hasWinnerTel = util.ObjToString(p.GetSession("Echo_hasWinnertel"))
 		industry = util.ObjToString(p.GetSession("Echo_industry"))
 	}
+	vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
+	isPayedUser := vipStatus.IsPayedUser()
+	queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
+	if isPayedUser {
+		buyerclass = p.GetString("buyerclass")
+		hasBuyerTel, hasWinnerTel = p.GetString("buyertel"), p.GetString("winnertel")
+	} else {
+		//时间自定义选择默认是vip 大会员 等权限
+		if len(strings.Split(publishtime, "_")) == 2 {
+			publishtime = ""
+		}
+	}
+
 	b_word, s_word := "", ""
 	if keywords != "" {
 		b_word, _, s_word = jy.InterceptSearchKW(keywords, false, len(industry) == 0)
@@ -281,30 +289,39 @@ func (p *Pcsearch) PcSearchIndex() error {
 	secondKWS := ""
 	if len(s_word) > 0 || len(industry) > 0 {
 		status = 2
-		count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, bidsearch.SearchPageSize_PC, true, selectType, bidSearch_field_1)
+		count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, bidsearch.SearchPageSize_PC, true, queryItems, bidSearch_field_1)
 		listSize := 0
 		if list != nil {
 			listSize = len(*list)
 		}
 		//所有的再次分词查询 只查标题
 		if len([]rune(s_word)) > 3 && int(count) < bidsearch.SearchPageSize_PC {
-			secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
-			findfields := `"title"`
-			qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(area, publishtime, subtype, "", buyerclass))
-			secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, 2*bidsearch.SearchPageSize_PC, 0, false)
-			if secRel != nil {
-				public.BidListConvert(industry, secRel)
-			}
-			if list != nil {
-				list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
-			} else {
-				list = secRel
+			secondSearch := false
+			for _, item := range queryItems {
+				if item == "title" {
+					secondSearch = true
+					break
+				}
 			}
-			if len(*secRel) > 0 {
-				if secondKWS != "" {
-					s_word += "+" + secondKWS
+			if secondSearch {
+				secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
+				findfields := `"title"`
+				qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(area, publishtime, subtype, "", buyerclass))
+				secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, 2*bidsearch.SearchPageSize_PC, 0, false)
+				if secRel != nil {
+					public.BidListConvert(industry, secRel)
+				}
+				if list != nil {
+					list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
+				} else {
+					list = secRel
+				}
+				if len(*secRel) > 0 {
+					if secondKWS != "" {
+						s_word += "+" + secondKWS
+					}
+					secondFlag = "T"
 				}
-				secondFlag = "T"
 			}
 		}
 		//		s_word = strings.Replace(s_word, "+", " ", -1)

+ 89 - 52
src/jfw/front/swordfish.go

@@ -120,10 +120,19 @@ func (m *Front) PcAjaxReq() {
 	var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 	var buyerclass string = ""                    //采购单位类别
 
-	if jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser() {
+	vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
+	isPayedUser := vipStatus.IsPayedUser()
+	queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
+	if isPayedUser {
 		buyerclass = m.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+	} else {
+		//时间自定义选择默认是vip 大会员 等权限
+		if len(strings.Split(publishtime, "_")) == 2 {
+			publishtime = ""
+		}
 	}
+
 	m.SetSession("selectType", selectType)
 	//只有前20条 有全字段,
 	if subtype != "拟建" && currentPage != 1 {
@@ -134,10 +143,9 @@ func (m *Front) PcAjaxReq() {
 		field = bidSearch_field
 	}
 
-	if selectType == "" {
-		selectType = "all"
-	}
-	b_word, a_word, s_word := jy.InterceptSearchKW(m.GetString("searchvalue"), selectType == "all", len(industry) == 0)
+	searchLimit := public.IsSearchLimit(queryItems)
+
+	b_word, a_word, s_word := jy.InterceptSearchKW(m.GetString("searchvalue"), searchLimit, len(industry) == 0)
 	var list *[]map[string]interface{}
 	var secondList []map[string]interface{}
 	var count, totalPage int64
@@ -150,13 +158,13 @@ func (m *Front) PcAjaxReq() {
 	if len(s_word) > 0 || len(industry) > 0 {
 		if reqType == "filter" {
 			if status == 1 {
-				count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, bidsearch.SearchPageSize_PC, true, selectType, field)
+				count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, bidsearch.SearchPageSize_PC, true, queryItems, field)
 			}
 		} else if reqType == "bidSearch" {
 			//全文检索限制
-			if selectType == "all" {
+			if searchLimit {
 				limitFlag = public.Lst.Flag
-				isLimit = public.Lst.IsLimited(m.Request, m.ResponseWriter, m.Session())
+				isLimit = public.Lst.IsLimited(m.Request, m.ResponseWriter, m.Session(), isPayedUser)
 				if isLimit == 1 { //没有被限制
 					defer public.Lst.Limit()
 				}
@@ -165,7 +173,7 @@ func (m *Front) PcAjaxReq() {
 				if limitFlag {
 					if start == 0 {
 						limit_count := public.Lst.TotalPage * bidsearch.SearchPageSize_PC
-						count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, limit_count, true, selectType, field)
+						count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, limit_count, true, queryItems, field)
 						if totalPage > int64(public.Lst.TotalPage) {
 							totalPage = int64(public.Lst.TotalPage)
 						}
@@ -174,31 +182,40 @@ func (m *Front) PcAjaxReq() {
 						}
 					}
 				} else {
-					count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, start, bidsearch.SearchPageSize_PC, true, selectType, field)
+					count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, start, bidsearch.SearchPageSize_PC, true, queryItems, field)
 				}
 				listSize := 0
 				if list != nil {
 					listSize = len(*list)
 				}
 				if len([]rune(s_word)) > 3 && int(count) < bidsearch.SearchPageSize_PC && start == 0 {
-					secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
-					findfields := `"title"`
-					qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(area, publishtime, subtype, "", buyerclass))
-					secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, 2*bidsearch.SearchPageSize_PC, 0, false)
-					if secRel != nil {
-						public.BidListConvert(industry, secRel)
-					}
-					if list != nil {
-						list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
-					} else {
-						list = secRel
+					secondSearch := false
+					for _, item := range queryItems {
+						if item == "title" {
+							secondSearch = true
+							break
+						}
 					}
-					if len(*secRel) > 0 {
-						if secondKWS != "" {
-							s_word += "+" + secondKWS
+					if secondSearch {
+						secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
+						findfields := `"title"`
+						qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(area, publishtime, subtype, "", buyerclass))
+						secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, 2*bidsearch.SearchPageSize_PC, 0, false)
+						if secRel != nil {
+							public.BidListConvert(industry, secRel)
+						}
+						if list != nil {
+							list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
+						} else {
+							list = secRel
+						}
+						if len(*secRel) > 0 {
+							if secondKWS != "" {
+								s_word += "+" + secondKWS
+							}
+							secondFlag = "T"
+							pcAjaxFlag = "T"
 						}
-						secondFlag = "T"
-						pcAjaxFlag = "T"
 					}
 				}
 				public.SaveUserSearchLog(m.Request, util.ObjToString(m.GetSession("userId")), -1, "pc", "超级搜索", map[string]interface{}{
@@ -438,15 +455,24 @@ func (m *Front) WxsearchlistPaging() {
 			var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 			var buyerclass string = ""                    //采购单位类别
 
-			if jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser() { //超级订阅、大会员、商机管理
+			vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
+			isPayedUser := vipStatus.IsPayedUser()
+			queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
+			if isPayedUser {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+			} else {
+				//时间自定义选择默认是vip 大会员 等权限
+				if len(strings.Split(publishtime, "_")) == 2 {
+					publishtime = ""
+				}
 			}
 
 			//全文检索限制
-			if selectType == "all" {
+			searchLimit := public.IsSearchLimit(queryItems)
+			if searchLimit {
 				limitFlag = public.Lst.Flag
-				isLimit = public.Lst.IsLimited(m.Request, m.ResponseWriter, m.Session())
+				isLimit = public.Lst.IsLimited(m.Request, m.ResponseWriter, m.Session(), isPayedUser)
 				if isLimit == 1 { //没有被限制
 					defer public.Lst.Limit()
 				}
@@ -455,40 +481,49 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
-						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_WX, selectType, filed)
+						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_WX, queryItems, filed)
 					}
 				} else {
-					list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, bidsearch.SearchPageSize_WX, selectType, filed)
+					list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, bidsearch.SearchPageSize_WX, queryItems, filed)
 				}
 				listSize := 0
 				if list != nil {
 					listSize = len(*list)
 				}
 				if len([]rune(s_word)) > 3 && listSize < bidsearch.SearchPageSize_WX && pageNum == 1 {
-					secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
-					findfields := `"title"`
-					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(scope, publishtime, subtype, "", buyerclass))
-					secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, filed, 0, 2*bidsearch.SearchPageSize_WX, 0, false)
-					if secRel != nil && len(*secRel) > 0 {
-						public.BidListConvert(industry, secRel)
-						for _, v := range *secRel {
-							v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
+					secondSearch := false
+					for _, item := range queryItems {
+						if item == "title" {
+							secondSearch = true
+							break
 						}
-						if list != nil {
-							list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
-						} else {
-							list = secRel
-						}
-						secondFlag = "T"
-						if len(*list) > bidsearch.SearchPageSize_WX && selectType == "title" {
-							secondList = (*list)[bidsearch.SearchPageSize_WX:]
-							if len(secondList) > bidsearch.SearchPageSize_WX {
-								secondList = secondList[:bidsearch.SearchPageSize_WX]
+					}
+					if secondSearch {
+						secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
+						findfields := `"title"`
+						qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(scope, publishtime, subtype, "", buyerclass))
+						secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, filed, 0, 2*bidsearch.SearchPageSize_WX, 0, false)
+						if secRel != nil && len(*secRel) > 0 {
+							public.BidListConvert(industry, secRel)
+							for _, v := range *secRel {
+								v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
+							}
+							if list != nil {
+								list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
+							} else {
+								list = secRel
 							}
-							*list = (*list)[:bidsearch.SearchPageSize_WX]
+							secondFlag = "T"
+							if len(*list) > bidsearch.SearchPageSize_WX && selectType == "title" {
+								secondList = (*list)[bidsearch.SearchPageSize_WX:]
+								if len(secondList) > bidsearch.SearchPageSize_WX {
+									secondList = secondList[:bidsearch.SearchPageSize_WX]
+								}
+								*list = (*list)[:bidsearch.SearchPageSize_WX]
+							}
+						} else {
+							secondKWS = ""
 						}
-					} else {
-						secondKWS = ""
 					}
 				}
 				public.SaveUserSearchLog(m.Request, util.ObjToString(m.GetSession("userId")), -1, "wx", "超级搜索", map[string]interface{}{
@@ -1969,6 +2004,7 @@ func (f *Front) HasPushHistory() {
 		Subtype:       f.GetString("subtype"),
 		Subscopeclass: f.GetString("subscopeclass"),
 		Key:           f.GetString("key"),
+		City:          f.GetString("city"),
 	}
 	hasNextPage, list := jy.SubscribePush.Datas(spqp)
 	if hasKeyFlag && len(list) == 0 && spqp.IsEmpty() && !isVipFlag {
@@ -2095,6 +2131,7 @@ func (f *Front) HistorypushPaging() error {
 			Subtype:       f.GetString("subtype"),
 			Subscopeclass: f.GetString("subscopeclass"),
 			Key:           f.GetString("key"),
+			City:          f.GetString("city"),
 		})
 		jy.SubscribePush.MakeCollection(userId, public.Mysql, list)
 		//		hasNextPage, list, _ := public.HistoryPush.Datas(userId, pageNum, firstPushTime, formatTime)

+ 4 - 1
src/jfw/front/ws_dataExport.go

@@ -7,6 +7,7 @@ import (
 	"jfw/config"
 	"jfw/jyutil"
 	"qfw/util/dataexport"
+	"qfw/util/jy"
 	"strconv"
 
 	"github.com/go-xweb/xweb"
@@ -202,7 +203,7 @@ func (w *WsDataExport) GetPreview() error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
+	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错")
 		return w.Render("/pc/dataExport_noDataErr.html", &w.T)
@@ -388,6 +389,8 @@ func (wd *WsDataExport) SearchExport() error {
 		SelectIds:    strings.TrimSpace(wd.GetString("selectIds")), //选择信息id
 	}
 	saveData := reqData.PassBidSearchExport()
+	saveData["selectType"] = strings.Join(jy.GetVipState(public.Mysql, public.MQFW, userId).
+		GetQueryItems(wd.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
 	saveData["s_openid"] = openid
 	saveData["s_userid"] = userId
 	saveData["comeinfrom"] = "supersearchPage"

+ 47 - 26
src/jfw/modules/app/src/app/front/swordfish.go

@@ -274,17 +274,27 @@ func (m *Front) WxsearchlistPaging() {
 			var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 			buyerclass := ""                              //采购单位类别
 
-			if jy.GetVipState(public.Mysql, public.MQFW, userid).IsPayedUser() {
+			vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userid)
+			isPayedUser := vipStatus.IsPayedUser()
+			queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
+			if isPayedUser {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+			} else {
+				//时间自定义选择默认是vip 大会员 等权限
+				if len(strings.Split(publishtime, "_")) == 2 {
+					publishtime = ""
+				}
 			}
+			//校验是否有大会员中标企业查询权限
 			if jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW).CheckBigVipBackPower("search") {
 				winner = m.GetString("winner")
 			}
 			//全文检索限制
-			if selectType == "all" {
+			searchLimit := public.IsSearchLimit(queryItems)
+			if searchLimit {
 				limitFlag = public.Lst.Flag
-				isLimit = public.Lst.IsLimited(m.Request, m.ResponseWriter, m.Session())
+				isLimit = public.Lst.IsLimited(m.Request, m.ResponseWriter, m.Session(), isPayedUser)
 				if isLimit == 1 { //没有被限制
 					defer public.Lst.Limit()
 				}
@@ -298,40 +308,49 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
-						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_APP, selectType, feld)
+						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_APP, queryItems, feld)
 					}
 				} else {
-					list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, pageNum, bidsearch.SearchPageSize_APP, selectType, feld)
+					list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, pageNum, bidsearch.SearchPageSize_APP, queryItems, feld)
 				}
 				listSize := 0
 				if list != nil {
 					listSize = len(*list)
 				}
 				if len([]rune(s_word)) > 3 && listSize < bidsearch.SearchPageSize_APP && pageNum == 1 {
-					secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
-					findfields := `"title"`
-					qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(scope, publishtime, subtype, winner, buyerclass))
-					secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, feld, 0, 2*bidsearch.SearchPageSize_APP, 0, false)
-					if secRel != nil && len(*secRel) > 0 {
-						public.BidListConvert(industry, secRel)
-						for _, v := range *secRel {
-							v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
-						}
-						if list != nil {
-							list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
-						} else {
-							list = secRel
+					secondSearch := false
+					for _, item := range queryItems {
+						if item == "title" {
+							secondSearch = true
+							break
 						}
-						secondFlag = "T"
-						if len(*list) > bidsearch.SearchPageSize_APP && selectType == "title" {
-							secondList = (*list)[bidsearch.SearchPageSize_APP:]
-							if len(secondList) > bidsearch.SearchPageSize_APP {
-								secondList = secondList[:bidsearch.SearchPageSize_APP]
+					}
+					if secondSearch {
+						secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
+						findfields := `"title"`
+						qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(scope, publishtime, subtype, winner, buyerclass))
+						secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, feld, 0, 2*bidsearch.SearchPageSize_APP, 0, false)
+						if secRel != nil && len(*secRel) > 0 {
+							public.BidListConvert(industry, secRel)
+							for _, v := range *secRel {
+								v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
+							}
+							if list != nil {
+								list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
+							} else {
+								list = secRel
 							}
-							*list = (*list)[:bidsearch.SearchPageSize_APP]
+							secondFlag = "T"
+							if len(*list) > bidsearch.SearchPageSize_APP && selectType == "title" {
+								secondList = (*list)[bidsearch.SearchPageSize_APP:]
+								if len(secondList) > bidsearch.SearchPageSize_APP {
+									secondList = secondList[:bidsearch.SearchPageSize_APP]
+								}
+								*list = (*list)[:bidsearch.SearchPageSize_APP]
+							}
+						} else {
+							secondKWS = ""
 						}
-					} else {
-						secondKWS = ""
 					}
 				}
 				public.SaveUserSearchLog(m.Request, util.ObjToString(m.GetSession("userId")), -1, "app", "超级搜索", map[string]interface{}{
@@ -446,6 +465,7 @@ func (f *Front) HasPushHistory() {
 		Subtype:       f.GetString("subtype"),
 		Subscopeclass: f.GetString("subscopeclass"),
 		Key:           f.GetString("key"),
+		City:          f.GetString("city"),
 	}
 	hasNextPage, list := jy.SubscribePush.Datas(spqp)
 	jy.SubscribePush.MakeCollection(userId, public.Mysql, list)
@@ -528,6 +548,7 @@ func (f *Front) HistorypushPaging() error {
 		PageNum:       pageNum,
 		SelectTime:    f.GetString("selectTime"),
 		Area:          f.GetString("area"),
+		City:          f.GetString("city"),
 		Buyerclass:    f.GetString("buyerclass"),
 		Subtype:       f.GetString("subtype"),
 		Subscopeclass: f.GetString("subscopeclass"),

+ 4 - 1
src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -9,6 +9,7 @@ import (
 	"log"
 	"qfw/util"
 	"qfw/util/dataexport"
+	"qfw/util/jy"
 	"qfw/util/redis"
 	"regexp"
 	"strconv"
@@ -65,7 +66,7 @@ func (w *WsDataExport) GetPreview() error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
+	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错")
 		return w.Render("/pc/dataExport_noDataErr.html", &w.T)
@@ -356,6 +357,8 @@ func (wd *WsDataExport) SearchExport() error {
 	}
 
 	saveData := reqData.PassBidSearchExport()
+	saveData["selectType"] = strings.Join(jy.GetVipState(public.Mysql, public.MQFW, userId).
+		GetQueryItems(wd.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
 	saveData["s_openid"] = openid
 	saveData["s_userid"] = userId
 	saveData["comeinfrom"] = "supersearchPage"

+ 1 - 0
src/jfw/modules/app/src/config.json

@@ -154,6 +154,7 @@
     "redisSessionLockSize":20,
     "nsq":"192.168.3.240:4260",
     "accountMergeOnline":"3333-03-30 00:00:00",
+	"bidSearchOldUserLimit": 1626105600,
     "firstBindPop":3,
     "maxBindPop":8,
     "bindPopRedis":"merge",

+ 61 - 4
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -1,6 +1,10 @@
 var vNode = {
     delimiters: ['${', '}'],
     el: '#ent-portrait',
+    components: {
+        vipComponent: vipComponent,
+        hisproComponent: hisproComponent
+    },
     data () {
         // 修改柱状条颜色为渐变色
         this.colorGreen = [new echarts.graphic.LinearGradient(
@@ -108,7 +112,14 @@ var vNode = {
                 vip: 0,
                 text: '开通',
                 btntext: '去开通'
-            }
+            },
+            entvisit: {
+                total: 0, // 本月画像次数总量
+                usage: 0, // 本月已使用次数
+                provin: 0, // 购买省份数量
+                visited: false // 是否查看中标信息
+            },
+            portrait:'winner'
         }
     },
     created: function () {
@@ -125,8 +136,8 @@ var vNode = {
         this.entInfo.id = eId
         this.entInfo.name = ''
         this.restore = this.reStoreState()
+        this.getPowerInfo()
         if (!this.restore) {
-            this.getPowerInfo()
             // 获取企业基本信息
             this.getEntBaseInfo()
         }
@@ -170,6 +181,13 @@ var vNode = {
                             _this.gotTab2 = true
                             console.log('获取企业中标动态...')
                         }
+                        if(_this.powerInfo.memberStatus <= 0) {
+                            // 不是大会员点击中标信息使用次数加一
+                            // if(!_this.entvisit.visited) {
+                            //     _this.entvisit.usage++
+                            //     _this.entvisit.visited = true
+                            // }
+                        }
                         _this.gotTab2 = true
                     }
                 });
@@ -184,9 +202,26 @@ var vNode = {
         setShow: function() {
             // 必须在tab2,并且三个权限都没有,就用显示
             return this.tabActiveName == '2' && !this.hasOnePower
+        },
+        // 查看次数为零,显示遮罩
+        getStatus: function () {
+            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited)
+        },
+        isMember () {
+          return this.powerInfo.memberStatus <= 0
+        },
+        isShowUpTip () {
+          return this.entvisit.provin == -1 ? false : !this.surplus
+        },
+        surplus: function () {
+            return this.entvisit.total > this.entvisit.usage
         }
     },
     methods: {
+        // 点击去开通记住tab栏下标
+        tabActive: function(data) {
+            this.savePageState()
+        },
         showToast: function (message) {
             this.$toast({
                 duration: 1500,
@@ -231,7 +266,7 @@ var vNode = {
                 entId: _this.entInfo.id
             }
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/winner'
 
             } else {
@@ -272,6 +307,25 @@ var vNode = {
                 }
             })
         },
+        // 企业画像访问量查询
+        getEntVisits: function() {
+            let _this = this
+            $.ajax({
+                type: "POST",
+                url: "/bigmember/portrait/subVipPortrait/usage",
+                data: {
+                    entId: _this.entInfo.id
+                },
+                success: function (res) {
+                    console.log(res)
+                    if(res.error_code == 0) {
+                        if(res.data) {
+                            _this.entvisit = res.data
+                        }
+                    }
+                }
+            });
+        },
         // 获取项目动态
         getProjectNews: function () {
             var _this = this
@@ -336,7 +390,7 @@ var vNode = {
         getEntBaseInfo: function () {
             var _this = this
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/entDetail'
             } else {
                 urls = '/bigmember/portrait/ent/detail'
@@ -450,6 +504,8 @@ var vNode = {
                             } else {
                                 _this.entInfo.followSearchFinish = true
                                 _this.entInfo.entExist = false
+                                _this.getEntVisits()
+                                _this.portrait = 'winnerVip'
                             }
                             _this.singleTab = false
                         }
@@ -948,6 +1004,7 @@ var vNode = {
                 Object.assign(this.topProject, $data.topProject || {})
                 Object.assign(this.entPortraitInfo, $data.entPortraitInfo || {})
                 Object.assign(this.powerInfo, $data.powerInfo || {})
+                Object.assign(this.entvisit, $data.entvisit || {})
                 this.singleTab = $data.singleTab
                 this.scrollTop = $data.scrollTop
                 this.gotTab2 = $data.gotTab2

+ 3 - 0
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -3,6 +3,9 @@ var pieChart = null;
 var vNode = {
     delimiters: ['${', '}'],
     el: '#unit_portrayal',
+    components: {
+      hisproComponent: hisproComponent
+    },
     data() {
         // 修改柱状条颜色为渐变色
         this.colorGreen = [new echarts.graphic.LinearGradient(

+ 20 - 0
src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -824,6 +824,26 @@ pre {
     border: 0.5px solid rgba(0, 0, 0, 0.05);
 }
 
+.collec_list{
+    display: flex;
+    align-items: center;
+    margin-top: .08rem;
+    width: 100%;
+    height: .4rem;
+}
+.collec_list .collec_tags{
+    margin-right: .08rem;
+    padding: .02rem .16rem;
+    background: rgba(5,166,243,0.05);
+    border-radius: 4px;
+    font-size: .24rem;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 500;
+    text-decoration: underline;
+    text-align: CENTER;
+    color: #05a6f3;
+}
+
 .buyerclass {}
 
 .type {}

+ 40 - 19
src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

@@ -3,7 +3,7 @@ var vm = new Vue({
   el: '#select-meau',
   components: {
     dateComponent: dateComponent,
-    areaComponent: areaComponent,
+    areaCityMobile: areaCityMobileComponent,
     industryComponent: industryComponent,
     cateComponent: cateComponent,
     keywordComponent: keywordComponent,
@@ -23,6 +23,8 @@ var vm = new Vue({
       },
       // 地区参数
       area: '',
+      // 城市
+      city: '',
       // 行业参数
       subscopeclass: '',
       // 采购单位
@@ -42,7 +44,7 @@ var vm = new Vue({
       },
       hasNextPage: false, // 是否有下一页
       selectCateList: [], // 选择的采购单位类型列表
-      selectAreaList: [], // 选择的地区列表
+      selectAreaList: {}, // 选择的地区列表
       selectIndustryList: [], // 选择的行业列表
       selectKeyWordList: [], // 选择的行业列表
       selectNoticeList: [], // 选择的公告类型列表
@@ -67,6 +69,8 @@ var vm = new Vue({
     }else {
       firstTime = this.time
     }
+  },
+  mounted () {
     var recover = this.recover()
     if (!recover) {
       setTimeout(() => {
@@ -97,7 +101,6 @@ var vm = new Vue({
       }, false);
     },
     recover: function () {
-      let _this = this
       var excludeKey = ['sessStorageKey']
       var $data = sessionStorage.getItem(this.sessStorageKey)
       if ($data) {
@@ -112,16 +115,15 @@ var vm = new Vue({
           // 时间
           console.log(res)
           if(res.time != '') {
-            console.log(this.selectDate)
             this.selectDate.startDate = res.time.split('_')[0] * 1000
             this.selectDate.endDate= res.time.split('_')[1] * 1000
           }
           // 地区
-          if(res.area != '') {
+          if(res.area || res.city) {
             setTimeout(() => {
+              this.$refs.areaCitySelector.setState(this.selectAreaList)
               $('.areaText').html(res.tagText.areaText)
-            })
-            this.selectAreaList = res.area.split(',')
+            }, 0)
           }
           // 采购单位类型
           if(res.buyerclass != '') {
@@ -159,6 +161,7 @@ var vm = new Vue({
     revorceData: function() {
       this.time = ''
       this.area = ''
+      this.city = ''
       this.subtype = ''
       this.subscopeclass = ''
       this.key = ''
@@ -166,6 +169,7 @@ var vm = new Vue({
     },
     revorceOtherData: function() {
       this.area = ''
+      this.city = ''
       this.subtype = ''
       this.subscopeclass = ''
       this.key = ''
@@ -246,15 +250,29 @@ var vm = new Vue({
             break
           }
         }
-        this.setToggle()
-        setTimeout(() => {
-          FTAGData(this.time, this.area, this.subscopeclass, this.buyerclass, this.key, this.subtype)
-        }, 500)
-        return
-      } else if(data.name === 'areaItem'){
-        $('.areaText').html(data.t)
-        this.tagText.areaText = data.t
-        this.area = data.data.join(',')
+      } else if(data.name === 'areaCityItem'){
+        var areaCityRes = data.data
+        var count = data.count
+        this.selectAreaList = areaCityRes
+        if (!areaCityRes || Object.keys(areaCityRes).length === 0) {
+          
+        } else {
+          var obj = {
+            p: [], // 省份全选
+            c: [] // 所有的市
+          }
+          for (var key in areaCityRes) {
+            if (areaCityRes[key].length === 0) {
+              obj.p.push(key)
+            } else {
+              obj.c = obj.c.concat(areaCityRes[key])
+            }
+          }
+          $('.areaText').text('地区 ' + count)
+          this.tagText.areaText = '地区 ' + count
+          this.area = obj.p.join(',')
+          this.city = obj.c.join(',')
+        }
       } else if(data.name === 'industryItem'){
         $('.industryText').html(data.t)
         this.tagText.industryText = data.t
@@ -278,6 +296,8 @@ var vm = new Vue({
           console.log('未初始化百度统计')
         }
         topay()
+      } else {
+        return console.log('暂无数据')
       }
       this.setToggle()
       setTimeout(()=>{
@@ -293,8 +313,9 @@ var vm = new Vue({
         this.selectDate.end = ''
         this.selectDate.exact = 'all'
         this.setTimer.datetimer = new Date().getTime()
-      } else if(data.name === 'areaItem'){
+      } else if(data.name === 'areaCityItem'){
         this.area = ''
+        this.city = ''
         $('.areaText').html('地区')
         this.setTimer.areatimer = new Date().getTime()
       } else if(data.name === 'industryItem'){
@@ -320,11 +341,11 @@ var vm = new Vue({
       }, 500)
     },
     getAjaXParams: function() {
-      ajaxFun(this.time, this.area, this.subscopeclass, this.buyerclass, this.key, this.subtype)
+      ajaxFun(this.time, this.area, this.city, this.subscopeclass, this.buyerclass, this.key, this.subtype)
     },
     setToggle: function() {
       this.$refs.dateItem.toggle(false)
-      this.$refs.areaItem.toggle(false)
+      this.$refs.areaCityItem.toggle(false)
       this.$refs.industryItem.toggle(false)
       this.$refs.cateItem.toggle(false)
       this.$refs.keywordItem.toggle(false)

+ 13 - 25
src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -134,7 +134,7 @@ var SuperSearch = {
     "searchvalue": "",
     "subtype": "",
     "scope": "",
-    "publishtime": "",
+    "publishtime": "lately-30",
     "selectType": "",
     "minprice":"",
     "maxprice":"",
@@ -787,11 +787,7 @@ var SuperSearch = {
       })
     });
     //返回时 是否显示table的查看更多
-    if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
-      SuperSearch.isTable(false);
-    }else{
-      SuperSearch.isTable(true);
-    }
+    SuperSearch.isTable($(".select-show-type-group").hasClass('is-table'));
   },
   recoveryPage: function(){
     $("#searchIndex").addClass("hidden");
@@ -813,7 +809,7 @@ var SuperSearch = {
       "searchvalue": "",
       "subtype": "",
       "scope": "",
-      "publishtime": "",
+      "publishtime": "lately-30",
       "selectType": "",
       "minprice":"",
       "maxprice":"",
@@ -964,11 +960,7 @@ var SuperSearch = {
       });
       //判断是否是table  (2.7.5table只显示20条数据)
       if(!sessionStorage.superSearch_showType){
-        if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
-          SuperSearch.isTable(false);
-        }else{
-          SuperSearch.isTable(true);
-        }
+        SuperSearch.isTable($(".select-show-type-group").hasClass('is-table'));
       }
       if(!hasNextPage){
         SuperSearch.noMoreData();
@@ -1134,11 +1126,11 @@ var SuperSearch = {
     // SuperSearch.reqParam.publishtime=SuperSearch.setPublishtime();
 
     //全文or标题
-    if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
-      SuperSearch.reqParam.selectType="title";
-    }else{
-      SuperSearch.reqParam.selectType="all";
-    }
+    // if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
+    //   SuperSearch.reqParam.selectType="title";
+    // }else{
+    //   SuperSearch.reqParam.selectType="all";
+    // }
     //采购单位行业
     var buyerclasstypes = "";
     $("#supersearchPage .choose_industry .industry_item.active").each(function(){
@@ -1268,7 +1260,7 @@ var SuperSearch = {
     SuperSearch.noMoreCache = false;
     SuperSearch.requesting = true;
     if(nw=="N"){
-      SuperSearch.reqParam.selectType ="title";
+      // SuperSearch.reqParam.selectType ="title";
       $(".newdialog .sub-search-title").find("li").removeClass("active");
       $(".selected-export .options .search-title").find("em").text("标题搜索");
       $(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
@@ -2009,7 +2001,7 @@ var SuperSearch = {
 //			}else if($("#supersearchPage .on").hasClass("showtable")){
 //				localStorage.superSearch_showType="showTable";
 //			}
-      sessionStorage.superSearch_showType=$(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal');
+      sessionStorage.superSearch_showType = $(".select-show-type-group").hasClass('is-table') ? 'showtable' : 'showlist'
 
       var shaxuanclass = $("#supersearchPage .jyshaxuan .icon-triangle-up").parent().attr("data-open");
       if(shaxuanclass){
@@ -2254,16 +2246,12 @@ var SuperSearch = {
   },
   showType: function(){
     if(sessionStorage.superSearch_showType=="showtable"){
-      $(".selected-export .show-list").find("em").text("表格显示");
-      $(".newdialog .sub-show-list").find("li[dataval='showtable']").addClass("active");
-//			$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
+      $(".select-show-type-group").addClass('is-table')
       $("#supersearchPage #wrapper #table").removeClass("hidden");
       $("#supersearchPage #wrapper #list").addClass("hidden");
       SuperSearch.isTable(true);
     }else{
-      $(".selected-export .show-list").find("em").text("列表显示");
-      $(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
-//			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
+      $(".select-show-type-group").removeClass('is-table')
       $("#supersearchPage #wrapper #table").addClass("hidden");
       $("#supersearchPage #wrapper #list").removeClass("hidden");
       SuperSearch.isTable(false);

+ 8 - 16
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -518,11 +518,7 @@ var SuperSearch = {
 		});
 		SuperSearch.initMobiscroll();
 		//返回时 是否显示table的查看更多
-		if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
-			SuperSearch.isTable(false);
-		}else{
-			SuperSearch.isTable(true);
-		}
+    SuperSearch.isTable($(".select-show-type-group").hasClass('is-table'));
 	},
 	recoveryPage: function(){
 		$("#supersearchPage .inputDiv").addClass("hidden")
@@ -677,11 +673,7 @@ var SuperSearch = {
 		});
 		//判断是否是table  (2.7.5table只显示20条数据)
 		if(!sessionStorage.superSearch_showType){
-			if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
-				SuperSearch.isTable(false);
-			}else{
-				SuperSearch.isTable(true);
-			}
+      SuperSearch.isTable($(".select-show-type-group").hasClass('is-table'));
 		}
 		if(!hasNextPage){
 			SuperSearch.noMoreData();
@@ -817,11 +809,11 @@ var SuperSearch = {
 		SuperSearch.reqParam.publishtime=SuperSearch.setPublishtime();
 
 		//全文or标题
-		if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
-			SuperSearch.reqParam.selectType="title";
-		}else{
-			SuperSearch.reqParam.selectType="all";
-		}
+		// if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
+		// 	SuperSearch.reqParam.selectType="title";
+		// }else{
+		// 	SuperSearch.reqParam.selectType="all";
+		// }
 		return true;
 	},
 	//行为采集 type=1 搜索、type=2 显示列表次数统计
@@ -913,7 +905,7 @@ var SuperSearch = {
 		SuperSearch.noMoreCache = false;
 		SuperSearch.requesting = true;
 		if(nw=="N"){
-			SuperSearch.reqParam.selectType ="title";
+			// SuperSearch.reqParam.selectType ="title";
 			$(".newdialog .sub-search-title").find("li").removeClass("active");
 			$(".selected-export .options .search-title").find("em").text("标题搜索");
 			$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");

+ 17 - 1
src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -106,7 +106,13 @@ var mine = {
             var url = $(this).attr('data-href')
             autoLogin(url)
         })
-        // 企业关注
+        // 企业画像记录
+        $('.ent-follow-history').on('click', function (e) {
+          setLiActive(e.currentTarget)
+          var url = $(this).attr('data-href')
+            autoLogin(url)
+        })
+        // 企业查询
         $('.ent-search').on('click', function (e) {
             setLiActive(e.currentTarget)
             var url = $(this).attr('data-href')
@@ -217,6 +223,16 @@ var mine = {
                     if (res.data.memberStatus != null || res.data.memberStatus != undefined) {
                         pageUserInfo.bigMemberStatus = res.data.memberStatus
                     }
+                    if (res.data.memberStatus <= 0) {
+                      // 大会员和免费用户不显示企业画像记录菜单
+                      if(res.data.vipStatus > 0 && res.data.viper ) {
+                        $('.ent-follow-history').show()
+                      } else {
+                        $('.ent-follow-history').hide()
+                      }
+                    } else {
+                      $('.ent-follow-history').hide()
+                    }
                     if ($.isArray(res.data.power)) {
                         pageUserInfo.power = res.data.power
                     }

+ 1 - 1
src/jfw/modules/app/src/web/templates/_err.html

@@ -6,7 +6,7 @@
 <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
 <link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/rem.js" type="text/javascript" charset="utf-8"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
 <style>

+ 1 - 1
src/jfw/modules/app/src/web/templates/active/explain.html

@@ -7,7 +7,7 @@
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/explain.css?v={{Msg "seo" "version"}}">
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	{{include "/common/js.html"}}
 </head>
 <body>

+ 1 - 1
src/jfw/modules/app/src/web/templates/active/pullnew/datapacket.html

@@ -7,7 +7,7 @@
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/datapacket.css?v={{Msg "seo" "version"}}">
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	{{include "/common/js.html"}}
 </head>
 <body>

+ 1 - 1
src/jfw/modules/app/src/web/templates/active/pullnew/helpfriends.html

@@ -7,7 +7,7 @@
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/helpfriends.css?v={{Msg "seo" "version"}}">
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>
 	{{include "/common/js.html"}}
 </head>

+ 1 - 1
src/jfw/modules/app/src/web/templates/active/pullnew/index.html

@@ -7,7 +7,7 @@
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/index.css?v={{Msg "seo" "version"}}">
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	{{include "/common/js.html"}}
 </head>
 <body>

+ 1 - 1
src/jfw/modules/app/src/web/templates/active/pullnew/invite.html

@@ -5,7 +5,7 @@
     <title>资料包限时免费领</title>
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/active/pullnew/css/invite.css?v={{Msg "seo" "version"}}">
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	{{include "/common/js.html"}}
 </head>
 <body>

+ 1 - 1
src/jfw/modules/app/src/web/templates/app/update.html

@@ -3,7 +3,7 @@
 	{{include "/common/meta.html"}}
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 	<link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-	<script src="/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}" type="text/javascript" charset="utf-8"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js" type="text/javascript" charset="utf-8"></script>
   <script src="/jyapp/js/rem.js" type="text/javascript" charset="utf-8"></script>
 
 	<title>去更新</title>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/component_keywords_group.html

@@ -1,10 +1,10 @@
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 <link rel="stylesheet"
     href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/keywords_group.css?v={{Msg "seo" "version"}}' />
 
@@ -245,14 +245,14 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/keywords_group.js?v={{Msg "seo" "version"}}'></script>

+ 13 - 13
src/jfw/modules/app/src/web/templates/big-member/component_set_area.html

@@ -1,10 +1,10 @@
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 <link rel="stylesheet"
     href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/set_area_industry_cate.css?v={{Msg "seo" "version"}}' />
 
@@ -27,7 +27,7 @@
                         <div class="index-anchor" :id="key" :data-index="key" v-if="key !== '#'">${ key }</div>
                         <div v-for="(province, ii) in item" :key="ii*2">
                             <div class="province-item bg-white tab_content" v-if="province.name == '全国'">
-                                <button 
+                                <button
                                     class="j-button-item"
                                     :class="province.selectedState ? 'active': ''"
                                     @click="changeCityState(province, '#')">${province.name}</button>
@@ -80,15 +80,15 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/mapJSON.js'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/set_area.js?v={{Msg "seo" "version"}}'></script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/component_set_cate.html

@@ -1,10 +1,10 @@
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/vant-reset.css?v={{Msg "seo" "version"}}' />
 <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/set_area_industry_cate.css?v={{Msg "seo" "version"}}' />
 
@@ -66,14 +66,14 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/set_cate.js?v={{Msg "seo" "version"}}'></script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/component_set_industry.html

@@ -1,10 +1,10 @@
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 <link rel="stylesheet"
     href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/set_area_industry_cate.css?v={{Msg "seo" "version"}}' />
 
@@ -47,14 +47,14 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/set_industry.js?v={{Msg "seo" "version"}}'></script>

+ 13 - 13
src/jfw/modules/app/src/web/templates/big-member/component_set_infotype.html

@@ -1,10 +1,10 @@
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/vant-reset.css?v={{Msg "seo" "version"}}' />
 <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/set_area_industry_cate.css?v={{Msg "seo" "version"}}' />
 
@@ -40,7 +40,7 @@
                                 :class="iitem.selected ? 'active': ''"
                                 @click="changeInfoTypeState(iitem)"
                                 >${iitem.name}</button>
-                                
+
                         </div>
                     </li>
                 </ul>
@@ -54,14 +54,14 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/set_infotype.js?v={{Msg "seo" "version"}}'></script>

+ 14 - 14
src/jfw/modules/app/src/web/templates/big-member/component_set_money.html

@@ -1,16 +1,16 @@
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 <style>
     .all{
         padding: .3rem .32rem;
         border-bottom: 1px solid rgba(0, 0, 0, 0.05);;
     }
-    .all > span{ 
+    .all > span{
         display: inline-block;
         min-width: 1.58rem;
         height: .72rem;
@@ -21,7 +21,7 @@
         background: #F4F4F9;
         border-radius: 4px;
     }
-    
+
     .connect-title{
         font-size: .26rem;
         color: #686868;
@@ -109,14 +109,14 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/set_money.js?v={{Msg "seo" "version"}}'></script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/component_set_scope.html

@@ -1,10 +1,10 @@
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-<link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+<link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 <link rel="stylesheet"
     href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/keywords_group.css?v={{Msg "seo" "version"}}' />
 
@@ -182,14 +182,14 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/set_scope.js?v={{Msg "seo" "version"}}'></script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/meta.html

@@ -13,7 +13,7 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 <meta name="format-detection" content="telephone=no">
 <link rel="icon" href="/favicon.ico">
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/jquery-3.2.1.min.js'></script>
+<script src='https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js'></script>
 <script src="https://cdn-common.jianyu360.com/cdn/lib/loadjs/4.2.0/dist/loadjs.umd.js"></script>
 <script>
   if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }

+ 21 - 21
src/jfw/modules/app/src/web/templates/big-member/page_ai_add.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>中标企业预测</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
 
     <!--小于100行的样式插入html而不是css,有助于减少请求数-->
@@ -216,7 +216,7 @@
 <div class="j-container">
     {{include "/big-member/header.html"}}
     <div class="j-main add-main" id="ai-add" v-cloak>
-        
+
         <div class="j-container">
             <div class="j-main">
                 <div class="name">${project.pName}</div>
@@ -292,21 +292,21 @@
             </div>
         </van-dialog>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/area.js?v={{Msg "seo" "version"}}'></script>
@@ -321,7 +321,7 @@
                 id: "",
                 newInfoId: ''
             },
-            
+
             maxLength: 5,
             currentInfo: {
                 purchase: []
@@ -432,7 +432,7 @@
                                 that.readyTime = new Date().getTime();
                                 that.searchStatus(); // 5s查询一次状态
                             } else if(res.data.status === -1){
-                                that.$dialog({ 
+                                that.$dialog({
                                     width: 303,
                                     className: 'custom-dialog',
                                     title: '温馨提示',
@@ -535,7 +535,7 @@
                     if (that.timeDiff(that.readyTime) >= 120){
                         that.$toast.clear();
                         clearInterval(that.timer)
-                        that.$dialog({ 
+                        that.$dialog({
                             width: 303,
                             className: 'custom-dialog',
                             title: '温馨提示',
@@ -555,7 +555,7 @@
                                     if (!res.data.success){
                                         clearInterval(that.timer);
                                         that.$toast.clear();
-                                        that.$dialog({ 
+                                        that.$dialog({
                                             width: 303,
                                             className: 'custom-dialog',
                                             title: '温馨提示',
@@ -707,13 +707,13 @@
                                 } else {
                                     that.result.province = str == '' ? '' : key;
                                 }
-                                // that.result.province = str == '' ? '' : key; 
+                                // that.result.province = str == '' ? '' : key;
                                 that.result.city = that.formatterCity(data[key]) == key ? '' : str; // 如果城市等于省份(直辖市),则不显示城市
                                 if (str == '' && !reg.test(key)) { // 如果城市为空且省份不是直辖市的话 显示默认数据
                                     that.formData.area = "选择省市"
                                 } else {
                                     if(reg.test(key)) {
-                                        that.formData.area = key + '市' 
+                                        that.formData.area = key + '市'
                                     } else {
                                         that.formData.area = key + ' ' + that.result.city;
                                     }
@@ -727,7 +727,7 @@
                         }
                         break;
                 }
-                
+
             },
             // 只处理市
             formOnlyCity: function(data) {

+ 14 - 14
src/jfw/modules/app/src/web/templates/big-member/page_ai_balance.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>中标企业预测-余额</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
     <style>
         .j-main{
@@ -136,7 +136,7 @@
 </head>
 <body>
 <div class="j-container">
-    {{include "/big-member/header.html"}} 
+    {{include "/big-member/header.html"}}
     <div class="j-main" id="ai-balance" v-cloak>
         <div class="bg">
             <div>
@@ -171,21 +171,21 @@
             </div>
         </div>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <!--小于100行同css,减少请求数-->

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_ai_result.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>中标企业预测</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
 
     <!--小于100行的样式插入html而不是css,有助于减少请求数-->
@@ -294,18 +294,18 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>

+ 19 - 19
src/jfw/modules/app/src/web/templates/big-member/page_ai_search.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>中标企业预测</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
 
     <!--小于100行的样式插入html而不是css,有助于减少请求数-->
@@ -158,7 +158,7 @@
                 <div class="balance">
                     <div class="balance-remind">您的AI中标预测次数余额:<span class="balance-count">${surplus}</span></div>
                     <div class="go-recharge" v-if="!isSubCount && isBigMember">
-                        <span @click="location.href= './ai_balance'">充值</span>   
+                        <span @click="location.href= './ai_balance'">充值</span>
                         <i class="van-icon van-icon-arrow van-cell__right-icon"></i>
                     </div>
                 </div>
@@ -195,21 +195,21 @@
             </div>
         </div>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <!--小于100行同css,减少请求数-->
@@ -271,7 +271,7 @@
             // 进入页面先查询有无正在预测的项目
             searchPredicting: function(){
                 var that = this;
-                var data = { 
+                var data = {
                     pname: '',
                     infoid: '',
                     id: '',
@@ -308,7 +308,7 @@
                                 that.searchStatus()
                             } else if (res.data.status === -1) {
                                 // that.$toast('预测失败')
-                                that.$dialog({ 
+                                that.$dialog({
                                     width: 303,
                                     className: 'custom-dialog',
                                     title: '温馨提示',
@@ -463,7 +463,7 @@
                         that.$toast.clear();
                         clearInterval(that.timer)
                         // that.$toast('预测失败')
-                        that.$dialog({ 
+                        that.$dialog({
                             width: 303,
                             className: 'custom-dialog',
                             title: '温馨提示',
@@ -485,7 +485,7 @@
                                         clearInterval(that.timer);
                                         that.$toast.clear();
                                         // that.$toast('预测失败')
-                                        that.$dialog({ 
+                                        that.$dialog({
                                             width: 303,
                                             className: 'custom-dialog',
                                             title: '温馨提示',
@@ -509,7 +509,7 @@
                             }
                         })
                     }
-                    
+
                 }, 5000)
             },
             // 预测失败  关闭预测 防止下次进入继续查

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_ai_unit.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>中标企业预测</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
     <style>
         .j-main{
@@ -131,18 +131,18 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <!--小于100行同css,减少请求数-->

+ 13 - 13
src/jfw/modules/app/src/web/templates/big-member/page_analysis_filter.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>投标决策分析</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
 
     <!--小于100行的样式插入html而不是css,有助于减少请求数-->
@@ -104,18 +104,18 @@
             </div>
         </div>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/analysis_filter.js?v={{Msg "seo" "version"}}'></script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_analysis_result.html

@@ -5,16 +5,16 @@
     {{include "/big-member/meta.html"}}
     <title>投标决策分析</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css>
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css>
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/analysis_result.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
@@ -273,9 +273,9 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js />
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js />
 <!--E-必定需要预加载的资源-->
@@ -284,9 +284,9 @@
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js></script>
 <!--E-当前页面的资源-->

+ 14 - 14
src/jfw/modules/app/src/web/templates/big-member/page_analysis_search.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>投标决策分析</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
 
     <!--小于100行的样式插入html而不是css,有助于减少请求数-->
@@ -165,21 +165,21 @@
             </ul>
         </div>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <!--小于100行同css,减少请求数-->
@@ -252,7 +252,7 @@
                         }
                     }
                 }
-                
+
                 if(this.historyList == null){
                     this.historyList = []
                 }

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_bid_balance.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>招标文件解读-余额</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
     <style>
         .j-main{
@@ -185,18 +185,18 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <!--小于100行同css,减少请求数-->

+ 16 - 16
src/jfw/modules/app/src/web/templates/big-member/page_bid_recharge.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>充值中心</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
     <style>
         .box-container{
@@ -135,7 +135,7 @@
 </head>
 <body>
 <div class="j-container">
-    {{include "/big-member/header.html"}} 
+    {{include "/big-member/header.html"}}
     <div class="j-main" id="bid-recharge" v-cloak>
         <div class="j-container">
             <div class="j-main">
@@ -155,7 +155,7 @@
                         <li><em>2.</em> 招标文件解读包是虚拟产品,购买后无法退款或转让,请确认后下单。</li>
                     </ol>
                 </div>
-            </div> 
+            </div>
             <div class="j-footer">
                 <div class="total">
                     <div class="total-label">合计:</div>
@@ -174,7 +174,7 @@
                     <button class="j-button-confirm" :disabled="isConfirm" @click="confirmOrder">提交订单</button>
                 </div>
             </div>
-        </div> 
+        </div>
         <van-popup v-model="showPopup" closeable close-icon="clear" round  position="bottom" >
             <div class="buy-modal">
                 <div class="modal-title">
@@ -189,21 +189,21 @@
             </div>
         </van-popup>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <!--小于100行同css,减少请求数-->

+ 16 - 16
src/jfw/modules/app/src/web/templates/big-member/page_bid_use_intro.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>剑鱼标讯大会员</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
     <style>
         .j-main{
@@ -39,7 +39,7 @@
 </head>
 <body>
 <div class="j-container">
-    {{include "/big-member/header.html"}} 
+    {{include "/big-member/header.html"}}
     <div class="j-main" id="bid_user_info" v-cloak>
         <div class="j-container">
             <div class="j-main">
@@ -48,18 +48,18 @@
                 <div v-if="!isChild" class="sub-title">-  请前往剑鱼标讯网页端进行使用  -</div>
                 <div class="sub-title">www.jianyu360.com</div>
             </div>
-        </div> 
+        </div>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 {{include "/common/baiducc.html"}}
@@ -78,7 +78,7 @@
         methods: {}
     }
     new Vue(vNode)
-    
+
 </script>
 </body>
 </html>

+ 14 - 14
src/jfw/modules/app/src/web/templates/big-member/page_bigVip_detail.html

@@ -7,17 +7,17 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_bigVip_detail.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页必定需要预加载的资源-->
 
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_bigVip_detail.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
 </head>
@@ -130,14 +130,14 @@
         <!--S-Vue-->
     </div>
 
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script> 
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script> 
-    <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script> 
-    <script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script> 
-    {{include "/big-member/commonjs.html"}} 
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
+    {{include "/big-member/commonjs.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/bigvip_detail.js?v={{Msg "seo" "version"}}'></script>
     {{include "/common/baiducc.html"}}
 </body>
-</html>
+</html>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_big_subscribe.html

@@ -7,16 +7,16 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_big_subscribe.css' />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_big_subscribe.css?v={{Msg "seo" "mod_version"}}' />
     <!--E-当前页面的css资源-->
 </head>
@@ -128,18 +128,18 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/big_subscribe.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/baiducc.html"}}

+ 13 - 13
src/jfw/modules/app/src/web/templates/big-member/page_bigvip_subreport_month.html

@@ -7,15 +7,15 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_bigvip_subreport_month.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
 </head>
@@ -73,7 +73,7 @@
                             :min-date="minDate"
                             :max-date="maxDate"
                             />
-    
+
                     </div>
                     <div class="j-footer">
                         <div class="j-button-group">
@@ -127,13 +127,13 @@
     </div>
 </div>
 
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script> 
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
 
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script> 
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script> 
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script> 
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/bigvip_subreport_month.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/baiducc.html"}}

+ 13 - 13
src/jfw/modules/app/src/web/templates/big-member/page_bigvip_subreport_week.html

@@ -7,15 +7,15 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_bigvip_subreport_week.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
 </head>
@@ -73,7 +73,7 @@
                             :min-date="minDate"
                             :max-date="maxDate"
                             />
-    
+
                     </div>
                     <div class="j-footer">
                         <div class="j-button-group">
@@ -127,13 +127,13 @@
     </div>
 </div>
 
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script> 
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
 
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script> 
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script> 
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script> 
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/bigvip_subreport_week.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/baiducc.html"}}

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_bigvip_viewpage.html

@@ -8,7 +8,7 @@
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/p13.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/rem.js"></script>
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/dropload.js"></script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>
     <script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_buy_commit.html

@@ -7,17 +7,17 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/buy_commit.css?v={{Msg "seo" "version"}}" />
     <!--E-当前页必定需要预加载的资源-->
 
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/buy_commit.css?v={{Msg "seo" "version"}}" />
     <!--E-当前页面的css资源-->
     <style>
@@ -184,18 +184,18 @@
     </div>
 
     <!--S-必定需要预加载的资源-->
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js />
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js />
 
         <!--S-有可能需要提前预加载的资源
         -->
     <!--E-有可能需要提前预加载的资源-->
 
     <!--S-当前页面的资源-->
-    <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js></script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
     {{include "/big-member/commonjs.html"}}
     <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 <!--E-当前页面的资源-->

+ 4 - 4
src/jfw/modules/app/src/web/templates/big-member/page_contrast.html

@@ -7,13 +7,13 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_contrast.css' />
 
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_contrast.css' />
     <!--E-当前页面的css资源-->
     <style>
@@ -173,14 +173,14 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_demo.html

@@ -7,15 +7,15 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
 </head>
 <body>
@@ -52,15 +52,15 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/demo.js?v={{Msg "seo" "version"}}'></script>
 

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_ent_follow.html

@@ -7,15 +7,15 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/ent_follow.css?v={{Msg "seo" "mod_version"}}' />
     <!--E-当前页面的css资源-->
 </head>
@@ -95,15 +95,15 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/ent_follow.js?v={{Msg "seo" "mod_version"}}'></script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_ent_follow_search.html

@@ -7,15 +7,15 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!-- <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/ent_follow_search.css?v={{Msg "seo" "version"}}' /> -->
     <!--E-当前页面的css资源-->
     <style>
@@ -99,15 +99,15 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/ent_follow_search.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/baiducc.html"}}

+ 60 - 87
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -7,10 +7,11 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/vant-reset.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/ent_portrait.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
@@ -32,86 +33,27 @@
         color: #fb483d;
         line-height: 0.4rem;
     }
+    .bid_surplus{
+        height: .04rem;
+        opacity: 1;
+        font-size: .22rem;
+        font-weight: 500;
+        color: #2abed1;
+    }
     .vip_openDialog{
         padding: 0.56rem 0 0.64rem;
-        height: 7.4rem;
+        width: 6.06rem;
+        /* height: 6.88rem; */
         background: url('{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/image/openVip.png') no-repeat;
-        background-size: contain;
-        top: 53%;
-    }
-    .vip_openDialog .van-dialog__content{
-        /* height: 6.04rem; */
-        padding: 0;
-    }
-    .vip_openDialog .van-dialog__content .vip_head{
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        width: 100%;
-        font-size: 0.32rem;
-        font-weight: 400;
-        text-align: CENTER;
-        color: #ffffff;
-        line-height: 0.48rem;
-    }
-    .vip_openDialog .van-dialog__content .vip_content{
-        display: flex;
-        flex-direction: column;
-        margin-top: 0.88rem;
-        width: 100%;
-        font-size: 0.28rem;
-        font-weight: 400;
-        text-align: CENTER;
-        color: #686868;
-        line-height: 0.44rem;
-        text-shadow: 0px 0px 28px 0px rgba(0,0,0,0.08); 
-    }
-    .vip_openDialog .van-dialog__content .vip_head .vip_extend{
-        font-size: 0.26rem;
-    }
-    .vipOverlay.van-overlay{
-        height: 85%;
-        background-color: rgba(255,255,255,0);
-        backdrop-filter: blur(5px);
-        top: 4.4rem;
-    }
-    .vip_openDialog .van-dialog__footer{
-        margin-top: 0.48rem;
-        padding: 0 0.62rem;
-        display: flex;
-        justify-content: space-between;
-        overflow: initial;
-    }
-    .vip_openDialog .van-hairline--top::after{
-        border-top-width: 0;
-    }
-    .vip_openDialog .van-button.van-button--default{
-        flex: none;
-        width: 2.16rem;
-        height: 0.72rem;
-        font-size: 0.32rem;
-        font-weight: 400;
-        text-align: CENTER;
-        color: #fff;
-        background: #2cb7ca;
-        border-radius: 0.12rem;
-        box-shadow: 0px 0px 0.56rem 0px rgba(0,0,0,0.08);
-    }
-    .vip_openDialog .van-button.van-button--default.van-dialog__cancel{
-        font-size: 0.32rem;
-        font-weight: 400;
-        text-align: CENTER;
-        color: #5f5e64;
-        background: #ffffff;
-        border: 1px solid rgba(0,0,0,0.10);
-        border-radius: 0.14rem;
+        background-size: 100% 100%;
+        box-sizing: border-box;
     }
 </style>
 <body>
 <div class="j-container">
     {{include "/big-member/header.html"}}
     <div id="ent-portrait" class="j-main" v-cloak>
-        <van-dialog
+        <!-- <van-dialog
         v-model="setShow"
         show-cancel-button
         width="6.06rem"
@@ -134,7 +76,7 @@
                 <span>市场区域分布</span>
                 <span>...</span>
             </div>
-        </van-dialog>
+        </van-dialog> -->
         <div class="j-header ent-header">
             <span class="j-icon icon-company"></span>
             <span class="ent-title">${ entInfo.name }</span>
@@ -244,7 +186,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="bg-white tab-card ent-change-history" @click="goToEntHistory" v-if="!svip && conf._12">
+                <div class="bg-white tab-card ent-change-history" @click="goToEntHistory">
                     <div class="ent-change-l">企业情报历史记录</div>
                     <div class="j-icon icon-back base-icon"></div>
                 </div>
@@ -252,9 +194,10 @@
             <van-tab name="2" v-if="!singleTab">
                 <template #title>
                     <span :class="{bidinfo:!hasOnePower}">中标信息</span>
-                    <span v-if="!hasOnePower" class="bid_upgrade">升级</span>
+                    <span v-if="!hasOnePower && isShowUpTip" class="bid_upgrade">升级</span>
+                    <span v-if="isMember && (hasOnePower && surplus && isVip)" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
                 </template>
-                <div class="bg-white tab-card" v-if="conf._4">
+                <div class="bg-white tab-card" v-if="conf._4 && !getStatus">
                     <div class="card-row zb-info">
                         <div class="card-column">
                             <div class="ent-info-label">项目数量</div>
@@ -280,7 +223,8 @@
                         <span>${entPortraitInfo.timeRangeEnd ? new Date(entPortraitInfo.timeRangeEnd * 1000).pattern('yyyy/MM/dd') : '至今'}</span>
                     </div>
                 </div>
-                <div class="j-container empty" v-if="conf._13 && !conf._4 && topProject.list.length === 0">
+                <div class="vip_component" v-if="getStatus" style="height:2.12rem;background:url('/common-module/collection/image/bg/vip_bg_0.png') no-repeat;background-size:100% 100%"></div>
+                <div class="j-container empty" style="padding-bottom: .2rem;" v-if="conf._13 && !conf._4 && topProject.list.length === 0">
                     <div class="j-img img-empty empty-img"></div>
                     <p class="empty-text">暂无项目动态</p>
                 </div>
@@ -310,7 +254,16 @@
                         </ul>
                     </div>
                 </div>
-                <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && annualData.rows.length !== 0">
+                <div class="vip_component" v-if="getStatus && !conf._13" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" type="item_1" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
+                </div>
+                <div class="bg-white tab-card cell-list history-list" v-if="conf._4 && tabActiveName == '2' && !getStatus">
+                    <hispro-component :type="portrait" :id="entInfo.id"></hispro-component>
+                </div>
+                <div class="vip_component" v-if="isMember" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" type="item_9" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+                </div>
+                <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && annualData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">年度项目统计</div>
                     <!-- e-charts和sticky同时使用时候,需要手动降低css层级(z-index: 1),确保tooltip不遮挡固定定位头部 -->
                     <div class="tab-card-content">
@@ -326,7 +279,10 @@
                     </div>
                     <div class="tab-card-tip">注:项目金额指所有项目的中标金额之和,少数缺失的中标金额,用项目预算补充。</div>
                 </div>
-                <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && monthZbData.rows.length !== 0">
+                <div class="vip_component" v-if="getStatus" style="height:11.12rem;background:url('/common-module/collection/image/bg/vip_bg_2.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" type="item_2" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
+                </div>
+                <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && monthZbData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">月度中标金额统计</div>
                     <div class="tab-card-content">
                         <ve-line
@@ -339,7 +295,10 @@
                     </div>
                     <div class="tab-card-tip">注:少数缺失的中标金额,用项目预算补充。</div>
                 </div>
-                <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && mapChartData.rows.length !== 0">
+                <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_3.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" type="item_3" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
+                </div>
+                <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && mapChartData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">市场区域分布</div>
                     <div class="tab-card-content">
                         <ve-map
@@ -352,7 +311,10 @@
                         </ve-map>
                     </div>
                 </div>
-                <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && rateData.rows.length !== 0">
+                <div class="vip_component" v-if="getStatus" style="height:10.56rem;background:url('/common-module/collection/image/bg/vip_bg_4.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" type="item_4" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
+                </div>
+                <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && rateData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">各类客户平均折扣率</div>
                     <div class="tab-card-content">
                         <ve-line
@@ -365,14 +327,20 @@
                     </div>
                     <div class="tab-card-tip">注:平均折扣率=(全部项目预算-全部中标金额)/全部项目预算,是指价格减让部分与原价的比率,仅统计预算和中标金额同时存在的项目。</div>
                 </div>
-                <div class="bg-white tab-card charts"  v-show="conf._4 && tabActiveName == '2' && entPortraitInfo.top10 && entPortraitInfo.top10.length != 0">
+                <div class="vip_component" v-if="getStatus" style="height:11.24rem;background:url('/common-module/collection/image/bg/vip_bg_5.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" type="item_5" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
+                </div>
+                <div class="bg-white tab-card charts"  v-show="conf._4 && tabActiveName == '2' && entPortraitInfo.top10 && entPortraitInfo.top10.length != 0 && !getStatus">
                     <div class="tab-card-title">客户类型分布</div>
                     <div class="tab-card-content">
                         <div ref="pieChart" style="height: 360px;"></div>
                     </div>
                     <div class="tab-card-tip">注:各客户类型占比以中标金额计算,最多展示占比排名前十的客户类型。</div>
                 </div>
-                <div class="bg-white tab-card customers client"  v-show="conf._4 && tabActiveName == '2' && importantCustomers.length !== 0">
+                <div class="vip_component" v-if="getStatus" style="height:11.92rem;background:url('/common-module/collection/image/bg/vip_bg_6.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" type="item_6" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
+                </div>
+                <div class="bg-white tab-card customers client"  v-show="conf._4 && tabActiveName == '2' && importantCustomers.length !== 0 && !getStatus">
                     <div class="tab-card-title">重点客户</div>
                     <div class="tab-card-content">
                         <div class="client-list" v-for="c in importantCustomers">
@@ -399,6 +367,9 @@
                         </div>
                     </div>
                 </div>
+                <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_7.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" type="item_7" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
+                </div>
             </van-tab>
         </van-tabs>
         <div class="j-main project-tab-container" v-if="conf.powerLoaded && !conf.showPortraitAll">
@@ -437,12 +408,14 @@
 </div>
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/antiRes/js/mainHook.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/vip-dialog.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/history-project.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/echarts_option.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/chart_options.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/ent_portrait.js?v={{Msg "seo" "version"}}'></script>

+ 103 - 14
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait_change.html

@@ -7,26 +7,43 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/ent_portrait.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
 </head>
+<style>
+    .vip_openDialog{
+        padding: 0.56rem 0 0.64rem;
+        width: 6.06rem;
+        /* height: 6.88rem; */
+        background: url('{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/image/openVip.png') no-repeat;
+        background-size: 100% 100%;
+        box-sizing: border-box;
+    }
+    .bigVip_com{
+        display: none;
+    }
+</style>
 <body>
 <div class="j-container">
     {{include "/big-member/header.html"}}
     <div id="ent-portrait-change" class="j-main" v-cloak>
-        <div class="j-container empty" v-if="changeList.length === 0" key="changeList">
+        <div class="j-container empty" v-if="changeList.length === 0 && getStatus" key="changeList">
             <div class="j-img img-empty empty-img"></div>
             <p class="empty-text">暂无企业情报历史记录</p>
         </div>
+        <div class="vip_component bigVip_com" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
+            <vip-component type="item_8" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
+        </div>
         <ul class="ent-change-list" v-else key="changeList">
             <li class="ent-change-item" v-for="(item,index) in changeList" :key="item.changeTime">
                 <div class="header-time">${new Date(item.changeTime).pattern('yyyy.MM.dd')}</div>
@@ -51,23 +68,39 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/vip-dialog.js?v={{Msg "seo" "version"}}'></script>
 {{include "/big-member/commonjs.html"}}
 <script>
 var vNode = {
     delimiters: ['${', '}'],
     el: '#ent-portrait-change',
+    components: {
+        vipComponent: vipComponent
+    },
     data: {
         eId: '',
-        changeList: []
+        changeList: [],
+        entvisit: {
+            total: 0, // 本月画像次数总量
+            usage: 0, // 本月已使用次数
+            provin: 0 // 购买省份数量
+        },
+        powerInfo: {},
+        conf: {
+            _12: false
+        },
+        isVip: false,
+        vipststus: 0
+
     },
     created: function () {
         var eId = utils.getParam('eId')
@@ -75,9 +108,65 @@ var vNode = {
             eId = decodeURIComponent(eId)
             this.eId = eId
         }
+        this.getUserInfo()
+        this.getEntVisits()
         this.getEntHistory()
     },
+    computed: {
+        getStatus: function () {
+            // 超级订阅用户没有企业情报监控权限,显示购买页
+            return this.conf._12
+        }
+    },
     methods: {
+        // 获取权限信息
+        getUserInfo: function() {
+            let _this = this
+            $.ajax({
+                type: 'POST',
+                url: '/bigmember/use/isAdd',
+                success: function(res) {
+                    console.log(res.data)
+                    if (res.data) {
+                        _this.powerInfo = res.data
+                    }
+                    if (res.data && $.isArray(res.data.power)) {
+                        // 根据power判断权限,企业画像包含权限(12)
+                        var power = res.data.power
+                        // 判断是否是超级订阅会员、老用户还是新用户
+                        if (res.data.viper) {
+                            $('.bigVip_com').css({'display':'flex'})
+                            _this.isVip = true
+                        } else {
+                            $('.bigVip_com').css({'display':'flex'})
+                            if(res.data.vipStatus > 0) {
+                                _this.vipststus = res.data.vipststus
+                            }
+                        }
+                        if (power.indexOf(12) != -1) {
+                            // 获取企业情报历史记录-12
+                            _this.conf._12 = true
+                            $('.bigVip_com').css({'display':'flex'})
+                        }
+                    }
+                }
+            })
+        },
+        // 企业画像访问量查询
+        getEntVisits: function() {
+            let _this = this
+            $.ajax({
+                type: "POST",
+                url: "/bigmember/portrait/subVipPortrait/usage",
+                success: function (res) {
+                    if(res.error_code == 0) {
+                        if(res.data) {
+                            _this.entvisit = res.data
+                        }
+                    }
+                }
+            });
+        },
         getEntHistory: function () {
             var _this = this
             $.ajax({

+ 17 - 17
src/jfw/modules/app/src/web/templates/big-member/page_forecast_detail.html

@@ -6,15 +6,15 @@
     <title>潜在项目预测</title>
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
 
     <!--小于100行的样式插入html而不是css,有助于减少请求数-->
@@ -178,7 +178,7 @@
                                 <span class="j-icon icon-phone-circle" @click="callPhone(item.p_phone)"></span>
                             </div>
                         </div>
-                    </div> 
+                    </div>
                 </div>
                 <div v-else>
                     <div class="van-hairline--bottom">
@@ -193,21 +193,21 @@
             </div>
         </div>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
@@ -287,7 +287,7 @@
                                 // }
                                 that.info = res.data;
                             }
-                            
+
                         }else{
                             that.$toast(res.error_msg)
                         }
@@ -310,12 +310,12 @@
                 location.href = href
             },
             // 跳到项目信息详情
-            goProjectDetail: function (item,pname) { 
+            goProjectDetail: function (item,pname) {
                 var that = this;
                 $.ajax({
                     type:'POST',
                     url:'/bigmember/follow/project/check',
-                    data:{ 
+                    data:{
                         sid: item
                     },
                     success:function(res) {

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_forecast_list.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>潜在项目预测</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
 
     <!--小于100行的样式插入html而不是css,有助于减少请求数-->
@@ -217,18 +217,18 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <!--小于100行同css,减少请求数-->

+ 6 - 6
src/jfw/modules/app/src/web/templates/big-member/page_free_contrast_trial.html

@@ -5,9 +5,9 @@
 
     {{include "/big-member/meta.html"}}
 
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/contrast_trial.css?v={{Msg "seo" "version"}}'>
 </head>
 <body>
@@ -71,9 +71,9 @@
     </div>
 </div>
 
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/contrast_trial.js?v={{Msg "seo" "version"}}'></script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_full.html

@@ -229,7 +229,7 @@
     </div>
 </div>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/rem.js'></script>
-<script src="//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js"> </script>
+<script src="//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js"> </script>
 <script>
   // @date 2020/12/1 Android返回session取不到userId问题处理
   window.addEventListener('pageshow', function(event) {

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_init.html

@@ -7,17 +7,17 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_init.css?v={{Msg "seo" "version"}}' />
 
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_init.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/vant-reset.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
@@ -121,9 +121,9 @@
     }
 </script>
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <link rel="preload" as="script" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/page_init.js?v={{Msg "seo" "version"}}' />
 <!--E-必定需要预加载的资源-->
 
@@ -131,9 +131,9 @@
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/page_init.js?v={{Msg "seo" "version"}}'></script>
 <!--E-当前页面的资源-->

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_land_setting.html

@@ -7,16 +7,16 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!-- <link rel="preload" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_land_setting.css" /> -->
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!-- <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_land_setting.css" /> -->
     <!--E-当前页面的css资源-->
     <style>
@@ -192,18 +192,18 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/vant.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <!-- <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/follow_detail.js?v={{Msg "seo" "version"}}'></script> -->
 

+ 13 - 13
src/jfw/modules/app/src/web/templates/big-member/page_landingPage.html

@@ -7,17 +7,17 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_landingPage_new.css?v={{Msg "seo" "mod_version"}}'/>
     <!--E-当前页必定需要预加载的资源-->
 
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_landingPage_new.css?v={{Msg "seo" "mod_version"}}' />
     <!--E-当前页面的css资源-->
     <style>
@@ -344,15 +344,15 @@
         </div>
     </div>
 
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
     {{include "/big-member/commonjs.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
-    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js'></script>
+    <script src='https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js'></script>
 
     <script>
     function mySysIsIos() {

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_landingPage_old.html

@@ -7,17 +7,17 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_landingPage.css?v={{Msg "seo" "version"}}'/>
     <!--E-当前页必定需要预加载的资源-->
 
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_landingPage.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
     <script>
@@ -161,12 +161,12 @@
         </div>
     </div>
 
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
     {{include "/big-member/commonjs.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 <script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_main_root.html

@@ -7,17 +7,17 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/j-big-icons.css' />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_main_root.css' />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/j-big-icons.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_main_root.css?v={{Msg "seo" "mod_version"}}' />
     <!--E-当前页面的css资源-->
@@ -125,13 +125,13 @@
     </div>
 
     <!--S-必定需要预加载的资源-->
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script> <!--E-必定需要预加载的资源-->
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script> <!--E-必定需要预加载的资源-->
 
-    <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
     {{include "/big-member/commonjs.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/main_root_data.js?v={{Msg "seo" "version"}}'></script>

+ 6 - 6
src/jfw/modules/app/src/web/templates/big-member/page_ontrial_commit.html

@@ -7,9 +7,9 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/buy_commit.css?v={{Msg "seo" "version"}}" />
 </head>
 
@@ -107,9 +107,9 @@
     </div>
 
     <!--S-当前页面的资源-->
-    <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js></script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
     {{include "/big-member/commonjs.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/ontrial-commit.js?v={{Msg "seo" "version"}}'></script>
     <!--<script src='{{Msg "seo" "cdn"}}/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_ontrial_landingPage.html

@@ -7,17 +7,17 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_ontrial_landingPage.css?v={{Msg "seo" "mod_version"}}'/>
     <!--E-当前页必定需要预加载的资源-->
 
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_ontrial_landingPage.css?v={{Msg "seo" "mod_version"}}' />
     <!--E-当前页面的css资源-->
     <script>
@@ -107,12 +107,12 @@
         </div>
     </div>
 
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js> </script>
-    <script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js> </script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js> </script>
     {{include "/big-member/commonjs.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 <script>

+ 4 - 4
src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_aiForecastPack.html

@@ -131,7 +131,7 @@
     <div class="j-footer j-button-group"></div>
 </div>
 </body>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <!--<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>-->
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
@@ -266,11 +266,11 @@
                     $(".line_paytime").css("display", "");
                     $(".payTime").css("display", "").text(r.data.pay_time.replace("-", "/").replace("-", "/"));
                 }
-                
+
                 if (r.data.prepay_id){
                   $(".transaction_id").text(r.data.prepay_id);
                   $(".line_transaction").css("display", "");
-                } 
+                }
             }
             if (r.data.order_status == 0) {
                 //未支付
@@ -466,4 +466,4 @@
         $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;padding: .5rem;top: 0px;box-sizing: border-box;align-items: center;"><img src="' + imgSrc + '"></div>')
     }
 </script>
-{{include "/common/baiducc.html"}}
+{{include "/common/baiducc.html"}}

+ 3 - 3
src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html

@@ -157,7 +157,7 @@
     </div>
 </div>
 </body>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/pinch-zoom.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <!--<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>-->
@@ -329,7 +329,7 @@
                 if (r.data.prepay_id){
                   $(".line_transaction").css("display", "");
                   $(".transaction_id").text(r.data.prepay_id);
-                } 
+                }
             }
             if (r.data.order_status == 0) {
                 //未支付
@@ -535,4 +535,4 @@
         $(".page.pinch-zoom-parent").css("display", "").css("z-index", "999")
     }
 </script>
-{{include "/common/baiducc.html"}}
+{{include "/common/baiducc.html"}}

+ 4 - 4
src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_subAccount.html

@@ -128,7 +128,7 @@
     <div class="j-footer j-button-group"></div>
 </div>
 </body>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <!--<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>-->
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
@@ -252,7 +252,7 @@
                 if (r.data.prepay_id){
                   $(".transaction_id").text(r.data.prepay_id);
                   $(".line_transaction").css("display", "");
-                } 
+                }
             }
             if (r.data.order_status == 0) {
                 //未支付
@@ -435,7 +435,7 @@
         var money = t.split('').reverse().join('') + point + right;
         return money;
     }
-    
+
     function showImg(imgSrc) {
         if (!imgSrc) {
             return
@@ -448,4 +448,4 @@
         $("body").append('<div id="showImgDiv" onclick="$(this).remove()" style="overflow-y:scroll;display: flex;background: #00000070;height: 100%;width: 100%;position: absolute;z-index: 9999;padding: .5rem;top: 0px;box-sizing: border-box;align-items: center;"><img src="' + imgSrc + '"></div>')
     }
 </script>
-{{include "/common/baiducc.html"}}
+{{include "/common/baiducc.html"}}

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_potential_cor.html

@@ -6,15 +6,15 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
     <!--E-当前页面的css资源-->
     <style>
@@ -100,15 +100,15 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/potential_cor.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/baiducc.html"}}

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_potential_cor_list.html

@@ -7,15 +7,15 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
     <style>
         /* 头部样式,兼容长字 */
@@ -259,15 +259,15 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/potential_cor_list.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/baiducc.html"}}

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html

@@ -7,16 +7,16 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_pro_follow_detail.css?v={{Msg "seo" "version"}}'/>
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_pro_follow_detail.css?v={{Msg "seo" "version"}}' />
     <!--E-当前页面的css资源-->
 </head>
@@ -169,13 +169,13 @@
     <!--S-Vue-->
 </div>
 
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/vant.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.9.1/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 

+ 15 - 15
src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_list.html

@@ -7,16 +7,16 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_pro_follow_list.css" />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/page_pro_follow_list.css" />
     <!--E-当前页面的css资源-->
 </head>
@@ -35,7 +35,7 @@
             </div>
         </div>
         <div class="j-container" v-if="!foShow">
-            
+
             <div class="j-main havefomain" ref="jList">
                 <van-list
                     v-model="loading"
@@ -72,18 +72,18 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script rel="preload" as="script" src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script rel="preload" as="script" src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <!-- <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/demo.js?v={{Msg "seo" "version"}}'></script> -->
 <!--E-当前页面的资源-->
@@ -224,7 +224,7 @@
                                     _this.loading = false
                                     _this.pageNum++
                                 }
-                                
+
                             }else{
                                 _this.loading = true
                                 _this.foShow = true
@@ -233,7 +233,7 @@
                             _this.$toast(res.error_msg)
                         }
 
-                        
+
                     }
                 })
             },

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_push_setting_detail.html

@@ -7,14 +7,14 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/push_settings.css' />
 </head>
 <body>
@@ -120,13 +120,13 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/push_settings.js?v={{Msg "seo" "version"}}'></script>
 <script>

+ 12 - 12
src/jfw/modules/app/src/web/templates/big-member/page_push_settings.html

@@ -7,14 +7,14 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <style>
         .setting-list .van-cell-group__title {
             font-size: .24rem;
@@ -79,13 +79,13 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/push_settings.js?v={{Msg "seo" "version"}}'></script>
 <script>

+ 24 - 24
src/jfw/modules/app/src/web/templates/big-member/page_report_detail_month.html

@@ -7,16 +7,16 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css />
     <!--E-当前页面的css资源-->
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/report_detail_month.css?v={{Msg "seo" "version"}}' />
@@ -49,7 +49,7 @@
             <div class="chart_title">项目数量</div>
             <div>
                 <ve-histogram
-                    height="284px" 
+                    height="284px"
                     :init-options="initRendererSvg"
                     :data="pCountData"
                     :after-config="barConfig1 "
@@ -62,11 +62,11 @@
             <div class="chart_title">项目规模</div>
             <div>
                 <ve-histogram
-                    height="284px" 
+                    height="284px"
                     :init-options="initRendererSvg"
-                    :data="pScaleData" 
+                    :data="pScaleData"
                     :after-config="barConfig2"
-                    :settings="settings1" 
+                    :settings="settings1"
                     :extend="barChart.chartExtend">
                 </ve-histogram>
             </div>
@@ -96,9 +96,9 @@
             <div class="chart_title">本月项目规模</div>
             <div>
                 <ve-histogram
-                    height="284px" 
+                    height="284px"
                     :init-options="initRendererSvg"
-                    :data="curMonthScaleData" 
+                    :data="curMonthScaleData"
                     :settings="settings2"
                     :extend="barChart2.chartExtend">
                 </ve-histogram>
@@ -113,7 +113,7 @@
                     :init-options="initRendererSvg"
                     :data="mapCountData"
                     :after-config="mapCountConfig"
-                    :settings="mapSettings.chartSettings" 
+                    :settings="mapSettings.chartSettings"
                     :extend="mapSettings.chartExtend">
                 </ve-map>
             </div>
@@ -127,7 +127,7 @@
                     :init-options="initRendererSvg"
                     :data="mapScaleData"
                     :after-config="mapScaleConfig"
-                    :settings="mapSettings2.chartSettings" 
+                    :settings="mapSettings2.chartSettings"
                     :extend="mapSettings2.chartExtend">
                 </ve-map>
             </div>
@@ -202,7 +202,7 @@
                     height="300px"
                     :data="mapRegionData"
                     :after-config="mapRegCountConfig"
-                    :settings="mapSettings3.chartSettings" 
+                    :settings="mapSettings3.chartSettings"
                     :extend="mapSettings3.chartExtend">
                 </ve-map>
             </div>
@@ -227,10 +227,10 @@
             <div class="chart_title">本月中标企业中标项目数量分布</div>
             <div>
                 <ve-histogram
-                    height="284px" 
+                    height="284px"
                     :init-options="initRendererSvg"
-                    :data="curWinEntCountData" 
-                    :settings="settings3" 
+                    :data="curWinEntCountData"
+                    :settings="settings3"
                     :extend="barChart3.chartExtend">
                 </ve-histogram>
             </div>
@@ -353,17 +353,17 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js />
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js></script>
 {{include "/big-member/commonjs.html"}}

+ 19 - 19
src/jfw/modules/app/src/web/templates/big-member/page_report_detail_week.html

@@ -7,16 +7,16 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css />
     <!--E-当前页面的css资源-->
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/report_detail_month.css?v={{Msg "seo" "version"}}' />
@@ -44,7 +44,7 @@
         }
         .emphasis-p:not(:last-child){
             margin-bottom: .16rem;
-        }   
+        }
         .e-l-label{
             width: 1.6rem;
             margin-right: .16rem;
@@ -104,11 +104,11 @@
             <div class="chart_title">本周新增招标项目预算</div>
             <div>
                 <ve-histogram
-                    height="284px" 
+                    height="284px"
                     :init-options="initRendererSvg"
-                    :data="addCountData" 
+                    :data="addCountData"
                     :after-config="addCountConfig"
-                    :settings="addCountSettings" 
+                    :settings="addCountSettings"
                     :extend="barChart.chartExtend">
                 </ve-histogram>
             </div>
@@ -133,11 +133,11 @@
             <div class="chart_title">本周新增招标项目规模</div>
             <div>
                 <ve-histogram
-                    height="284px" 
+                    height="284px"
                     :init-options="initRendererSvg"
-                    :data="curWeekAddScaleData" 
+                    :data="curWeekAddScaleData"
                     :after-config="curWeekAddScaleConfig"
-                    :settings="curWeekAddScaleSettings" 
+                    :settings="curWeekAddScaleSettings"
                     :extend="barChart.chartExtend">
                 </ve-histogram>
             </div>
@@ -268,17 +268,17 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js />
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js></script>
 {{include "/big-member/commonjs.html"}}

+ 18 - 12
src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html

@@ -7,18 +7,19 @@
     {{include "/big-member/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/style.min.css />
     <!--E-当前页面的css资源-->
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/css/unit_portrayal.css?v={{Msg "seo" "version"}}' />
     <style>
         .skeleton{
@@ -84,6 +85,10 @@
                 <div class="j-img img-empty empty-img"></div>
                 <p class="empty-text">暂无画像信息</p>
             </div>
+            <!-- 历史项目联系人 -->
+            <div class="history-list">
+                <hispro-component type="buyer" :buyer="buyer.name"></hispro-component>
+            </div>
             <!-- 招标动态 -->
             <div class="dynamic" v-if="isShow.showDynamic">
                 <div class="d_title">招标动态</div>
@@ -286,22 +291,23 @@
 </div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js />
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js></script>
 <script src=//cdn.jsdelivr.net/npm/v-charts@1.19.0/lib/index.min.js></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/echarts_option.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/chart_options.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/history-project.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/unit_portrayal.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/baiducc.html"}}
 </body>

+ 16 - 16
src/jfw/modules/app/src/web/templates/big-member/page_voucher_center.html

@@ -5,15 +5,15 @@
     {{include "/big-member/meta.html"}}
     <title>充值中心</title>
     <!--S-当前页必定需要预加载的资源-->
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="preload" as="style" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页必定需要预加载的资源-->
 
     <!--S-当前页面的css资源-->
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/reset-css@4.0.1/reset.min.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css />
-    <link rel="stylesheet" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/icon/local.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <!--E-当前页面的css资源-->
     <style>
         .box-container{
@@ -135,7 +135,7 @@
 </head>
 <body>
 <div class="j-container">
-    {{include "/big-member/header.html"}} 
+    {{include "/big-member/header.html"}}
     <div class="j-main" id="ai-voucher" v-cloak>
         <div class="j-container">
             <div class="j-main">
@@ -155,7 +155,7 @@
                         <li><em>2.</em> 中标企业预测包是虚拟产品,购买后无法退款或转让,请确认后下单。</li>
                     </ol>
                 </div>
-            </div> 
+            </div>
             <div class="j-footer">
                 <div class="total">
                     <div class="total-label">合计:</div>
@@ -174,7 +174,7 @@
                     <button class="j-button-confirm" :disabled="isConfirm" @click="confirmOrder">提交订单</button>
                 </div>
             </div>
-        </div> 
+        </div>
         <van-popup v-model="showPopup" closeable close-icon="clear" round  position="bottom" >
             <div class="buy-modal">
                 <div class="modal-title">
@@ -189,21 +189,21 @@
             </div>
         </van-popup>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js />
-<link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js />
+<link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
 <!--E-必定需要预加载的资源-->
 
 <!--S-有可能需要提前预加载的资源-->
 <!--E-有可能需要提前预加载的资源-->
 
 <!--S-当前页面的资源-->
-<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
-<script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 <!--E-当前页面的资源-->
 {{include "/big-member/commonjs.html"}}
 <!--小于100行同css,减少请求数-->

+ 1 - 1
src/jfw/modules/app/src/web/templates/common/nnc.html

@@ -6,7 +6,7 @@
 <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/animate.css?v={{Msg "seo" "version"}}" />
 <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/unicorn.main.css?v={{Msg "seo" "version"}}" />
 <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/unicorn.grey.css?v={{Msg "seo" "version"}}" />
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.cookie.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/bootstrap.min.js"></script>
 {{include "/common/js.html"}}

+ 1 - 1
src/jfw/modules/app/src/web/templates/common/pnc.html

@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/animate.css?v={{Msg "seo" "version"}}"/>
 <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/unicorn.main.css?v={{Msg "seo" "version"}}" />
 <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/unicorn.grey.css?v={{Msg "seo" "version"}}" />
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.cookie.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/bootstrap.min.js"></script>
 {{include "/common/js.html"}}

+ 2 - 2
src/jfw/modules/app/src/web/templates/commonPay/bidfile/bidfileDetail.html

@@ -140,7 +140,7 @@
     </div>
 </div>
 </body>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/pinch-zoom.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <!--<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>-->
@@ -440,4 +440,4 @@
         $(".page.pinch-zoom-parent").css("display", "").css("z-index", "999")
     }
 </script>
-{{include "/common/baiducc.html"}}
+{{include "/common/baiducc.html"}}

+ 1 - 1
src/jfw/modules/app/src/web/templates/commonPay/checkout.html

@@ -117,7 +117,7 @@
         <button class="j-button-confirm">去支付</button>
     </div>
 </div>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
 <script>

+ 11 - 11
src/jfw/modules/app/src/web/templates/commonPay/integral/integralDetail.html

@@ -148,7 +148,7 @@
     </div>
 </div>
 </body>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/pinch-zoom.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <!--<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>-->
@@ -193,7 +193,7 @@
                     //有效周期
                     $(".line_cycle").css("display", "");
                     console.log(r.data.pay_way, r.data.course_status, r.data.pay_way === "transferAccounts", r.data.course_status === 4)
-    
+
                     var pay_again = ""
                     //发票
                     if (r.data.applybill_status === 0) {
@@ -204,7 +204,7 @@
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }
                     $('.j-footer').show().html(pay_again);
-    
+
                     //支付方式
                     if (r.data.pay_way.indexOf("wx") > -1) {
                         $(".line_payway").css("display", "");
@@ -218,7 +218,7 @@
                             $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");
                         }
                         $(".line_payway").css("display", "");
-    
+
                         $(".l-item.paymoney").css("display", "");
                         $(".price").text("¥ " + formatMoney(r.data.pay_money / 100) + "元");
                         return
@@ -226,7 +226,7 @@
                         $(".invoice").css("display", "none");
                         return
                     }
-    
+
                     $(".l-item.paymoney").css("display", "");
                     if (r.data.discount_price&&r.data.discount_price>0){
                       var totalmoney = Number(r.data.order_money)+Number(r.data.discount_price)
@@ -238,7 +238,7 @@
                         $(".line_paytime").css("display", "");
                         $(".payTime").css("display", "").text(r.data.pay_time.replace("-", "/").replace("-", "/"));
                     }
-    
+
                     $(".line_transaction").css("display", "");
                     if (r.data.prepay_id) $(".transaction_id").text(r.data.prepay_id);
                 }
@@ -246,7 +246,7 @@
                     //未支付
                     $("#card-header-bg").addClass("bg nopay-bg")
                     $("#pageTitle").addClass("status")
-    
+
                     if (r.data.discount_price&&r.data.discount_price>0){
                       var totalmoney = Number(r.data.order_money)+Number(r.data.discount_price)
                       priceText = "¥ " + formatMoney(totalmoney / 100) + "元";
@@ -258,7 +258,7 @@
                         } else if (r.data.course_status === 3) {
                             $("#pageTitle").text("未收到转账");
                             $(".remaining").show().text("客服电话:400-108-6670")
-    
+
                             $(".j-footer").show().html("<button class='j-button-confirm' style='width: 100%!important;height: 0.92rem!important;' >再次支付</button>").on("click", function () {
                                 window.location.href = "/jyapp/pay/checkout_integral?orderCode=" + orderCode;
                             })
@@ -268,12 +268,12 @@
                             $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");
                         }
                         $(".line_payway").css("display", "");
-    
+
                         $(".l-item.paymoney").css("display", "");
                         $(".paymoney .price").text("-");
                         return
                     }
-    
+
                     $("#pageTitle").text("待付款");
                     $(".remaining").show()
                     var order_create_time = r.data.create_time
@@ -458,4 +458,4 @@
         $(".page.pinch-zoom-parent").css("display", "").css("z-index", "999")
     }
 </script>
-{{include "/common/baiducc.html"}}
+{{include "/common/baiducc.html"}}

+ 7 - 7
src/jfw/modules/app/src/web/templates/commonPay/myOrder.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css"/>
     <link rel="stylesheet" type="text/css"
           href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/dropload.js"></script>
     <script src="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
@@ -1131,7 +1131,7 @@
                 //优惠
                 var discountHtml = ""
                 if ((obj.order_status === 0||obj.order_status === 1)&&obj.discount_price>0){
-                  var totalPrice = Number(obj.order_money) + Number(obj.discount_price) 
+                  var totalPrice = Number(obj.order_money) + Number(obj.discount_price)
                   discountHtml = '<p class="discount"><span class="current">'+totalName+'¥' + formatMoney(totalPrice) + '</span>'
                                 + '<span class="current">'+discountName+'¥' + formatMoney(obj.discount_price) + '</span>'
                 }
@@ -1481,7 +1481,7 @@
                                 effectiveduration_vip = cyclecount_vip + "天";
                             } else if (cycleunit_vip === 4) {
                                 effectiveduration_vip = cyclecount_vip + "季";
-                            } 
+                            }
                         }
                     } else {
                         if (cycleunit_vip === 1) {
@@ -1492,7 +1492,7 @@
                             effectiveduration_vip = cyclecount_vip + "天";
                         } else if (cycleunit_vip === 4) {
                             effectiveduration_vip = cyclecount_vip + "季";
-                        } 
+                        }
                     }
                 }
 
@@ -1541,7 +1541,7 @@
                 //优惠
                 var discountHtml = ""
                 if ((orderStatus_vip === 0||orderStatus_vip === 1)&&obj.discount_price>0){
-                  var totalPrice = Number(obj.order_money) + Number(obj.discount_price) 
+                  var totalPrice = Number(obj.order_money) + Number(obj.discount_price)
                   discountHtml = '<p class="discount"><span class="current">'+totalName+'¥' + formatMoney(totalPrice) + '</span>'
                                 + '<span class="current">'+discountName+'¥' + formatMoney(obj.discount_price) + '</span>'
                 }
@@ -1702,7 +1702,7 @@
                         + '<p class="item-ifo ellipsis">订阅周期:' + effectiveduration_vip
                         + (can1111 ? ('&nbsp;+&nbsp;' + '<span style="color: #2ABED1;">赠送' + (giveCycle < 12 ? (giveCycle + '个月') : '1年') + '</span>') : '')
                         + '</p>'
-                        
+
                       if (effectiveduration_vip != "不延期"){
                         listhtml += '<p class="item-ifo ellipsis">有效日期:' + effectivetime_vip + '</p>';
                       }
@@ -1966,7 +1966,7 @@
 
                 var lastHtml = "";
                 var orderUrl = "/jyapp/big/page/orderdetail_member?order_code=" + orderCode;
-                
+
                 var member_level =level_map.get(filterObj.level).get("level");
                 //if(filterObj.combo!=null&&filterObj.combo!=undefined&&filterObj.combo!=""){
                 //  member_level="自定义-"+filterObj.combo;

+ 1 - 1
src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html

@@ -95,7 +95,7 @@
     </div>
 </div>
 </body>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/commonPay/transferAccounts.html

@@ -91,7 +91,7 @@
         <button class="j-button-confirm" disabled>确认已转账</button>
     </div>
 </div>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/transferAccounts.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/commonPay/transferAccountsResult.html

@@ -59,7 +59,7 @@
         {{end}}
     </div>
 </div>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
 {{include "/common/baiducc.html"}}

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/applyInvoice.html

@@ -185,7 +185,7 @@
     	 </div>
     </div>
 	</div>
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/mapJSON.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/course/js/drawabill.js?v={{Msg "seo" "version"}}"></script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/course_detail.html

@@ -6,7 +6,7 @@
     <title>课程详情</title>
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
     {{include "/common/js.html"}}
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/course/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/course/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/course_list.html

@@ -6,7 +6,7 @@
     <title>招投标课程</title>
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	{{include "/common/js.html"}}
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/course/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.css" />

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/optionPay.html

@@ -162,7 +162,7 @@
         </div>
     </div>
 </div>
-<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/course/js/optionpay.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/publicToPublic.js?v={{Msg "seo" "version"}}"></script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/orderDetail.html

@@ -170,7 +170,7 @@
         </div>
     </div>
 	</div>
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/imageViewer.min.js"></script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
     <script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/payError.html

@@ -44,7 +44,7 @@
     </div>
 	</div>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
 	<script></script>
 </body>

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/paySuccess.html

@@ -69,7 +69,7 @@
     </div>
 	</div>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script>
         $(function () {

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/publicToPublic.html

@@ -129,7 +129,7 @@
 				</div>
 			</div>
 		</div>
-		<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+		<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 		<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
 		<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/course/js/optionpay.js?v={{Msg "seo" "version"}}"></script>
 		<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/refund.html

@@ -76,7 +76,7 @@
     </div>
 	</div>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
-    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
     <script>
         $(function() {

+ 1 - 1
src/jfw/modules/app/src/web/templates/course/refundVerify.html

@@ -76,7 +76,7 @@
     </div>
 	</div>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
-	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
     <script>
         $(function(){

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно