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

src/jfw/front/front.go

@@ -1101,7 +1101,7 @@ func (f *Front) Rediskw() error {
 	skw := f.GetString("skw")
 	num := f.GetString("num")
 	if skw != "" && num != "" {
-		skw = strings.Replace(skw, "；", " ", -1)
+		skw = strings.Replace(strings.Replace(skw, " ", "+", -1), "；", " ", -1)
 		log.Println(skw)
 		num = se.DecodeString(num)
 		redis.Put("sso", "pc_subscribe_"+num, skw, 15*60)

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/previewData.css

@@ -1,3 +1,8 @@
+* {
+    -webkit-overflow-scrolling: touch;
+    -webkit-tap-highlight-color:rgba(0,0,0,0);
+    -webkit-tap-highlight-color:transparent;
+}
 body{
 	padding: 0;
 	margin:0;
@@ -24,10 +29,10 @@ body{
     white-space: nowrap;
 }
 .d_bz tr:nth-child(odd),.d_gj tr:nth-child(odd){
-	background-color: #f9f9f9;
+	background-color: rgba(0,0,0,.02);
 }
 .d_bz tr:nth-child(even),.d_gj tr:nth-child(even){
-	background-color: #ffffff;
+/*	background-color: #ffffff;*/
 }
 
 .d_bz{

src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html

@@ -54,21 +54,35 @@
 			  100% {
 			    transform: rotate(360deg); } 
 			}
+			.app-layout-content-b {
+				display: flex;
+				flex-direction: column;
+				width: 100%;
+			}
 			.buttons-tab{
-				position: fixed;
+				/*position: absolute;
 			    top: 0px;
 			    left: 0px;
 			    right: 0px;
-				z-index: 9999;    
+				z-index: 9999; */
+				width: 100%;
+				   
 				height: 51px;
     			background: #fff;
     			font-size: 16px;
-				top: 65px;
+				top: 20px;
+			}
+			.tab-container {
+				margin-top: 3px;
+				flex: 1;
+				width: 100%;
+				overflow: scroll;
+				border-top: 1px solid transparent
 			}
 			#d_bz{
-				margin-top:55px;
 				position:relative;
 				margin-bottom:10px;
+				background: url("/jyapp/dataExport/images/sy.png") repeat;
 			}
 			.fimg{
 				margin-top:55px;
@@ -147,11 +161,11 @@
 					<li class="tab-link ">高级字段包</li>
 				</ul>
 			</div>
-			<div class="tabs"  style="min-width:2020px;">
-				<table id="d_bz" class="d_bz" cellspacing="0" cellpadding="0" >
-					
-				</table>
-				<div class="sy">
+			<div class="tab-container">
+				<div class="tabs">
+					<table id="d_bz" class="d_bz" cellspacing="0" cellpadding="0" >
+						
+					</table>
 				</div>
 			</div>
 			<div class="noData" style="display:none;">今日已超出预览次数</div>
@@ -262,7 +276,7 @@
 			function makeP(){
 				var w=$("table").width();
 				var h=$("table").height();
-				$(".sy").width($("table").width()).height($("table").height());
+				//$(".sy").width($("table").width()).height($("table").height());
 				loading(false);
 			}
 		</script>

src/jfw/modules/pushsubscribe/src/public/util.go

@@ -14,6 +14,7 @@ const (
 	BulkSize           = 20
 	BigBulkSize        = 100
 	OneDaySecond       = 86400
+	SevenDay           = 604800
 	User               = "user"
 	Bidding            = "bidding"
 	Pushspace_project  = "pushspace_project"

src/jfw/modules/pushsubscribe/src/push/util/util.go

@@ -264,7 +264,7 @@ func SaveToPushsubscribe(isVipUser, isProjectInfo bool, userId string, matchInfo
 		logger.Error(userId, "批量保存有问题", length, saveCount)
 	}
 	//更新redis
-	subPush, err := jy.SubscribePush.Get(userId)
+	subPush, err := jy.SubscribePush.GetTodayCache(userId)
 	if err == nil && subPush != nil {
 		if nowymd := util.NowFormat(util.Date_Short_Layout); subPush.Date != nowymd {
 			subPush = &jy.SubPush{
@@ -275,8 +275,31 @@ func SaveToPushsubscribe(isVipUser, isProjectInfo bool, userId string, matchInfo
 			subPush_datas = append(subPush_datas, subPush.Datas...)
 			subPush.Datas = subPush_datas
 		}
-		jy.SubscribePush.Put(userId, subPush)
+		jy.SubscribePush.PutTodayCache(userId, subPush)
 	}
+	//全部列表缓存
+	allCache, err := jy.SubscribePush.GetAllCache(userId)
+	if err == nil && allCache != nil {
+		subPush_datas = append(subPush_datas, allCache...)
+		if len(subPush_datas) > jy.AllSubPushCacheSize {
+			subPush_datas = subPush_datas[:jy.AllSubPushCacheSize]
+		}
+		jy.SubscribePush.PutAllCache(userId, subPush_datas)
+	}
+	//最近7天50条redis缓存处理
+	sevenDayCache, err := jy.SubscribePush.GetSevenDayCache(userId)
+	if err == nil && sevenDayCache != nil {
+		for _, v := range sevenDayCache {
+			if v.Ca_date > unix-SevenDay {
+				subPush_datas = append(subPush_datas, v)
+			}
+		}
+		if len(subPush_datas) > 50 {
+			subPush_datas = subPush_datas[:50]
+		}
+		jy.SubscribePush.PutSevenDayCache(userId, subPush_datas)
+	}
+	//
 	if saveCount == 0 {
 		return 0
 	}

src/jfw/modules/subscribepay/src/config.json

@@ -2,7 +2,7 @@
 	"mongodbServers": "192.168.3.128:27080",
     "mongodbPoolSize": 5,
     "mongodbName": "qfw",
-    "redisaddrs": "other=192.168.3.128:1712,session=192.168.3.128:1712,push=192.168.3.128:1712,pushcache_1=192.168.3.128:5000",
+    "redisaddrs": "other=192.168.3.128:1712,session=192.168.3.128:1712,push=192.168.3.128:1712,pushcache_1=192.168.3.128:5000,pushcache_2_a=192.168.3.128:5001",
     "elasticsearch": "http://192.168.3.128:9800",
     "elasticPoolSize": 30,
     "webport": "86",

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

@@ -67,7 +67,7 @@ func (this *IndexSearch) GetIndexMessage() {
 			o_msgset := qutil.ObjToMap((*userMap)["o_vipjy"])
 			vip_items, ok := (*o_msgset)["a_items"].([]interface{})
 			//vip查询推送历史
-			_, result := jy.SubscribePush.Datas(util.MQFW, util.PushMysql, userId, 1, "", "")
+			result := getPushHistory(userId)
 			return &entity.FuncResult{true, nil, map[string]interface{}{
 				"isVip":        true,                     //是否是vip用户
 				"hasSubscribe": ok && len(vip_items) > 0, //是否有订阅词
@@ -80,7 +80,7 @@ func (this *IndexSearch) GetIndexMessage() {
 		items, ok := (*o_msgset)["a_key"].([]interface{})
 		if ok && len(items) > 0 {
 			//普通用户查询推送历史
-			_, result := jy.SubscribePush.Datas(util.MQFW, util.PushMysql, userId, 1, "", "")
+			result := getPushHistory(userId)
 			return &entity.FuncResult{true, nil, map[string]interface{}{
 				"isVip":        false,                //是否是vip用户
 				"hasSubscribe": ok && len(items) > 0, //是否有订阅词
@@ -296,13 +296,19 @@ func getPushHistory(userId string) (result []*jy.SubPushList) {
 	if userId == "" {
 		return
 	}
-	findSQL := "select * from pushsubscribe where userid = '" + userId + "'  and date >= %d order by id desc limit 50"
-	list := util.PushMysql.SelectBySql(fmt.Sprintf(findSQL, time.Now().AddDate(0, 0, -7).Unix()))
-	if len(*list) > 0 {
-		pushCas := jy.SubscribePush.GetJyPushs(*list)
-		result = jy.SubscribePush.GetInfoByIds(util.MQFW, pushCas)
+	subPush, err := jy.SubscribePush.GetSevenDayCache(userId)
+	if err == nil && subPush != nil {
+		result = subPush
 	} else {
-		result = []*jy.SubPushList{}
+		findSQL := "select * from pushsubscribe where userid = '" + userId + "'  and date >= %d order by id desc limit 50"
+		list := util.PushMysql.SelectBySql(fmt.Sprintf(findSQL, time.Now().AddDate(0, 0, -7).Unix()))
+		if len(*list) > 0 {
+			pushCas := jy.SubscribePush.GetJyPushs(*list)
+			result = jy.SubscribePush.GetInfoByIds(util.MQFW, pushCas)
+		} else {
+			result = []*jy.SubPushList{}
+		}
+		jy.SubscribePush.PutSevenDayCache(userId, result)
 	}
 	return
 }

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

@@ -214,24 +214,40 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			for c, y := range *newCityArr {
 				newCitysArr[c] = qutil.IntAll(y)
 			}
-			//校验buyset
+			//------校验buyset、区域、行业是否异常
+			upgradeBuyset := entity.JyVipSubStruct.NewBuySet(allBuyArea, allIndustry)
 			if newICount != -1 {
 				if newICount < iCount {
 					return &entity.FuncResult{false, errors.New("非法请求"), nil}
 				}
+				//行业是否异常
+				if upgradeBuyset.BuyerclassCount > newICount || upgradeBuyset.BuyerclassCount == -1 {
+					return &entity.FuncResult{false, errors.New("非法请求"), nil}
+				}
 			}
 			if newPCount != -1 {
 				if newPCount < pCount {
 					return &entity.FuncResult{false, errors.New("非法请求"), nil}
 				}
-				for a, b := range *newCityArr {
-					if (*cityArr)[a] != nil {
-						if qutil.IntAll((*cityArr)[a]) < qutil.IntAll(b) {
+				//区域是否异常
+				if upgradeBuyset.AreaCount > newPCount || upgradeBuyset.AreaCount == -1 {
+					return &entity.FuncResult{false, errors.New("非法请求"), nil}
+				}
+				for province, cityCount := range *cityArr {
+					if qutil.IntAll((*newCityArr)[province]) < qutil.IntAll(cityCount) {
+						return &entity.FuncResult{false, errors.New("非法请求"), nil}
+					}
+				}
+				citysMap := upgradeBuyset.Citys
+				for provinces, cityCounts := range *newCityArr {
+					if citysMap[provinces] != nil {
+						if qutil.IntAll(citysMap[provinces]) > qutil.IntAll(cityCounts) {
 							return &entity.FuncResult{false, errors.New("非法请求"), nil}
 						}
 					}
 				}
 			}
+			//------校验buyset、区域、行业是否异常
 
 			//
 			oldPriceY := entity.JyVipSubStruct.GetSubVipPriceByBuySet(citysArr, pCount, iCount, upgradeYear, 1, false)

src/jfw/modules/weixin/src/wx/wx.go

@@ -1562,7 +1562,7 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId, m string) (
 	var keysHas = ""       //已订阅关键词
 	flag := false
 	//有分类
-	var keysFilter = strings.Split(strings.Replace(keyWord, "+", " ", -1), " ")
+	var keysFilter = strings.Split(keyWord, " ")
 	if o_vipjy != nil && o_vipjy["a_items"] != nil && len(o_vipjy["a_items"].([]interface{})) > 0 {
 		var keysCount = 0 //已订关键词数量
 		hasOldKey = true
@@ -1608,12 +1608,12 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId, m string) (
 	classify_name := "未分类"
 	if m == "1" {
 		for _, v := range keysFilter {
-			tmp := map[string]interface{}{"key": strings.Split(v, " ")}
+			tmp := map[string]interface{}{"key": strings.Split(v, "+")}
 			a_key = append(a_key, tmp)
 		}
 	} else {
 		a_key = append(a_key, map[string]interface{}{
-			"key": keysFilter,
+			"key": strings.Split(keyWord, "+"),
 		})
 	}
 	if len(a_key) > 0 {

src/web/staticres/dataExport/css/previewData.css

@@ -29,10 +29,10 @@ body{
     white-space: nowrap;
 }
 .d_bz tr:nth-child(odd),.d_gj tr:nth-child(odd){
-	background-color: rgba(0,0,0,.02);
+	background-color: #f9f9f9;
 }
 .d_bz tr:nth-child(even),.d_gj tr:nth-child(even){
-/*	background-color: #ffffff;*/
+	background-color: #ffffff;
 }
 
 .d_bz{
@@ -180,14 +180,14 @@ body{
 	height:50px;
 	margin-bottom:5px;
 }
-/*.sy{
+.sy{
     background: url("/dataExport/image/sy.png");
     position: absolute;
     top: 0px;
     left: 0px;
     opacity: 0.5;    
 	margin-top: 55px;
-}*/
+}
 .fimg{
 	opacity: 0;
 	position: absolute;	

src/web/templates/common/weixinNotShare.html

@@ -0,0 +1,16 @@
+<script>
+function onBridgeReady() {
+    WeixinJSBridge.call('hideOptionMenu');
+}
+ 
+if (typeof WeixinJSBridge == "undefined") {
+    if (document.addEventListener) {
+        document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+    } else if (document.attachEvent) {
+        document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+        document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+    }
+} else {
+    onBridgeReady();
+}
+</script>

src/web/templates/weixin/dataExport/dataExport_previewData.html

@@ -1,16 +1,21 @@
 <html>
 	<head>
-		{{include "/common/meta.html"}}
-		<title>预览数据</title>		
-		<link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link rel="stylesheet" type="text/css" href="/jyapp/dataExport/iconfont/iconfont.css" />
-		<link rel="stylesheet" href="/jyapp/dataExport/css/preview_data.css">
-		<link rel="stylesheet" href="/jyapp/dataExport/css/previewData.css?v={{Msg "seo" "version"}}11">
+		<meta charset="utf-8">
+		<title>预览数据</title>
+		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+		<script src="{{Msg "seo" "cdn"}}/js/rem.js"></script>
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css" />					<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/previewData.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/preview_data.css">
 		<script src="https://cdn.bootcss.com/js-polyfills/0.1.42/polyfill.min.js"></script>
-		<script src="/jyapp/js/jquery-3.2.1.min.js"></script>
-		{{include "/common/js.html"}}
 		<style>
+			@font-face {
+				font-style: normal;
+			    font-weight: normal;
+				font-family: 'MyNewFont';
+				src: url('/fonts/ttf/{{.T.ttf}}.eot');  /* IE 9 - 11 */
+    			src: url('/fonts/ttf/{{.T.ttf}}.eot?#iefix') format('embedded-opentype'), /* IE Fix for IE 6-8*/
+				url("/fonts/ttf/{{.T.ttf}}.ttf") format("truetype");  /* chrome、firefox、opera、Safari, Android, iOS 4.2+ */
+			}
 			body{
 				-webkit-text-size-adjust: none;
 			}
@@ -21,6 +26,7 @@
 			    background: #382f3d;
 			    z-index: 999999999990;
 				opacity: .7;
+				    margin-top: -55px;
 			}
 			body .loading_ > p {
 			    position: absolute;
@@ -54,35 +60,20 @@
 			  100% {
 			    transform: rotate(360deg); } 
 			}
-			.app-layout-content-b {
-				display: flex;
-				flex-direction: column;
-				width: 100%;
-			}
 			.buttons-tab{
-				/*position: absolute;
+				position: fixed;
 			    top: 0px;
 			    left: 0px;
 			    right: 0px;
-				z-index: 9999; */
-				width: 100%;
-				   
+				z-index: 9999;    
 				height: 51px;
     			background: #fff;
     			font-size: 16px;
-				top: 20px;
-			}
-			.tab-container {
-				margin-top: 3px;
-				flex: 1;
-				width: 100%;
-				overflow: scroll;
-				border-top: 1px solid transparent
 			}
 			#d_bz{
+				margin-top:55px;
 				position:relative;
 				margin-bottom:10px;
-				background: url("/jyapp/dataExport/images/sy.png") repeat;
 			}
 			.fimg{
 				margin-top:55px;
@@ -144,32 +135,38 @@
 			    font-size: 16px;
 				text-align: center;
 			}
+			.noData_{
+				width: 200px;
+			    height: 50px;
+			    position: absolute;
+			    top: 40%;
+			    left: 50%;
+			    margin-left: -100px;
+			    font-size: 16px;
+				text-align: center;
+			}
 		</style>
 	</head>
 	<body>
 		<div class="loading_" style="display:none;">
 			<p><span></span></p>
 		</div>
-		<div class="app-layout-header">
-			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-			预览数据
+		<div class="buttons-tab">
+			<ul>
+				<li class="tab-link active">标准字段包</li>
+				<li class="tab-link ">高级字段包</li>
+			</ul>
 		</div>
-		<div class="app-layout-content-b">
-			<div class="buttons-tab">
-				<ul>
-					<li class="tab-link active">标准字段包</li>
-					<li class="tab-link ">高级字段包</li>
-				</ul>
+		<div class="tabs"  style="min-width:2020px;">
+			<table id="d_bz" class="d_bz" cellspacing="0" cellpadding="0" >
+				
+			</table>
+			<div class="sy">
 			</div>
-			<div class="tab-container">
-				<div class="tabs">
-					<table id="d_bz" class="d_bz" cellspacing="0" cellpadding="0" >
-						
-					</table>
-				</div>
-			</div>
-			<div class="noData" style="display:none;">今日已超出预览次数</div>
 		</div>
+		<div class="noData_" style="display:none;">暂无数据</div>
+		<div class="noData" style="display:none;">今日已超出预览次数</div>
+		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js"></script>
 		<script>
 			var bz = '<tr><td>序号</td><td>公告标题</td><td>公告内容</td><td>剑鱼标讯地址</td><td>省份</td><td>城市</td><td>发布时间</td><td>项目名称</td><td>采购单位</td><td>中标单位</td><td>中标价<br>(万元)</td><td>币种</td><td>公告类别</td></tr>';
 			var gj = '<tr><td>序号</td><td>公告标题</td><td>公告内容</td><td>公告地址</td><td>剑鱼标讯地址</td><td>省份</td><td>城市</td><td>发布时间</td><td>项目名称</td><td>项目编号</td><td>采购单位</td><td>采购单位<br>联系人</td><td>采购单位<br>联系电话</td><td>预算<br>(万元)</td><td>开标日期</td><td>中标单位</td><td>中标价<br>(万元)</td><td>招标机构</td><td>项目范围</td><td>币种</td><td>公告类别</td></tr>';
@@ -180,23 +177,22 @@
 				$(".buttons-tab .tab-link").each(function() {
 					var index = $(this).index();
 					$(".buttons-tab .tab-link").eq(0).addClass("active");
-
 					$(this).click(function() {
 						loading(true);
 						tab(parseInt(index)+1);
 						$(this).addClass("active").siblings().removeClass("active");
 					})
-				})
+				});
 				$(".buttons-tab .tab-link").eq((parseInt({{.T.dataType}})-parseInt(1))).addClass("active").siblings().removeClass("active");
 			})
 			//
 			function tab(t){
-				$.post("/jyapp/front/dataExport/getPreview",{dataType:t,_id:{{.T.id}}},function(r){
+				$.post("/front/wx_dataExport/getPreview",{dataType:t,_id:{{.T.id}}},function(r){
 					if(r.res.data){
 						var res = r.res.data;
 						var aHtml = bz;
 						if(t==2){
-							$(".tabs").css("min-width","2820px");
+							$(".tabs").css("min-width","4020px");
 							$("#d_bz").attr("class","d_gj");
 							aHtml = gj;
 							var a = 0;
@@ -244,6 +240,7 @@
 										+'<td>'+res[i]["subtype"]+'</td>'
 										+'</tr>';
 							}
+
 						}
 						$("#d_bz").html(aHtml);
 						$('td').each(function(){
@@ -254,12 +251,16 @@
 						});
 						makeP();
 					}else if(r.res.msg){
-						$(".tabs").css({"min-width":"0px","display": "none"});
-						$(".noData").text("今日已超出预览次数").show();
-						loading(false);
+						var msg = r.res.msg
+						if(msg=="超出预览次数"){
+							$(".tabs").css({"min-width":"0px","display": "none"});
+							$(".noData").show();
+							loading(false);
+							return
+						}
 					}else{
 						$(".tabs").css({"min-width":"0px","display": "none"});
-						$(".noData").text("暂无数据").show();
+						$(".noData_").show();
 						loading(false);
 					}
 				})
@@ -276,11 +277,15 @@
 			function makeP(){
 				var w=$("table").width();
 				var h=$("table").height();
-				//$(".sy").width($("table").width()).height($("table").height());
+				$(".sy").width($("table").width()).height($("table").height());
+				//html2canvas(document.querySelector(".tabs")).then(function(canvas){
+				//		var url=canvas.toDataURL('image/png');
+				//		$("body").append("<img class=\"fimg\" src=\""+url+"\">");
+				//		$("body img").width(w);
+				//});
 				loading(false);
 			}
 		</script>
-<!--百度统计end-->
-{{include "/common/baiducc.html"}}
+	{{include "/common/baiducc.html"}}
 	</body>
-</html>
+</html>

src/web/templates/weixin/historypush.html

@@ -414,7 +414,7 @@
 				}
 				//是否浏览过
 				var visited="";
-				if(obj.ca_visit==1){
+				if(obj.ca_isvisit==1){
 					visited="visited"
 				}
 		    if(showAd&&index==3&&!closeAdvert){//广告位

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

@@ -384,6 +384,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 <script>
     var AreaChoose = {
         selectObj: {},//已选择，未购买城市;

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

@@ -7,14 +7,14 @@
     <meta name="viewport" content="initial-scale=1, maximum-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/vipsubscribe/js/rem.js"></script>
-    <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}">
     {{include "/common/weixin.html"}}
-	<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
+	<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style type="text/css">
 	body,html {
@@ -27,6 +27,9 @@
     }
 </style>
 <body>
+	<script type="text/javascript">
+		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
+	</script>
     <div id="choose_area" >
         <div class="result">
             <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
@@ -390,10 +393,10 @@
             <a href="javascript:;">Z</a>
         </div>
     </div>
-    <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/updateArea.js?v={{Msg "seo" "version"}}18"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/updateArea.js?v={{Msg "seo" "version"}}18"></script>
 </body>
 
 </html>

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

@@ -244,6 +244,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 <script>
 
     // 点击导航跳转

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

@@ -6,11 +6,11 @@
         <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black">
-        <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-        <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-        <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}3">
+        <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+        <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
+        <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}3">
         {{include "/common/weixin.html"}}
         <!--<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>-->
     	<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
@@ -251,10 +251,10 @@
                 </div>
             </div>
         </main>
-        <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+        <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
         <!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
-        <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-        <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+        <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+        <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
         <script>
            //
            // 点击导航跳转

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

@@ -390,6 +390,7 @@
 <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/editArea.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 </body>
 
 </html>

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

@@ -44,6 +44,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 <script>
     $(window).bind("pageshow", function (event) {
         if (event.originalEvent.persisted) {

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

@@ -246,6 +246,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 <script>
     //加载数据
     var EditIndustry = {

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

@@ -19,6 +19,7 @@
             <button class="public_btn" id="back">返回<em class="time"></em></button>
         </div>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+        {{include "/common/weixinNotShare.html"}}
         <script>
 			
             $(function(){

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

@@ -64,10 +64,10 @@
                 <button style="display: none;" class="free_service" onclick="window.location.href='/swordfish/historypush'">使用免费订阅</button>
             </div>
 		</div>
-		<script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
+		<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js"></script>
     	<!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
-    	<script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    	<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}7"></script>
+    	<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    	<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}7"></script>
 		<script type="text/javascript">
 			//
 			var orderId = {{.T.orderId}};

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

@@ -9,11 +9,11 @@
     <title>VIP订阅续费</title>
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}7">
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}7">
 	{{include "/common/weixin.html"}}
 </head>
 <style type="text/css">
@@ -217,8 +217,8 @@
             </div>
         </div>
     </div>
-    <script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
-    <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}4"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}4"></script>
     <!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     <script src="https://res.wx.qq.com/open/libs/weuijs/1.1.4/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script type="text/javascript">

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

@@ -9,12 +9,12 @@
     <title>VIP订阅升级</title>
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}8">
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}8">
 	{{include "/common/weixin.html"}}
 </head>
 <style type="text/css">
@@ -246,9 +246,9 @@
             </div>
         </div>
     </div>
-    <script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
-    <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}5"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}5"></script>
     <script type="text/javascript">
     	//
     	try{
@@ -861,6 +861,9 @@
 						}
 					}
 				}
+				sessionStorage.removeItem("vipAddCount");
+				sessionStorage.removeItem("vipSubSelectAreaAdd");
+				sessionStorage.removeItem("vipSubSelectCity");
 			}
 			//
 			
@@ -1173,101 +1176,60 @@
 		    return false;
 		}
 	    //
-	//     function addAreaObj(){
-	//     	let areaObj = JSON.parse(sessionStorage.vipSubSelectAreaUpgrade)
-	//     	let buyset = JSON.parse(sessionStorage.vipSubSelectAreaAdd)
-	//     	//
-	//     	let provinceArr = [];
-	//     	let areasObj = {};
-	//     	if(buyset.country === -1){
-	//     		areasObj["全国"] = [];
-	//     	}else{
-	//     		for(let province in areaObj){
-	// //	    		console.log("666666",buyset.citys[province]);
-	// 				let cityLen = areaObj[province].length
-	// 	    		if(cityLen === 0){
-	// 	    			provinceArr.push(province);
-	// 	    		}else{
-	// 	    			let citys = areaObj[province];
-	// 	    			for(let i in buyset.city){
-	// 	    				let cityCount = buyset.city[i];
-	// 	    				if(province === i){
-	// 	    					if(cityLen > cityCount){
-	// 				    			let reduce = cityLen - cityCount;
-	// 				    			areasObj[province] = citys.slice(0, -reduce);
-	// 				    		}else{
-	// 				    			areasObj[province] = citys;
-	// 				    		}
-	// 	    				}
-	// 	    			}
-	// 	    		}
-	// 	    	}
-	//     		if(provinceArr.length > buyset.province){
-	//     			let reduce = provinceArr.length - buyset.province;
-	//     			provinceArr = provinceArr.slice(0, -reduce);
-	//     		}
-	//     		console.log(provinceArr)
-	//     		for(let a in provinceArr){
-	//     			let province = provinceArr[a];
-	//     			areasObj[province] = [];
-	//     		}
-	//     		console.log(areasObj)
-	//     	}
-	//     	return areasObj
-	//     }
-	function areaObj(){
-		let newbuyset = {}
-		let oldset = JSON.parse(JSON.stringify(oldBuyset))
-		newbuyset.areacount = oldset.areacount;
-		newbuyset.buyerclasscount = oldset.buyerclasscount;
-		newbuyset.citys = oldset.citys;
-		// let buyset = oldBuyset
-		console.log("11111",newbuyset)
-		if(sessionStorage.vipSubSelectAreaAdd!==undefined&&sessionStorage.vipSubSelectAreaAdd!==""){
-			let addbuyset = JSON.parse(sessionStorage.vipSubSelectAreaAdd);
-			if(addbuyset.country !== -1){
-				if(addbuyset.province !== 0){
-					newbuyset.areacount = newbuyset.areacount + addbuyset.province;
-				}
-				if(!checkObj(addbuyset.city)){
-					let cityArr = addbuyset.city
-					for(var i in cityArr){
-						let citysArr = newbuyset.citys
-						if(citysArr[i] !== undefined){
-							citysArr[i] = citysArr[i] + cityArr[i]
-						}else{
-							citysArr[i] = cityArr[i];
+	
+		function areaObj(){
+			let newbuyset = {}
+			let oldset = JSON.parse(JSON.stringify(oldBuyset))
+			newbuyset.areacount = oldset.areacount;
+			newbuyset.buyerclasscount = oldset.buyerclasscount;
+			newbuyset.citys = oldset.citys;
+			// let buyset = oldBuyset
+			console.log("11111",newbuyset)
+			if(sessionStorage.vipSubSelectAreaAdd!==undefined&&sessionStorage.vipSubSelectAreaAdd!==""){
+				let addbuyset = JSON.parse(sessionStorage.vipSubSelectAreaAdd);
+				if(addbuyset.country !== -1){
+					if(addbuyset.province !== 0){
+						newbuyset.areacount = newbuyset.areacount + addbuyset.province;
+					}
+					if(!checkObj(addbuyset.city)){
+						let cityArr = addbuyset.city
+						for(var i in cityArr){
+							let citysArr = newbuyset.citys
+							if(citysArr[i] !== undefined){
+								citysArr[i] = citysArr[i] + cityArr[i]
+							}else{
+								citysArr[i] = cityArr[i];
+							}
 						}
 					}
+				}else{
+					newbuyset.areacount = -1;
+					newbuyset.citys = {};
 				}
-			}else{
-				newbuyset.areacount = -1;
-				newbuyset.citys = {};
 			}
-		}
-		if(sessionStorage.vipSubSelectIndustryAdd!==undefined){
-			var addindustrys = JSON.parse(sessionStorage.vipSubSelectIndustryAdd);
-			if(addindustrys.length === 1 && addindustrys[0] === "全部行业"){
-				newbuyset.buyerclasscount = -1;
-			}else{
-				newbuyset.buyerclasscount = newbuyset.buyerclasscount + addindustrys.length;
+			if(sessionStorage.vipSubSelectIndustryAdd!==undefined){
+				var addindustrys = JSON.parse(sessionStorage.vipSubSelectIndustryAdd);
+				if(addindustrys.length === 1 && addindustrys[0] === "全部行业"){
+					newbuyset.buyerclasscount = -1;
+				}else{
+					newbuyset.buyerclasscount = newbuyset.buyerclasscount + addindustrys.length;
+				}
 			}
+			console.log(JSON.stringify(newbuyset))
+			return newbuyset
 		}
-		console.log(JSON.stringify(newbuyset))
-		return newbuyset
-	}
-	
-	function newBuysetObj(buyset){
-		let newset = JSON.parse(JSON.stringify(buyset));
-		for(let n in newset.citys){
-			if(newset.citys[n] > 2){
-				let cityarr = newset.citys
-				delete cityarr[n]
-				newset.areacount += 1
+		
+		function newBuysetObj(buyset){
+			let newset = JSON.parse(JSON.stringify(buyset));
+			for(let n in newset.citys){
+				if(newset.citys[n] > 2){
+					let cityarr = newset.citys
+					delete cityarr[n]
+					newset.areacount += 1
+				}
 			}
+			return newset
 		}
-		return newset
-	}
 	    
     </script>
 </body>