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

src/jfw/front/laboratory.go

@@ -1,25 +1,14 @@
 package front
 
 import (
-	"fmt"
-	"jfw/config"
-	"jfw/jyutil"
 	"jfw/wx"
 	"qfw/util"
 
 	"github.com/go-xweb/xweb"
-
-	//"net/url"
-	"jfw/public"
-	"net/url"
 )
 
 type Lab struct {
 	*xweb.Action
-	/********************剑鱼标讯实验室dev2.0**************************/
-	index          xweb.Mapper `xweb:"/jylab/index"`        //实验室首页
-	qrToLab        xweb.Mapper `xweb:"/jylab/qrToLab/(.*)"` //pc端扫码进入实验室首页
-	qrToLabSubpage xweb.Mapper `xweb:"/jylab/qr/(.*)"`      //pc端扫码进入实验室子页
 	/*******************剑鱼标讯百宝箱dev2.8.5*************************/
 	treasureBox xweb.Mapper `xweb:"/jyTreasureBox/treasureBox"` //剑鱼百宝箱
 }
@@ -29,8 +18,7 @@ func init() {
 	xweb.AddAction(&Lab{})
 }
 
-//剑鱼标讯实验室首页
-func (l *Lab) Index() error {
+func (l *Lab) TreasureBox() error {
 	defer util.Catch()
 	userid := util.ObjToString(l.GetSession("userId"))
 	openid := util.ObjToString(l.GetSession("s_m_openid"))
@@ -41,60 +29,5 @@ func (l *Lab) Index() error {
 	l.T["nickname"] = l.Session().Get("s_nickname").(string)
 	l.T["avatar"] = l.Session().Get("s_avatar").(string)
 	l.T["s_m_openid"] = se.EncodeString(openid)
-	return l.Render("/weixin/jylab/lab-close.html", &l.T)
-	// return l.Render("/weixin/jylab/lab-index.html", &l.T)
-}
-
-//剑鱼标讯实验室-智能订阅
-func (l *Lab) LabMode(mode string) error {
-	defer util.Catch()
-	userid := util.ObjToString(l.GetSession("userId"))
-	openid := util.ObjToString(l.GetSession("s_m_openid"))
-	if userid == "" {
-		return l.Redirect("/swordfish/about")
-	}
-	tmp, ok := mongodb.FindById("user", userid, `{"s_headimage":1,"s_nickname":1}`)
-	if !ok || tmp == nil || len(*tmp) == 0 {
-		return nil
-	}
-	l.T["s_m_openid"] = se.EncodeString(openid)
-	l.T["signature"] = wx.SignJSSDK(l.Site() + l.Url())
-	l.T["nickname"] = (*tmp)["s_nickname"]
-	l.T["avatar"] = (*tmp)["s_headimage"]
-	return l.Render("/weixin/jylab/lab-index.html", &l.T)
-}
-
-//pc端扫码进入实验室
-func (l *Lab) QrToLab(t string) error {
-	return l.Redirect("/jylab/index")
-}
-
-//pc端扫码进入实验室子页面
-func (l *Lab) QrToLabSubpage(t string) error {
-	userid := util.ObjToString(l.GetSession("userId"))
-	if userid == "" {
-		if l.GetString("state") == "wx" {
-			//微信跳回来的
-			code := l.GetString("code")
-			if code != "" {
-				openid := jyutil.Getopenid(code)
-				FindUserAndCreateSess(openid, l.Session())
-				return l.Redirect("/jylab/index")
-			} else {
-				return nil
-			}
-		} else {
-			if public.CheckWxBrowser(l.Request) {
-				//所有参数都不再使用,跳到微信验证用户
-				return l.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(l.Site()+l.Url()), "wx"), 302)
-			} else {
-				return l.Render("/weixin/sharePage.html")
-			}
-		}
-	} else {
-		return l.Redirect("/jylab/index")
-	}
-}
-func (l *Lab) TreasureBox() error {
 	return l.Render("/weixin/treasure_box.html", &l.T)
 }

src/jfw/modules/pushsubscribe/src/match/job/matchjob.go

@@ -192,7 +192,7 @@ func (m *MatchJob) OnceUserBatch(batchIndex int, lastUserId *string) (int, *VipU
 	logger.Info("开始加载第", batchIndex, "批用户", q)
 	session := mongodb.GetMgoConn()
 	defer mongodb.DestoryMongoConn(session)
-	query := session.DB(DbName).C(User).Find(&q).Select(public.UserCollFields).Iter()
+	query := session.DB(DbName).C(User).Find(&q).Select(public.UserCollFields).Sort("_id").Iter()
 	n := 0
 	freeUser := NewFreeUser() //免费所有用户
 	vipUser := NewVipUser()   //vip所有用户

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

@@ -42,7 +42,7 @@ func (o *editSubResult) Format() *map[string]interface{} {
 func (this *EditSub) GetSubBuyMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	r := func() *editSubResult {
-		mData, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1}`)
+		mData, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1}`)
 		if !ok || len(*mData) == 0 || mData == nil {
 			return &editSubResult{false, errors.New("获取信息失败"), nil}
 		}
@@ -50,6 +50,7 @@ func (this *EditSub) GetSubBuyMsg() {
 		//地区 城市 数量 修改次数
 		//editNum := qutil.IntAll(redis.Get("other", userId+"_SubEdit_"+time.Now().Month().String()))
 		return &editSubResult{true, nil, map[string]interface{}{
+			"isTrial":  qutil.IntAll((*mData)["i_vip_status"]) == 1,
 			"area":     (*o_vipjy)["o_area"],
 			"industry": (*o_vipjy)["a_buyerclass"],
 			"buyset":   (*o_vipjy)["o_buyset"],

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

@@ -989,7 +989,7 @@ func ScanHandler(w ResponseWriter, r *Request) {
 					subkey = util.ObjToString(redis.Get("sso", "pc_subscribe_"+shareid))
 					if subkey != "" {
 						resNum := 0
-						resNum, subkey, _ = vipFastSubscribe(m, subkey, openid)
+						resNum, subkey, _ = vipFastSubscribe(m, subkey, openid, "1")
 						if resNum == -2 {
 							pcresult = "repeat"
 						} else if resNum == -3 {
@@ -1553,7 +1553,7 @@ func updateIsPush(openid string, status int) {
 }
 
 //
-func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (returnValue int, content string, hasOldKey bool) {
+func vipFastSubscribe(user *map[string]interface{}, keyWord, openId, m string) (returnValue int, content string, hasOldKey bool) {
 	if keyWord == "" {
 		return
 	}
@@ -1604,11 +1604,18 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 			return -3, strings.Replace(keyWord, "+", " ", -1), hasOldKey
 		}
 	}
-	var _key = make(map[string]interface{})
-	var a_key = make([]map[string]interface{}, 1)
+	var a_key []map[string]interface{}
 	classify_name := "未分类"
-	_key["key"] = keysFilter
-	a_key[0] = _key
+	if m == "1" {
+		for _, v := range keysFilter {
+			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,
+		})
+	}
 	if len(a_key) > 0 {
 		flag = tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, bson.M{
 			"$push": bson.M{
@@ -1623,7 +1630,7 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 		}, false, false)
 	}
 	if flag {
-		return 1, strings.Replace(strings.Join(keysFilter, " "), "+", " ", -1), hasOldKey
+		return 1, strings.Replace(keyWord, "+", " ", -1), hasOldKey
 	}
 	return
 }
@@ -1641,7 +1648,7 @@ func fastSubscribe(content, openId string) (int, string, bool) {
 		o_jy, _ := (*user)["o_jy"].(map[string]interface{})
 		i_vip_status := util.IntAll((*user)["i_vip_status"])
 		if (*user)["i_vip_status"] != nil && i_vip_status > 0 && keyWord != "" {
-			return vipFastSubscribe(user, keyWord, openId)
+			return vipFastSubscribe(user, keyWord, openId, "2")
 		} else {
 			if o_jy == nil {
 				o_jy = make(map[string]interface{})

src/web/staticres/css/subscribe.css

@@ -1,12 +1,12 @@
 /* banner图板块 */
 .tender-1 {
     width: 100%;
-    height: 475px;
+    /* height: 475px; */
 }
 
 .tender-1 .imgauto {
     width: 100%;
-    height: 100%;
+    /* height: 100%; */
     /* margin: 0 auto; */
 }
 
@@ -20,7 +20,7 @@
 .subscription {
     width: 100%;
     height: 268px;
-    margin-top: -110px;
+    margin-top: -70px;
 }
 
 .subscription .sub-center {
@@ -420,6 +420,7 @@
 .modal-content > img {
     margin: -46px 0 0 -1px;
     /* height: 447px; */
+    position: relative;
 }
 
 .modal-content .vip-code {
@@ -654,3 +655,9 @@
     animation-fill-mode: forwards
 }
 
+.modal-content .close{
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    color: aliceblue;
+}

src/web/staticres/css/wx/treasure_box.css

@@ -51,22 +51,24 @@
   width: 100%;
 }
 
-.treasure .vip_subscribe .title a h4, .treasure .data_export .title a h4 {
-  font-size: .32rem;
-  color: #1D1D1D;
+.treasure .vip_subscribe .title a h7, .treasure .data_export .title a h7 {
+ 	font-size: .34rem;
+    font-weight: 600;
+    color: #1D1D1D;
+    font-family: 微软雅黑;
 }
 
 .treasure .vip_subscribe .title a p, .treasure .data_export .title a p {
-  padding-top: 0.04rem;
-  color: #888888;
-  font-size: .26rem;
+  padding-top: 0.06rem;
+  color: #686868;
+  font-size: .28rem;
 }
 
 .treasure .vip_subscribe .title a:after, .treasure .data_export .title a:after {
   content: "";
   display: inline-block;
-  height: 6px;
-  width: 6px;
+  height: 8px;
+  width: 8px;
   border-width: 1px 1px 0 0;
   border-color: #C5C5C5;
   border-style: solid;
@@ -104,7 +106,8 @@
 }
 
 .treasure .vip_subscribe .info .info_list .info_list_right, .treasure .data_export .info .info_list .info_list_right {
-  font-size: .2rem;
+  font-size: .24rem;
+  color:#9E9E9E;
 }
 
 .treasure .data_export {

src/web/staticres/vipsubscribe/js/editArea.js

@@ -1,6 +1,7 @@
 // 后端数据结构
 var areaData = {
     "data": {
+        "isTrial": true,
         "area": {
             // "北京": [],
             // "河南": [
@@ -284,6 +285,11 @@ $(function () {
             getResult()
         } else {
             $('.checkbox:not(:checked)').attr('disabled', true)
+            if (areaData.data.isTrial) {
+                showTip(`<span style="white-space: nowrap;">您只选择试用了` + totalLength + `个省份</span>，<span style="white-space: nowrap;">如需更多，请前往VIP订阅进行购买</span>`);
+            } else {
+                showTip(`<span style="white-space: nowrap;">您只购买了` + totalLength + `个省份，如需更多请升级<span></p>`)
+            }
             getResult()
         }
         if ($(this).is(':checked')) {
@@ -336,6 +342,12 @@ $(function () {
             } else if (isActive > 0 && isActive == count) {
                 $(this).parents('li').find('input.checkbox').addClass('half');
                 $(this).parent('div').find('.city:not(.active)').attr('disabled', true)
+                //提示订阅
+                if (areaData.data.isTrial) {
+                    showTip(`<span style="white-space: nowrap;">您只选择试用了` + $(this).parents('li').find(".province").attr("data-count") + `个市</span>，<span style="white-space: nowrap;">如需更多，请前往VIP订阅进行购买</span>`);
+                } else {
+                    showTip(`<span style="white-space: nowrap;">您只购买了` + $(this).parents('li').find(".province").attr("data-count") + `个市，如需更多请升级<span></p>`)
+                }
                 getResult()
             } else {
                 $(this).parent('div').find('.city:not(.active)').removeAttr('disabled')
@@ -389,3 +401,10 @@ function theSameAs(select) {
     let tmp2 = getAreaClassArr(areaData.data.area);
     return (JSON.stringify(tmp1[0].sort()) === JSON.stringify(tmp2[0].sort())) && (JSON.stringify(tmp1[1].sort()) === JSON.stringify(tmp2[1].sort()));
 }
+
+function showTip(msg) {
+    weui.toast(msg, {
+        duration: 2000,
+        className: 'custom-toast',
+    });
+}

src/web/templates/pc/subscribe_new.html

@@ -58,6 +58,7 @@
     <div class="modal-dialog modal-dialog-subvip modal-sm" role="document">
         <div class="modal-content">
             <img src="{{Msg "seo" "cdn"}}/images/subscribe/vip_tanchuang.png?v={{Msg "seo" "version"}}" alt="">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             <div class="vip-code">
                 <img id="vipCode" alt="" style="width: 139px;height: 139px">
                 <p class="vip-text">扫描二维码体验VIP订阅</p>

src/web/templates/weixin/email/bind_email.html

@@ -2,11 +2,16 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
		{{if .T.text_email}}
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		{{if .T.text_email}}
 		<title>更换邮箱</title>
 		{{else}}
 		<title>我的邮箱</title>
-		{{end}}
		<meta name="Keywords" content="绑定邮箱"/>
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>        
+		{{end}}
+		<meta name="Keywords" content="绑定邮箱"/>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>        
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 
 		{{include "/common/weixin.html"}}
@@ -74,9 +79,22 @@
 		<div class="loading_">
 		    <p><span></span></p>
 		</div>
-		<div class="bind_email">
			<div class="input mgT26">
				<input type="email" placeholder="输入邮箱" name="" id="" value="" class="email_input" />
				<input type="text" placeholder="输入验证码" name="" id="" value="" class="code_input" />
				<button class="sendcode" >获取验证码</button>
+		<div class="bind_email">
+			<div class="input mgT26">
+				<input type="email" placeholder="输入邮箱" name="" id="" value="" class="email_input" />
+				<input type="text" placeholder="输入验证码" name="" id="" value="" class="code_input" />
+				<button class="sendcode" >获取验证码</button>
 				<button class="code_true"><i class="icon iconfont email_check_ok" style="display: inline;"></i></button>
-				<!--<i class="icon iconfont email_check_ok" style="display: inline;color:#2cb7ca"></i>-->
			</div>
			<button type="button" disabled="disabled" class="common_btn btn" id="bindBtn">绑定</button>
			<div class="toast" style="display: none;">
				<div class="toast_content"></div>
			</div>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js//zepto.js?v={{Msg "seo" "version"}}"></script>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js?v={{Msg "seo" "version"}}1"></script>
		<script>
+				<!--<i class="icon iconfont email_check_ok" style="display: inline;color:#2cb7ca"></i>-->
+			</div>
+			<button type="button" disabled="disabled" class="common_btn btn" id="bindBtn">绑定</button>
+			<div class="toast" style="display: none;">
+				<div class="toast_content"></div>
+			</div>
+		</div>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js//zepto.js?v={{Msg "seo" "version"}}"></script>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js?v={{Msg "seo" "version"}}1"></script>
+		<script>
 			$(function () {    
 				var isPageHide = false;   
 				window.addEventListener('pageshow', function () {      
@@ -102,22 +120,25 @@
 				}else{
 					$("body").css({"visibility":""});
 				}
-			}
			$(function(){
-//				var initflag = true;
-//				$(window).bind("pageshow", function(event){
-//					initflag = false;
-//					if (initflag){
-//						initpage();
-//					}
-//				});
-//				if (initflag){
-//					initflag = false;
-//					initpage();
+			}
+			$(function(){
+//				var initflag = true;
+//				$(window).bind("pageshow", function(event){
+//					initflag = false;
+//					if (initflag){
+//						initpage();
+//					}
+//				});
+//				if (initflag){
+//					initflag = false;
+//					initpage();
 //				}
 				$("body").css({"visibility":""});
 				$(".loading_").hide();
-				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
				var emailVal,code;
-				var userId={{.T.userId}}
				var reg = /^[a-zA-Z0-9]+([._-]*[a-zA-Z0-9]*)*@[a-zA-Z0-9]+.[a-zA-Z0-9{2,5}$]/;
+				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+				var emailVal,code;
+				var userId={{.T.userId}}
+				var reg = /^[a-zA-Z0-9]+([._-]*[a-zA-Z0-9]*)*@[a-zA-Z0-9]+.[a-zA-Z0-9{2,5}$]/;
 				//判断是否是更改邮箱；
 				if (param=="change"){
 					$(".email_input").attr("placeholder","输入新邮箱");
@@ -127,32 +148,43 @@
 					promptbox("解绑成功");
 				}
 				
-				//
				$('.sendcode').on('click',function(){
-					var that =this;
					emailVal = $('.email_input').val();
					let isEmail = reg.test(emailVal);//正则验证邮箱号
					if($.trim(emailVal) === ''){
-						promptbox('邮箱号不能为空');
					}else if(isEmail === false){
						promptbox('邮箱格式不正确');
					}else{
+				//
+				$('.sendcode').on('click',function(){
+					var that =this;
+					emailVal = $('.email_input').val();
+					let isEmail = reg.test(emailVal);//正则验证邮箱号
+					if($.trim(emailVal) === ''){
+						promptbox('邮箱号不能为空');
+					}else if(isEmail === false){
+						promptbox('邮箱格式不正确');
+					}else{
 						$.post("/subscribepay/orderListDetails/setEmail",{"email":emailVal},function(data){
 							userId=data.userId;
-							//发送成功
+							//发送成功
 							if(data.success){
 								sendCode(that,300);
 								$(".sendCode").prop("disabled","disabled");
 								$(".email_input").prop("readonly",true);
+								$(".email_input").attr("unselectable","on");
+								$(".email_input").attr("onfocus","this.blur()");
+								$(".email_input").css("-webkit-user-select","none");
 								sessionStorage.setItem("send_mycode_"+userId, Date.parse(new Date())/1000);
 								//发送验证码后 sessionStorage邮箱 
 								sessionStorage.setItem("send_myemail_"+userId, $(".email_input").val().replace(/\s*/g,""));
 							}else{	
 								//发送失败
 								if(data.errCode==2){
-									console.log(data.time)
 									sendCode(that,data.time);
 									$(".email_input").attr("readonly",true);
 									//发送验证码后 sessionStorage邮箱 
 								sessionStorage.setItem("send_myemail_"+userId, $(".email_input").val().replace(/\s*/g,""));
 								}
 								promptbox(data.errMsg);
-							}
+							}
 						});
-
					}
				})
+
+					}
+				})
 				
 				//验证码校验
 				$('.code_input').bind('input propertychange',()=>{
@@ -216,7 +248,8 @@
 							}
 						}
 					})
-				})
			})
+				})
+			})
 			
 			//提示框
 			function promptbox(str){
@@ -227,7 +260,9 @@
 				},1500)
 			}
 			
-
		</script>
+
+		</script>
 		
-	{{include "/common/baiducc.html"}}
	</body>
+	{{include "/common/baiducc.html"}}
+	</body>
 </html>

src/web/templates/weixin/email/bind_success.html

@@ -21,6 +21,18 @@
 		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
 		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js"></script>
 		<script>
+			$(function () {    
+				var isPageHide = false;   
+				window.addEventListener('pageshow', function () {      
+				    if (isPageHide) {
+		                location.reload();
+				    }    
+				});    
+				window.addEventListener('pagehide', function () {
+				    isPageHide = true;
+				});  
+			});
+		
 			$(function(){
 				//分享
 				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});

src/web/templates/weixin/email/unbind_email.html

@@ -50,6 +50,17 @@
 		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
 		<script>
 			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+			$(function () {    
+				var isPageHide = false;   
+				window.addEventListener('pageshow', function () {      
+				    if (isPageHide) {
+		                location.reload();
+				    }    
+				});    
+				window.addEventListener('pagehide', function () {
+				    isPageHide = true;
+				});  
+			});
 			$(function(){
 				/* 更换邮箱 */
 				$('.choose_email').on('click',() =>{

src/web/templates/weixin/jylab/lab-cjss.html

@@ -1,176 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}" style="display:none">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">超级搜索 <a href="javascript:jumpTo();" id="searchuse" class="hidden">使用</a></div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput" style="display: hidden;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>按行业、金额搜索，结果可按表格显示</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox" class="slideBox">
-					<div id="box1" class="box">
-						<div class="bd">
-						<ul>
-							<li>
-								<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-cjss-0101.png" />
-							</li>
-							<li>
-								<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-cjss-02.png" />
-							</li>
-							<li>
-								<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-cjss-03.png" />
-							</li>
-						</ul>
-					</div>
-					</div>
-					<div id="box2" class="box">
-						<div class="iner-text">
-							使用超级搜索功能，您可以按行业搜索招标信息，或者搜索金额在指定范围内的招标信息，您还可以选择以表格形式呈现搜索结果，所有信息一目了然，尽收眼底。
-						</div>
-					</div>
-					<div class="hd">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			<!--查看详情-->
-			<div class="details">
-				<div class="details-inner">
-					<div class="iner-title">
-						<span class="on">查看详情</span>
-					</div>
-				</div>
-			</div>
-			<!--意见反馈-->
-			<div class="feedback">
-				<a href="/swordfish/feedback?fromName=cjss">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="{{Msg "seo" "cdn"}}/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-        var s_openid = {{.T.s_m_openid}};
-        var support = "";
-		var thistype = "cjss";
-		//$(function(){
-			var usebot = {{.T.switchstatus}}
-			if (usebot&&usebot==1){
-				$("#searchuse").removeClass("hidden");
-			}else{
-				$("#searchuse").addClass("hidden");
-			}
-			$("#dz").parent("div").on("tap",function(){
-                behaviorCollect(2);
-			})
-		//})
-
-        //行为采集 1-打开开关 2-分享//点赞
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/cjss/";
-                var s_model = "实验室-超级搜索";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-                }
-
-                var encode= {{ConEncode "/jylab/laboratory/cjss/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-		function jumpTo(){
-			var value = getUrlParam("v");
-			if(sessionStorage){
-				if(value != null){
-					sessionStorage.searchpageName = value;
-					window.history.back();
-				}else{
-					sessionStorage.searchpageName = "lab_search_back";
-					window.location.href = "/jylab/mainSearch?v=s";
-				}
-			}else{
-				window.location.href = "/jylab/mainSearch?v=s";
-			}
-		}
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.supstatus){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-	</script>
-<!--百度统计end-->
-{{include "/common/baiducc.html"}}
-</body>
-</html>

src/web/templates/weixin/jylab/lab-close.html

@@ -1,75 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/reset.css?v={{Msg "seo" "version"}}" />
-		<script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		{{include "/common/weixin.html"}}
-		<title>剑鱼标讯实验室</title>
-    <style>
-      body {
-        background: #2cb7ca;
-      }
-      header{
-        font-size: .32rem;
-        text-align: center;
-        color: #fff;
-        padding-top: .7rem;
-        display:none;
-      }
-      section{
-        position: absolute;
-        top: 50%;
-        height: 10rem;
-        margin-top: -5rem;
-        width: 100%;
-      }
-      article{
-        height: 8rem;
-      }
-      .main{
-        text-align: center;
-        color:#fff;
-        font-size: .32rem;
-        
-        background: url(/images/syzindex/lab_closed.png);
-        background-size:  90% auto;
-        background-repeat: no-repeat;
-        background-position: center;
-      }
-      .main span{
-        position: relative;
-        top: 7rem;
-      }
-      .toDeatil{
-        color: #2cb7ca;
-        height: .9rem;
-        width: 2.5rem;
-        text-align: center;
-        margin: 0 auto;
-        line-height: .9rem;
-        border-radius: .1rem;
-        background: #fff;
-        font-size: .32rem;
-      }
-
-    </style>
-	</head>
-	<body>
-    <header>剑鱼标讯实验室</header>
-    <section>
-      <article class="main">
-        <span>剑鱼标讯实验室已关闭</span>
-      </article>
-      <div class="toDeatil" onclick="window.location.href='https://mp.weixin.qq.com/s/c8QImDnwnJKIBfA2oNTTpw'">
-        查看详情
-      </div>
-    </section>
-  </body>
-  <script>
-		initShare({{.T.signature}},{{.T.s_m_openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-	</script>
-</html>  

src/web/templates/weixin/jylab/lab-gzqy.html

@@ -1,156 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}		
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden {{end}}{{end}}" style="display:none;">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">我关注的企业<a href="/jylab/followent/entList" id="searchuse" class="hidden" >使用</a></div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput" style="display: hidden;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>第一时间接收关注企业的中标信息</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox" class="slideBox">
-					<div id="box1" class="box">
-						<div class="bd">
-							<ul>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-gzqy-01.png" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-gzqy-02.png" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-gzqy-03.png" />
-								</li>
-							</ul>
-						</div>
-					</div>
-					<div id="box2" class="box">
-						<div class="iner-text">
-							您关注了某个企业以后，该企业一旦有项目中标，您将第一时间收到剑鱼标讯的通知消息。可以输入企业名称加关注，也可以从招标信息页面将页面上出现的企业添加关注。
-						</div>
-					</div>
-					<div class="hd">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			<!--查看详情-->
-			<div class="details">
-				<div class="details-inner">
-					<div class="iner-title">
-						<span class="on">查看详情</span>
-					</div>
-				</div>
-			</div>
-			<!--意见反馈-->
-			<div class="feedback">
-				<a href="/swordfish/feedback?fromName=gzqy">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="{{Msg "seo" "cdn"}}/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-        var s_openid = {{.T.s_m_openid}};
-        var support = "";
-		var thistype = "gzqy";
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.followent){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-		//$(function(){
-			$("#dz").parent("div").on("tap",function(){
-                behaviorCollect(2);
-			});
-		//})
-
-        //行为采集 1-打开开关 2-分享//点赞
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/gzqy/";
-                var s_model = "实验室-我关注的企业";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-                }
-
-                var encode= {{ConEncode "/jylab/laboratory/gzqy/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-	</script>
-<!--百度统计end-->
-{{include "/common/baiducc.html"}}
-</body>
-</html>

src/web/templates/weixin/jylab/lab-index.html

@@ -1,109 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syzindex.css?v={{Msg "seo" "version"}}" />
-		<script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			initShare({{.T.signature}},{{.T.s_m_openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-	<!--主题内容-->
-	<section id="sys-main">
-		<!--头部-->
-		<section class="header-text">
-			<h3>欢迎体验剑鱼标讯实验室</h3>
-			<p>这里有剑鱼标讯正在探索的功能，</br>欢迎体验并向我们反馈您的感受和建议！</p>
-			<p><img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-cap.png" alt="" />可参与的实验</p>
-		</section>
-		<!--列表-->
-		<section class="content">
-			<ul>
-				<li>
-					<a href="#">
-						<div>智能订阅模式</div>
-						<div>更聪明的招标订阅模式</div>
-					</a>
-				</li>
-				<li>
-					<a href="#">
-						<div>订阅数据导出</div>
-						<div>用表格呈现订阅数据，可下载导出</div>
-					</a>
-				</li>
-				<li>
-					<a href="#">
-						<div>超级搜索</div>
-						<div>按行业、金额搜索，结果可按表格显示</div>
-					</a>
-				</li>
-				<li>
-					<a href="#">
-						<div>中标企业搜索</div>
-						<div>搜索企业的所有中标项目信息</div>
-					</a>
-				</li>
-				<li>
-					<a href="#">
-						<div>我关注的企业</div>
-						<div>第一时间接收关注企业的中标信息</div>
-					</a>
-				</li>
-			</ul>
-		</section>
-	</section>
-		
-	</body>
-	<script>
-		new FastClick(document.body);
-        var s_openid = {{.T.s_m_openid}};
-		//$(function(){
-			$("body").css({"background-size":"2.72rem 3.29rem"})
-			/*实验室首页动画*/
-			var syzIndexMove = function(){
-				var $lists = $("#sys-main .content li"),
-					$eq1 = $lists.eq(0),
-					$eq2 = $lists.eq(1),
-					$eq3 = $lists.eq(2),
-					$eq4 = $lists.eq(3),
-					$eq5 = $lists.eq(4);
-				return{
-					moveNow:function(){
-						$eq1.animate({
-							"top":".2rem",
-							"opacity":"1"
-						},100);
-						$eq2.animate({
-							"top":"2.06rem",
-							"opacity":"1"
-						},200);
-						$eq3.animate({
-							"top":"3.88rem",
-							"opacity":"1"
-						},400);
-						$eq4.animate({
-							"top":"5.71rem",
-							"opacity":"1"
-						},600);
-						$eq5.animate({
-							"top":"7.58rem",
-							"opacity":"1"
-						},800);
-					}
-				}
-			}()
-			/*调用*/
-			syzIndexMove.moveNow()
-		//})
-	</script>
-<!--百度统计end-->
-{{include "/common/baiducc.html"}}
-</html>

src/web/templates/weixin/jylab/lab-sjdc.html

@@ -1,154 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">订阅数据导出</div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput" style="display: hidden;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>用表格呈现订阅数据，可下载导出</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox" class="slideBox">
-					<div id="box1" class="box">
-						<div class="bd">
-							<ul>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-sjdc-01.png" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-sjdc-02_new.png" />
-								</li>
-								
-							</ul>
-						</div>
-					</div>
-					<div id="box2" class="box">
-						<div class="iner-text">
-							剑鱼标讯向您推送多条信息时，将附带一个电子信息表格，这个表格可以将信息更清晰地呈现给您，您也可以将其导入到Excel中进行统计汇总。
-						</div>
-					</div>
-					<div class="hd">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			<!--查看详情-->
-			<div class="details">
-				<div class="details-inner">
-					<div class="iner-title">
-						<span class="on">查看详情</span>
-					</div>
-				</div>
-			</div>
-			<!--意见反馈-->
-			<div class="feedback">
-				<a href="/swordfish/feedback?fromName=sjdc">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="{{Msg "seo" "cdn"}}/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-        var s_openid = {{.T.s_m_openid}};
-        var support = "";
-		var thistype = "sjdc";
-		//$(function(){
-			$("#dz").parent("div").on("tap",function(){
-                behaviorCollect(2);
-			})
-		//})
-
-        //行为采集
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/sjdc/";
-                var s_model = "实验室-订阅数据导出";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-                }
-
-                var encode= {{ConEncode "/jylab/laboratory/sjdc/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.dataexportstatus){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-	</script>
-<!--百度统计end-->
-{{include "/common/baiducc.html"}}
-</body>
-</html>

src/web/templates/weixin/jylab/lab-zbqy.html

@@ -1,151 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}" style="display:none;">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">中标企业搜索<a href="javascript:jumpTo();" id="searchuse" class="hidden">使用</a></div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput" style="display: hidden;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel" style="border-bottom: 1px solid #e0e0e0;height:79.3vh;">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>搜索企业的所有中标项目信息</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox-one" class="slideBox">
-					<div class="bd">
-						<ul>
-							<li>
-								<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-zbqy.png" />
-							</li>
-						</ul>
-					</div>
-					<div class="hd" style="display:none;">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			
-			<!--意见反馈-->
-			<div class="feedback" style="margin-top: 1.5vh;">
-				<a href="/swordfish/feedback?fromName=zbqy">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="/js/jquery-3.2.1.min.js"></script>
-	<script src="/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-        var s_openid = {{.T.s_m_openid}};
-        var support = "";
-		var thistype = "zbqy";
-		//$(function(){
-			$("#dz").on("tap",function(){
-                behaviorCollect(2);
-			})
-		//})
-
-        //行为采集
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/zbqy/";
-                var s_model = "实验室-中标企业搜索";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-                }
-
-                var encode= {{ConEncode "/jylab/laboratory/zbqy/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-		
-		function jumpTo(){
-			var value = getUrlParam("v");
-			if(sessionStorage){
-				if(value != null){
-					sessionStorage.searchpageName = value;
-					window.history.back();
-				}else{
-					sessionStorage.searchpageName = "lab_ent_back";
-					window.location.href = "/jylab/mainSearch?v=e";
-				}
-			}else{
-				window.location.href = "/jylab/mainSearch?v=e";
-			}
-		}
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.entstatus){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-	</script>
-<!--百度统计end-->
-{{include "/common/baiducc.html"}}
-</body>
-</html>

src/web/templates/weixin/jylab/lab-zndy.html

@@ -1,157 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden {{end}}{{end}}">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">智能订阅模式</div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput{{ if .T.switchstatus}}{{if eq .T.switchstatus true}} checked{{end}}{{end}}" style="display: block;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>更聪明的招标订阅模式</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox" class="slideBox">
-					<div id="box1" class="box">
-						<div class="bd">
-							<ul>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/zndy01.png" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/zndy02.jpg" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/zndy03.png" />
-								</li>
-							</ul>
-						</div>
-					</div>
-					<div id="box2" class="box">
-						<div class="iner-text">
-							如果您打开“智能订阅模式”，除了将关键词与公告标题匹配，剑鱼标讯还将更智能的与公告正文进行匹配。比如您订阅了关键词“路由器”，一般路由器是与其他设备合并在一个项目里采购，很少有项目单独采购路由器，使用智能匹配模式，您就可以收到采购内容包含了“路由器”的招标公告信息，无论公告标题有没有包含“路由器”。如果公告正文中列举了采购内容，剑鱼标讯将与采购内容匹配，否则，将与正文全文匹配。您打开智能订阅模式情况下，添加排除词，排除词匹配全文。
-						</div>
-					</div>
-					<div class="hd">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			<!--查看详情-->
-			<div class="details">
-				<div class="details-inner">
-					<div class="iner-title">
-						<span class="on">查看详情</span>
-					</div>
-				</div>
-			</div>
-			<!--意见反馈-->
-			<div class="feedback">
-				<a href="/swordfish/feedback?fromName=zndy">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="{{Msg "seo" "cdn"}}/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-		var s_openid = {{.T.s_m_openid}};
-		var support = "";
-		var thistype = "zndy";
-		//$(function(){
-			$("#dz").parent("div").on("tap",function(){
-                behaviorCollect(2);
-			})
-		//})
-
-        //行为采集  1-打开开关 2-分享//点赞
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/zndy/";
-                var s_model = "实验室-智能订阅模式";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-				}
-
-                var encode= {{ConEncode "/jylab/laboratory/zndy/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';//原s_support改成了s_share
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-		//
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.smartstatus){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-	</script>
-<!--百度统计end-->
-{{include "/common/baiducc.html"}}
-</body>
-</html>

src/web/templates/weixin/treasure_box.html

@@ -9,9 +9,10 @@
     <title>百宝箱</title>
     <script src="/js/rem.js"></script>
     <link rel="stylesheet" type="text/css" href="/css/wx/base.css" />
-    <link rel="stylesheet" href="/css/wx/treasure_box.css">
+    <link rel="stylesheet" href="/css/wx/treasure_box.css?v=05">
+	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+	{{include "/common/weixin.html"}}
 </head>
-
 <body>
     <div class="treasure">
         <div class="top">
@@ -23,14 +24,14 @@
                 <div class="title vip">
                     <img src="/images/syzindex/treasure_vip.png" alt="">
                     <a>
-                        <h4>VIP订阅</h4>
+                        <h7>VIP订阅</h7>
                         <p>更多招标信息，重要项目不遗漏</p>
                     </a>
                 </div>
                 <div class="info">
                     <div class="info_list">
                         <div class="info_list_left">项目匹配</div>
-                        <div class="info_list_right">根据你的订阅,为你推送所匹配项目后续的全面动态;</div>
+                        <div class="info_list_right">根据订阅,为你推送所匹配项目后续的全面动态;</div>
                     </div>
                     <div class="info_list">
                         <div class="info_list_left">行业订阅</div>
@@ -54,7 +55,7 @@
                 <div class="title toSieve">
                     <img src="/images/syzindex/treasure_data.png" alt="">
                     <a>
-                        <h4>数据导出</h4>
+                        <h7>数据导出</h7>
                         <p>导出任意条件的招标数据，按条数付费</p>
                     </a>
                 </div>
@@ -69,7 +70,7 @@
                     </div>
                     <div class="info_list">
                         <div class="info_list_left">私家专属</div>
-                        <div class="info_list_right">多种筛选细度,丝丝合束,成就你的专属分析数据。</div>
+                        <div class="info_list_right">多种筛选细度,丝丝合束,成就你的专属数据。</div>
                     </div>
                 </div>
             </div>
@@ -77,7 +78,9 @@
     </div>
     <script src="/js/jquery-3.2.1.min.js"></script>
     <script>
-      	$(function(){
+		initShare({{.T.signature}},{{.T.s_m_openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
+      	
+		$(function(){
 			var nowTimestamp= (new Date()).valueOf();
 			$(".vip").on("click",function(){
 				$.post("/subscribepay/orderListDetails/isVip?v="+nowTimestamp,{},function(data){
@@ -95,5 +98,4 @@
 		})
     </script>
 </body>
-
 </html>

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

@@ -580,11 +580,14 @@
             console.log("this.selectObj:", tmpSelect)
             $('.result_name').append(html)
             AreaChoose.isOpen()
-
+            console.log(result)
             if (result.length > 0) { //已选择
                 $('.reset-btn').removeAttr("disabled");
                 $('.save-btn').removeAttr("disabled");
                 AreaChoose.flushPrice(); //刷新价格
+            }else{
+                $('.save-btn').attr("disabled","disabled");
+                AreaChoose.flushPrice(-1); //刷新价格
             }
         },
         submitArea: function () {
@@ -686,7 +689,7 @@
                         } else {
                             $(this).parent().parent().siblings('.tab_content').children('.city').removeClass('active');
                             if ($(".province .checkbox:checked").length == 0) {//若没有省份被选中 则选中全国
-                                $(".checkbox.other").prop('checked', true);
+                                //$(".checkbox.other").prop('checked', true);
                                 $(".checkbox").removeClass("half");
                             }
                         }
@@ -699,6 +702,7 @@
 
             //执行已购买城市函操作dom函数
             $('.tab_content').on('click', '.city', function () {
+                $(".checkbox.other").prop('checked', false);
                 //AreaChoose.showSelected(false)
                 $(this).toggleClass('active')
                 var isActive = $(this).parent().find('.city.active').length
@@ -715,7 +719,7 @@
                     $(this).parent('div').siblings('.tab').children().children('.checkbox').prop(
                         'checked', false).removeClass('half');
                 }
-                AreaChoose.isAllSelected()
+                //AreaChoose.isAllSelected()
                 AreaChoose.getResult($(this).parent('div').siblings('.tab').find('.province').text()) //出入选择的省份
             })
 
@@ -733,34 +737,31 @@
             })
         },
         reset: function () {
-            var checked = $(".other").is(':checked');
-            if (checked) {
-                $('.tab_content').slideUp(500)
-                $('.tab span i').css({
-                    "display": "inline-block",
-                    "transform": "rotate(0)"
-                })
-                $('.tab:not(.whole)').removeClass('selected').children('.province').find(
-                    'input').prop({
-                    'checked': false,
-                    "disabled": false
-                });
-                $('.tab_content').find('.city').removeClass('active').attr({
-                    "disabled": false,
-                    "checked": false
-                })
-                AreaChoose.getResult()
-            } else {
-                AreaChoose.getResult()
-            }
+            $('.tab_content').slideUp(500)
+            $('.tab span i').css({
+                "display": "inline-block",
+                "transform": "rotate(0)"
+            })
+            $('.tab').removeClass('selected').children('.province').find(
+                'input').prop({
+                'checked': false,
+                "disabled": false
+            });
+            $('.tab_content').find('.city').removeClass('active').attr({
+                "disabled": false,
+                "checked": false
+            })
+            AreaChoose.getResult()
         },
-        flushPrice: function () {
+        flushPrice: function (flag) {
             if (!this.vipSubisTrial) {
                 $('.tips_d_money').css("display", "block");
                 var price = getsubVipOrderPrice(this.selectObj, this.selectedIndustryArr, this.timeSelect);
                 $('.tips_d_money').text('￥' + price);
             }
-
+            if(flag===-1){
+                $('.tips_d_money').css("display", "none");
+            }
         },
         animatedRuning: false,
         checkAnimatedRuning: function () {

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

@@ -292,17 +292,20 @@
             $(".reset-btn").removeAttr("disabled");
             $(".save-btn").removeAttr("disabled");
             flushPrice()//刷新价格
+        } else {
+            $(".save-btn").attr("disabled","disabled");
+            flushPrice(-1)//刷新价格
         }
 
 
         var selectedStr = selectedArr.join('、')
         $('.result .result_name').text(selectedStr)
 
-        if (selectedArr.length === 0 && selectedIndustryArr[0] != "一个行业") {
+        /*if (selectedArr.length === 0 && selectedIndustryArr[0] != "一个行业") {
             var allButton = $('#all button')
             allButton.trigger('click')
             $('.result .result_name').text(allButton.text())
-        }
+        }*/
         if (selectedArr.length === buttons.length - 1) {
             // 除全部行业外所有按钮都被选中了
             $('#all button').trigger('click');
@@ -327,11 +330,14 @@
         })
     }
 
-    function flushPrice() {
+    function flushPrice(flag) {
         if (!vipSubisTrial) {
             var price = getsubVipOrderPrice(selectedAreaObj, selectedIndustryArr, timeSelect);
             $('.tips_d_money').css("display", "block").text('￥' + price);
         }
+        if (flag == -1) {
+            $('.tips_d_money').css("display", "none");
+        }
     }
 
     // 每个button的点击事件
@@ -352,7 +358,9 @@
 
     // 重置按钮事件
     $('.reset-btn').on('click', function () {
-        $("#all .industry_item").trigger("click");
+        //$("#all .industry_item").trigger("click");
+        $('.select-area-box .list button').removeClass('active');
+        findSelectedIndustry()
     })
 
     //=======================

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

@@ -15,7 +15,8 @@
 </head>
 <body>
 <main class="choose_industry main">
-    <p class="optional_count" style="background: rgba(245,244,249,1);"> 可选择行业数量： <em class="count"></em> / <span class="total"></span></p>
+    <p class="optional_count" style="background: rgba(245,244,249,1);"> 可选择行业数量： <em class="count"></em> / <span
+                class="total"></span></p>
     <!--<div class="result" style="display: block;">
         <span class="label">已选择：</span>
         <span class="result_name">全部行业</span>
@@ -311,7 +312,11 @@
                         return
                     }
                     if (EditIndustry.reqData.buyset.buyerclasscount != -1) { //购买不是全部行业 不能点击
-                        EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业，如需更多请升级<span></p>`);
+                        if (EditIndustry.reqData.isTrial) {
+                            EditIndustry.showTip(`<span style="white-space: nowrap;">您只选择试用了${EditIndustry.reqData.buyset.buyerclasscount}个行业</span>，<span style="white-space: nowrap;">如需更多，请前往VIP订阅进行购买</span>`);
+                        } else {
+                            EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业，如需更多请升级<span></p>`);
+                        }
                         return
                     }
                     $('.select-area-box .list button').removeClass('active');
@@ -380,7 +385,11 @@
             // 显示隐藏优惠tips
             if (selectedArr.length >= EditIndustry.reqData.buyset.buyerclasscount && EditIndustry.reqData.buyset.buyerclasscount != -1) {
                 if (!isInit) {
-                    EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业，如需更多请升级<span></p>`);
+                    if (EditIndustry.reqData.isTrial) {
+                        EditIndustry.showTip(`<span style="white-space: nowrap;">您只选择试用了${EditIndustry.reqData.buyset.buyerclasscount}个行业</span>，<span style="white-space: nowrap;">如需更多，请前往VIP订阅进行购买</span>`);
+                    } else {
+                        EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业，如需更多请升级<span></p>`);
+                    }
                 }
                 $('.industry_item:not(.active)').attr('disabled', 'disabled');
             } else {

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

@@ -84,8 +84,30 @@
 	font-size: 16px;
 	margin-left: 20px;
 }
+
+.nothing{
+	margin: 50% auto;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+	flex-direction:column;
+}
+.nothing img{
+    width: 120px;
+}
+.nothingDiv {
+	padding-top:0.42rem;
+	font-size:0.3rem;
+	color:#838384;
+}
 </style>
-<body>
+<body style="visibility:hidden">
+	<div class="nothing" style="display:none">
+        <img src="/vipsubscribe/image/nothing.png"/>
+		<div class="nothingDiv">
+			该订单记录已删除
+		</div>		
+    </div>
     <div class="vip_order_detail">
         <main class="main">
             <div class="lists">
@@ -212,7 +234,12 @@ try{
     }
     $(".orderCode").text(orderCode);
     $DoPost("/subscribepay/orderListDetails/getOrderPayAllMsg",{"orderCode":orderCode},function(r){
+      $("body").css("visibility","");
       if(r.success){
+		if(r.data.order.order_status==-1){
+			$(".nothing").show();
+			$(".vip_order_detail").hide();
+		}
         //下单时间
         if(r.data.order.prepay_time) {
         	$(".prepayTime").text(r.data.order.prepay_time.replace("-",".").replace("-","."));

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

@@ -474,7 +474,7 @@
                     {{if eq .T.orderType 5 }}
                     tipTxt = "已购买 ";
                     {{end}}
-                    $(".choose_industry").val(tipTxt+ this.industrySelect.length + " 个行业");
+                    $(".choose_industry").val(tipTxt + this.industrySelect.length + " 个行业");
                 } else if (this.industrySelect.length > 0 && this.industrySelect[0] == "全部行业") {
                     $(".choose_industry").val("全部行业");
                 } else {
@@ -496,16 +496,28 @@
                     if (this.timeSelect[0] >= 10) {
                         $('.profit_tips').text("已选择" + this.timeSelect[0] + "个月，建议“按年订阅”").show();
                     }
+                    if (this.timeSelect[0] == 1) {
+                        $('#number_box_month button:eq(0)').attr("disabled", "disabled");
+                    } else {
+                        $('#number_box_month button:eq(0)').removeAttr("disabled");
+                    }
                 }
                 $(".info.choose_time").val(tmp);
             },
-            flushPrice: function () {
+            flushPrice: function (time, flag) {
                 if (this.vipSubisTrial) {
                     $('.price strong').text('￥0.00');
                 } else {
-                    var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, this.timeSelect, this.price);
-                    $('.price strong').text('￥' + price);
-                    $('.computed_price').html('￥' + price);
+                    var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, time, this.price);
+                    if (flag === 1) {
+                        $('.price strong').text('￥' + price);
+                    } else if (flag === 2) {
+                        $('.computed_price').html('￥' + price);
+                    } else {
+                        $('.price strong').text('￥' + price);
+                        $('.computed_price').html('￥' + price);
+                    }
+
                 }
             }
         };
@@ -517,7 +529,7 @@
             purchase.showIndustry();
             purchase.showPrice();
             purchase.showTime();
-            purchase.flushPrice();
+            purchase.flushPrice(purchase.timeSelect);
             checkOk();
             var time_limit;//定义一个周期变量
             /*------ 关闭弹窗事件  点击取消或遮罩层 -----*/
@@ -592,8 +604,8 @@
                         .numboxStep;
                 }
                 $number.text(currentNum);
-                purchase.timeSelect = [Number(currentNum), 2];
-                purchase.flushPrice();
+                purchase.timeSelect_tmp = [Number(currentNum), 2];
+                purchase.flushPrice(purchase.timeSelect_tmp, 2);
                 //var price = (5.8 * currentNum).toFixed(1);
                 //$('.computed_price').html('￥' + price)
                 var firstButton = $('#number_box_month button:first');
@@ -630,8 +642,8 @@
                 // 渲染结果 保留一位小数
                 //let result = (Number(id) * 58).toFixed(1);
                 //$('.computed_price').html('￥' + result)
-                purchase.timeSelect = [Number(id), 1];
-                purchase.flushPrice();
+                purchase.timeSelect_tmp = [Number(id), 1]
+                purchase.flushPrice(purchase.timeSelect_tmp, 2);
             });
 
             /* -------- 选择按月订阅  radio触发的事件------- */
@@ -648,8 +660,8 @@
                 }
                 //let result = (Number(val) * 5.8).toFixed(1);
                 //$('.computed_price').html('￥' + result);
-                purchase.timeSelect = [Number(val), 2];
-                purchase.flushPrice();
+                purchase.timeSelect_tmp = [Number(val), 2];
+                purchase.flushPrice(purchase.timeSelect_tmp, 2);
 
             });
             /* -------- 选择按年订阅  radio触发的事件------- */
@@ -663,8 +675,8 @@
                 if (isChecked) {
                     $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active')
                 }
-                purchase.timeSelect = [Number(val), 1];
-                purchase.flushPrice();
+                purchase.timeSelect_tmp = [Number(val), 1];
+                purchase.flushPrice(purchase.timeSelect_tmp, 2);
             });
 
             // 确认订阅周期
@@ -677,16 +689,17 @@
                         $('#time_cycle').hide(function () {
                             $('.choose_time').val(val)
                         });
-                        purchase.timeSelect = [parseInt(val[0]), 1]
+                        purchase.timeSelect_tmp = [parseInt(val[0]), 1]
                     } else if ($(v).is(':checked') === true) {
                         val = $('.month_number').html();
                         $('#time_cycle').hide(function () {
                             $('.choose_time').val(val + '个月')
                         });
-                        purchase.timeSelect = [parseInt(val), 2]
+                        purchase.timeSelect_tmp = [parseInt(val), 2]
                     }
                 });
-                purchase.flushPrice();
+                purchase.timeSelect = purchase.timeSelect_tmp;
+                purchase.flushPrice(purchase.timeSelect, 1);
                 sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
             });
             $("input").bind("input propertychange change", function (event) {
@@ -763,7 +776,7 @@
             sessionStorage.removeItem("vipSubSelectTime");
             sessionStorage.removeItem("vipSub_read");
             sessionStorage.removeItem("historypushDataCache");
-            sessionStorage.To_introducePage=2;
+            sessionStorage.To_introducePage = 2;
         }
 
         /******* 获取url参数（正则）********/