抽奖活动

common/src/qfw/util/encrypt_test.go

@@ -59,7 +59,7 @@ func Test_int(t *testing.T) {
 	log.Println(IntAllDef(s, -2))
 }
 
-func Test_activity(t *testing.T) {
+func TestActivity(t *testing.T) {
 	se := SimpleEncrypt{Key: "topnet2015topnet2015"}
 	tmp := se.EncodeString("oZQC_s7VTU3p9SrhU27gA5v2MDk0")
 	log.Println(tmp, se.DecodeString(tmp))

core/src/message.json

@@ -7,7 +7,7 @@
 	"indentify":{
 		"success":{
 			"result":"企业认证",
-			"detail":"您的企业已经成功通过实名认证！登录www.qimingxing.info首页点击“发服务”后即可领取红包！",
+			"detail":"您的企业已经成功通过实名认证！",
 			"remark":"建议您在电脑端时用微信登录！"
 		},
 		"false":{
@@ -29,7 +29,7 @@
 	"oindentify":{
 		"success":{
 			"result":"机构认证",
-			"detail":"您的机构已经成功通过实名认证！登录www.qimingxing.info首页点击“发服务”后即可领取红包！",
+			"detail":"您的机构已经成功通过实名认证！",
 			"remark":"建议您在电脑端时用微信登录！"
 		},
 		"false":{

core/src/qfw/front/index.go

@@ -23,11 +23,10 @@ import (
 
 type Index struct {
 	*xweb.Action
-	loadIndex          xweb.Mapper `xweb:"/"`                         //访问首页
-	getWebSiteTop      xweb.Mapper `xweb:"/front/getWebSiteTop"`      //获取网站顶部内容
-	advertAjaxRqe      xweb.Mapper `xweb:"/front/advertAjaxRqe"`      //首页ajax请求
-	reurl              xweb.Mapper `xweb:"/front/reurl"`              //跳转服务产品页面
-	deletefirstredtype xweb.Mapper `xweb:"/front/deletefirstredtype"` //删除发布服务成功后第一次登录标识
+	loadIndex     xweb.Mapper `xweb:"/"`                    //访问首页
+	getWebSiteTop xweb.Mapper `xweb:"/front/getWebSiteTop"` //获取网站顶部内容
+	advertAjaxRqe xweb.Mapper `xweb:"/front/advertAjaxRqe"` //首页ajax请求
+	reurl         xweb.Mapper `xweb:"/front/reurl"`         //跳转服务产品页面
 }
 
 //加载首页
@@ -175,9 +174,3 @@ func (i *Index) Reurl() error {
 	}
 	return nil
 }
-
-//删除发布服务成功后第一次登录标识
-func (i *Index) Deletefirstredtype() error {
-	i.DelSession("firstredtype")
-	return nil
-}

core/src/qfw/manage/auditing.go

@@ -661,34 +661,25 @@ func (s *SystemManage) Updateaudit() error {
 				s_result = util.GetPropertie("indentify.success.result", coreconfig.MessageConfig).(string)
 				s_remark = util.GetPropertie("indentify.success.remark", coreconfig.MessageConfig).(string)
 				s_detail = util.GetPropertie("indentify.success.detail", coreconfig.MessageConfig).(string)
-				//
-				content = "您的企业已经成功通过实名认证！点击<a href='/member/yellowpage/show/showService/" + s_enterpriseid + "'>发服务</a>后即可领取红包！"
 			} else if i_identificationtype == "2" {
 				s_result = util.GetPropertie("pindentify.success.result", coreconfig.MessageConfig).(string)
 				s_remark = util.GetPropertie("pindentify.success.remark", coreconfig.MessageConfig).(string)
 				s_detail = util.GetPropertie("pindentify.success.detail", coreconfig.MessageConfig).(string)
-				//
-				content = s_detail
 			} else if i_identificationtype == "3" {
 				s_result = util.GetPropertie("oindentify.success.result", coreconfig.MessageConfig).(string)
 				s_remark = util.GetPropertie("oindentify.success.remark", coreconfig.MessageConfig).(string)
 				s_detail = util.GetPropertie("oindentify.success.detail", coreconfig.MessageConfig).(string)
-				//
-				content = "您的机构已经成功通过实名认证！点击<a href='/member/yellowpage/show/showService/" + s_enterpriseid + "'>发服务</a>后即可领取红包！"
 			} else if i_identificationtype == "4" {
 				s_result = util.GetPropertie("pcindentify.success.result", coreconfig.MessageConfig).(string)
 				s_remark = util.GetPropertie("pcindentify.success.remark", coreconfig.MessageConfig).(string)
 				s_detail = util.GetPropertie("pcindentify.success.detail", coreconfig.MessageConfig).(string)
-				//
-				content = s_detail
 			} else if i_identificationtype == "5" {
 				s_result = util.GetPropertie("ptcindentify.success.result", coreconfig.MessageConfig).(string)
 				s_remark = util.GetPropertie("ptcindentify.success.remark", coreconfig.MessageConfig).(string)
 				s_detail = util.GetPropertie("ptcindentify.success.detail", coreconfig.MessageConfig).(string)
-				//
-				content = s_detail
 			}
 			title = s_result
+			content = s_detail
 		}
 		//查询openid
 		f := FindOne("user", "{'_id':'"+s_submitid+"'}")

core/src/qfw/member/member.go

@@ -8,9 +8,9 @@ import (
 type Member struct {
 	*xweb.Action
 
-	getLoginNum        xweb.Mapper `xweb:"/front/wxlogin/getNum"`              //微信登陆获取数字
-	getLogin           xweb.Mapper `xweb:"/front/wxlogin/getLogin/(.*)"`       //微信登陆状态
-	promotionPage      xweb.Mapper `xweb:"/p(.*)"`                             //推广页面
+	getLoginNum xweb.Mapper `xweb:"/front/wxlogin/getNum"`        //微信登陆获取数字
+	getLogin    xweb.Mapper `xweb:"/front/wxlogin/getLogin/(.*)"` //微信登陆状态
+	//promotionPage      xweb.Mapper `xweb:"/p(.*)"`                             //推广页面
 	register           xweb.Mapper `xweb:"/front/register"`                    //注册
 	registerComplete   xweb.Mapper `xweb:"/front/registerComplete"`            //注册完成
 	login              xweb.Mapper `xweb:"/front/login"`                       //登录

core/src/qfw/member/membermanager.go

@@ -463,10 +463,10 @@ func (m *Member) Login() {
 				}
 				stype := m.GetSession("audittype")
 				r_id := strings.Split(fmt.Sprintf("%s", r["_id"]), `"`)[1]
-				if stype == "first" {
+				if stype == "y" {
 					Update("user", &map[string]interface{}{
 						"_id": ObjectIdHex(r_id),
-					}, `{'$set':{'s_audittype':'second'}}`, false, false)
+					}, `{'$set':{'s_audittype':'n'}}`, false, false)
 				}
 			}
 		}
@@ -662,7 +662,7 @@ func (m *Member) Logout() error {
 	m.DelSession("identWay")      //认证状态
 	m.DelSession("identType")     //认证类型
 	m.DelSession("opLocDistrict") //行政区划代码
-	m.DelSession("audittype")     //认证后是否是第一次登录的标识第一次：first
+	m.DelSession("audittype")     //认证后是否是第一次登录的标识第一次：y
 	m.DelSession("promotion_id")  //推广id
 	m.DelSession("promotion_c")   //推广邮件代码
 	deleteCookie(m)
@@ -745,10 +745,6 @@ func (m *Member) Accountset() error {
 	m.T["s_pwd"] = r["s_pwd"]               //密码
 	m.T["s_bindweixin"] = r["s_bindweixin"] //绑定微信
 	m.T["pageName"] = "用户中心"
-	if m.GetSession("audittype") != nil {
-		m.T["audittype"] = m.GetSession("audittype")
-	}
-	m.DelSession("audittype")
 	GetNotPassReason(m.Action)
 	return m.Render("/member/accountset/index.html", &m.T)
 }
@@ -1125,6 +1121,7 @@ func UpdateSession(action *xweb.Action, r map[string]interface{}) {
 		} else {
 			setSessMap["phone"] = r["s_phone"]
 		}
+		setSessMap["audittype"] = r["s_audittype"] //认证后是否是第一次登录的标识第一次：y
 		/**
 		action.SetSession("loginName", r[loginType])               //登录名
 		action.SetSession("loginType", loginType)                  //登录类型

core/src/qfw/member/yellowpage.go

@@ -445,7 +445,7 @@ func (yp *Yellowpage) AddService() error {
 		status = "n"
 	}
 	//如果是新增操作，进入发红包逻辑
-	if len(serviceid) == 0 && tempFlag {
+	if len(serviceid) == 0 && tempFlag && false {
 		//活动有效日期
 		valid := time.Now().After(time.Unix(coreconfig.RedPackage.StartDate, 0)) && time.Now().Before(time.Unix(coreconfig.RedPackage.EndDate, 0))
 		//判断用户是否是第一次发服务

core/src/qfw/mobile/wxmenu.go

@@ -265,7 +265,7 @@ func GetSignature(action string) []string {
 	}
 	if len(signature) == 0 {
 		signature = coreutil.GetJSInterfaceParam(url)
-		redis.Put("other", "wxshare-"+url, signature, 60*1000)
+		redis.Put("other", "wxshare-"+url, signature, 90*60) //一个半小时
 	}
 	log.Println(url, "------", signature)
 	return signature

core/src/web/staticres/css/dev-qfw.css

@@ -48,19 +48,12 @@ a{
 	margin-left: 20px;
 	margin-right: 20px;
 }
-.text-primary {
-	 color:#FF5A5F !important;
-}
 .text-bold{
 	font-weight:700;
 }
 .text-small{
 	font-size:12px;
 }
-.bootstrap-glyphicon {
-	font-family: 'Glyphicons Halflings' !important;
-}
-
 .a-com-active {
 	background-color: #dd4814;
 }
@@ -75,7 +68,7 @@ a{
 	max-width: 1200px;
 	margin-left: auto;
 	margin-right: auto;
-	padding: 0px 5px;
+	padding: 0px;
 }
 
 .a-content .a-c-left,.a-content .a-c-right{
@@ -388,7 +381,7 @@ a{
 
 .a-header .a-h-search form{
 	height: 40px;
-  	margin-top: 15px;
+  	margin-top: 17px;
 }
 
 .a-header .a-h-search.a-com-focus{
@@ -420,7 +413,7 @@ a{
 	border: 2px #dd4814 solid;
 	box-shadow: none;
 	padding-right: 25px;
-	height: 40px;
+	height: 36px;
 	border-left-width: 0px;
 }
 
@@ -857,7 +850,7 @@ a{
 }
 
 .a-index-want li.a-com-last{
-	padding: 10px 5px 0px 5px;
+	padding: 10px 0px 0px 15px;
 }
 
 .a-index-want div{
@@ -928,32 +921,10 @@ a{
 	display: block;
 	padding-left:10px;
 }
-.a-index-hd>img{
-	width: 295px;
+.a-index-hd img{
+	width: 305px;
 	height: 130px;
 }
-/*扫码送红包活动 start*/
-.a-index-hd .smshb{
-	height: 32px;
-	overflow: hidden;
-	position: absolute;
-	top: 75px;
-	width: 100%;
-}
-.a-index-hd .smshb span{
-	font-size: 20px;
-	margin: 0px 2px;
-	font-weight: bold;
-	color: #ff245c;
-}
-.a-index-hd .smshb ul{
-	border: 0px !important;
-}
-.a-index-hd .smshb li{
-	width: 100%;
-	height: 30px;
-}
-/*扫码送红包活动 end*/
 .a-index-head .a-i-h-right .a-com-title {
 	height: 40px;
 	line-height: 40px;
@@ -1990,20 +1961,6 @@ style="color:#D03102;margin-right:5px;"
 }
 /*企业社区未登录页面 end*/
 /*认证完第一次登录 start*/
-.fristAutheLoginModal .modal-header{
-	background-color: #FF5A5F;
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-.fristAutheLoginModal .modal-header h4{
-	color: #FFFFFF;
-	font-weight: bold;
-}
-.fristAutheLoginModal .modal-header i{
-	color: #FFFFFF;
-	font-size: 20px;
-	cursor: pointer;
-}
 .fristAutheLoginModal .chenggongtishi{
 	color: #A1D568;
 	vertical-align: sub;
@@ -2072,7 +2029,7 @@ style="color:#D03102;margin-right:5px;"
 	font-size: 12px;
 	font-family: "SimSun";
 }
-.b-top>div,.swordfish-content{
+.b-top>div,.b-content{
 	max-width: 1200px;
 	margin: auto;
 }
@@ -2213,10 +2170,10 @@ style="color:#D03102;margin-right:5px;"
 }
 .b-head .head-hideMenu i.ren1{
 	margin-left: 2px;
+	margin-right: 5px;
 }
 .b-head .head-hideMenu i.ren1,.b-head .head-hideMenu i.tuichu{
 	font-size: 16px;
-	margin-right: 15px !important;
 }
 .b-head .head-hideMenu li:hover{
 	color: #fff;
@@ -2230,6 +2187,56 @@ style="color:#D03102;margin-right:5px;"
 .b-head a{
 	text-decoration: none;
 }
+.b-head .b-h-search{
+	padding-top: 14px;
+}
+.b-head .b-h-search .input-group{
+	width: 300px;
+}
+.b-head .b-h-search .form-control{
+	border-radius: 50px !important;
+}
+.b-head .b-h-search form>span i {
+    position: absolute;
+    right: 10px;
+    top: 50%;
+    z-index: 10;
+    font-size: 14px;
+    margin-top: -7px;
+	color:#fff;
+}
+.b-head .b-h-search form>span{
+    position: absolute;
+    right: 10px;    
+	border-radius: 50px;
+    top: 50%;
+    z-index: 20;
+    margin-top: -19px;
+	margin-right:-10px;
+    display: inline-block;
+	width:38px;
+	height:38px;
+}
+.b-content{
+	padding: 15px 0px 15px 0px;
+}
+.b-left{
+	background-color: #FFFFFF;
+	padding: 15px;
+	width: 940px;
+	display: inline-block;
+	vertical-align: top;
+}
+.b-right{
+	background-color: #FFFFFF;
+	width: 250px;
+	display: inline-block;
+	vertical-align: top;
+	float: right;
+}
+.b-right-content{
+	padding: 10px;
+}
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {

core/src/web/staticres/css/index-new.css

@@ -1,3 +1,6 @@
+body{
+	background-color: #f0f0f0;
+}
 /****indexhead*****/
 .b-nav{
     border-top-color: #FF5A5F;
@@ -16,41 +19,13 @@
 a:focus, a:hover{
 	color: #FF5A5F;
 }
-.index-new-nva .a-h-search{
-    width: 25%;
-	float:right;
-	padding-top:18px;
-}
-.index-new-nva .a-h-search span i {
-    position: absolute;
-    right: 10px;
-    top: 50%;
-    z-index: 10;
-    font-size: 14px;
-    margin-top: -7px;
-	color:#fff;
-}
-.index-new-nva .a-h-search span{
-    position: absolute;
-    right: 10px;    
-	border-radius: 50px;
-    top: 50%;
-    z-index: 20;
-    margin-top: -19px;
-	margin-right:-10px;
-    display: inline-block;
-	width:38px;
-	height:38px;
-	border:1px solid #FF5A5F;
+.b-head .b-h-search span{
 	background-color:#FF5A5F;
 }
 .index-new-nva .a-h-search .input-group {
     width: 100%;
     height: inherit;
 }
-.index-new-nva #header-searchInput{
-	border-radius: 50px;
-}
 .index-new-head .head-hideMenu li:hover {
     background-color: #FF5A5F;
 }
@@ -60,36 +35,6 @@ a:focus, a:hover{
 .index-new-head .head-hideMenu i {
     color: #FF5A5F;
 }
-.index-new-head .head-hideMenu i.ren1, .index-new-head .head-hideMenu i.tuichu {
-    font-size: 16px;
-    margin-right: 15px !important;
-}
-.index-new-head .head-hideMenu i.ren1 {
-    margin-left: 2px;
-}
-.index-new-head .loginStatus>span .round-dot {
-    right: 5px;
-    width: 8px;
-    height: 8px;
-}
-.index-new-head .round-dot {
-    background-color: #FF5A5F;
-    width: 6px;
-    height: 6px;
-    border-radius: 50%;
-    position: absolute;
-    display: block;
-    top: 0px;
-	padding:0px;
-	margin-right:2px;
-}
-.index-new-head .head-hideMenu li:hover .round-dot {
-    background-color: #FFFFFF;
-}
-.index-new-head .head-hideMenu li .round-dot {
-    right: 15px;
-	top:10px;
-}
 /*****index****/
 
 .a-index-head .a-i-h-right .a-index-want {
@@ -294,10 +239,6 @@ a:focus, a:hover{
     color: #4E5051;	
 	padding-left:10px;
 }
-
-.index-new-head .a-i-h-right .a-index-hd img{
-	width:292px;
-}
 .a-index .a-index-want .a-com-two {
     margin: 20px 0px 40px;
 }
@@ -320,9 +261,6 @@ a:focus, a:hover{
 	padding-left:10px;
 	border:1px solid rgb(240, 240, 240);
 }
-.index-new-body {
-	background-color:#f0f0f0;
-}
 .a-index-head .a-i-h-right, .a-rmfw,.a-rmxq,.a-qysq,.a-xwzx,.index-new-wgw{
 	background-color:#fff;
 }
@@ -382,11 +320,6 @@ a:focus, a:hover{
 .a-index .index-new-head{
 	margin-bottom:-10px;
 }
-.index-new-head .a-i-h-right{
-	margin-left:10px;
-	padding-left:0px;
-	width:293px;
-}
 .a-index .a-index-head .a-i-h-right {
 	padding-left:0px;
 	margin-left:10px;

core/src/web/staticres/css/qfw.css

@@ -462,11 +462,63 @@ a.new_red:hover, a.new_red:active {
 	display: table-cell;
 }
 
-/*==========覆盖bootstrap样式===========*/
+/*==========覆盖bootstrap样式 start===========*/
+.bootstrap-glyphicon {
+	font-family: 'Glyphicons Halflings' !important;
+}
 [class*="col-"] {
 	padding-left: 0px !important;
 }
-
+.btn{
+	padding-top: 6px;
+	padding-bottom: 6px;
+}
+.btn-primary,.btn-primary:hover,.btn-primary:focus,.btn-primary:active{
+	background-color: #FF5A5F;
+	border-color: #FF5A5F;
+}
+.btn-default,.btn-default:hover,.btn-default:focus,.btn-default:active{
+	background-color: transparent;
+	border: 1px solid #FF5A5F;
+	color: #FF5A5F;
+}
+.btn-sm, .btn-group-sm > .btn{
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+.btn-xs, .btn-group-xs > .btn{
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+.text-primary {
+	color: #FF5A5F !important;
+}
+.b-modal .modal-content{
+	border-radius: 4px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+.b-modal .modal-header{
+	background-color: #FF5A5F;
+	color: #FFFFFF;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	padding: 10px 10px 10px 20px;
+	font-size: 16px;
+}
+.b-modal .modal-header .close{
+	opacity: 1;
+	text-shadow: none;
+	font-weight: normal;
+	color: #FFFFFF;
+}
+.b-modal .modal-header .close:focus, .b-modal .modal-header .close:hover{
+	opacity: 1;
+}
+.form-control{
+	border-radius: 0px;
+}
+/*==========覆盖bootstrap样式 end===========*/
 .lineb {
 	display: inline-block;
 }
@@ -504,7 +556,6 @@ span.highlight {
 	color: #dd4814;
 	font-weight: bold;
 }
-
 /*字体图标*/
 @font-face {
 	font-family: 'qimingxing';
@@ -879,6 +930,10 @@ span.highlight {
 	content: "\2B";
 }
 
+.guanbi1:before{
+	content: "\6C";
+}
+
 .icon-small {
 	font-size: 12px;
 }

core/src/web/staticres/css/swordfish.css

@@ -1,6 +1,6 @@
 /********可以共用********/
 body{
-	background-color: #F0F0F0;
+	background-color: #f0f0f0;
 }
 a:focus, a:hover{
 	color: #37C6DA;
@@ -8,6 +8,12 @@ a:focus, a:hover{
 .b-round-dot{
 	background-color: #37C6DA;
 }
+.b-head .head-hideMenu i{
+	color: #37C6DA;
+}
+.b-head .head-hideMenu li:hover{
+	background-color: #37C6DA;
+}
 /********剑鱼********/
 .b-head .b-top li:hover>i{
 	background-color: #37C6DA !important;
@@ -24,30 +30,6 @@ a:focus, a:hover{
 .b-nav-other>a:hover,.b-nav-active>a{
 	color: #37C6DA !important;
 }
-.b-head .head-hideMenu i{
-	color: #37C6DA;
-}
-.b-head .head-hideMenu li:hover{
-	background-color: #37C6DA;
-}
-.swordfish-content{
-	padding: 15px 0px 15px 0px;
-}
-.swordfish-left{
-	background-color: #FFFFFF;
-	padding: 15px;
-	width: 940px;
-	display: inline-block;
-	vertical-align: top;
-}
-.swordfish-right{
-	padding-right: 0px;
-	background-color: #FFFFFF;
-	width: 250px;
-	display: inline-block;
-	vertical-align: top;
-	float: right;
-}
 .swordfish-page-title{
 	padding-bottom: 10px;
 	border-bottom: 1px solid #ddd;
@@ -74,7 +56,7 @@ a:focus, a:hover{
 .swordfish-rssset .btn>span{
 	margin-right: 5px;
 }
-.swordfish-rssset .swordfish-left>div{
+.swordfish-rssset .b-left>div{
 	margin-bottom: 15px;
 }
 .swordfish-qrcode{
@@ -226,7 +208,7 @@ a:focus, a:hover{
 	margin-bottom: 20px;
 }
 /*******剑鱼首页*******/
-.swordfish-index .swordfish-right>div{
+.swordfish-index .b-right>div{
 	padding-left: 10px;
 }
 .swordfish-index .swordfish-right-title{
@@ -326,10 +308,10 @@ a:focus, a:hover{
 	margin-right: 10px;
 }
 @media (max-width: 1200px) {
-	.swordfish-left{
+	.b-left{
 		width: 100%;
 	}
-	.swordfish-right{
+	.b-right{
 		display: none;
 	}
 }

core/src/web/staticres/fonts/qimingxing.svg

@@ -16,9 +16,9 @@
 <glyph unicode="'" horiz-adv-x="2049" d="M0 157v1655q0 65 48 111q46 46 112 46h321q0 32 24 57q24 24 58 24h683q32 0 56 -24t24 -57h282q67 0 112 -46q48 -46 48 -111v-723l-160 -164v809q0 32 -24 55q-24 24 -57 23h-201v-78q0 -32 -24 -56q-24 -22 -56 -23h-683q-34 0 -58 23q-24 24 -24 56v78h-240 q-32 0 -57 -23q-24 -22 -24 -55v-1497q0 -34 24 -56q24 -24 57 -24h643l160 -157h-884q-67 0 -112 46q-48 46 -48 111zM481 788v40q0 39 41 39h724q39 0 39 -39v-40q0 -39 -39 -39h-724q-41 0 -41 39zM481 1222v39q0 39 41 39h724q39 0 39 -39v-39q0 -39 -39 -39h-724 q-41 0 -41 39zM829 439l106 104l297 -255l818 815l-806 -1103z" />
 <glyph unicode="(" horiz-adv-x="2027" d="M0 983q0 341 224 623q119 131 180 169q263 188 579 188q341 0 623 -224q131 -119 169 -181q188 -263 188 -578q0 -341 -224 -623q-119 -131 -181 -169q-263 -188 -578 -188q-341 0 -623 224q-131 119 -169 180q-188 263 -188 579zM22 978q0 -384 289 -683 q292 -273 674 -273q384 0 682 289q273 292 273 674q0 384 -288 682q-292 273 -674 273q-384 0 -683 -288q-273 -292 -273 -674zM360 1130v15q0 171 171 290q122 74 259 74q230 0 382 -178q49 -84 57 -126q-15 0 -46 3q-172 0 -292 -138q-72 -94 -72 -196v-21q0 -27 12 -78 h-3q-12 -2 -19 -2h-19q-56 0 -150 22l-150 -76v3q41 123 41 128h-2q-169 125 -169 280zM585 1273q9 -56 65 -56h7q43 0 48 56q-9 51 -48 51h-7q-49 0 -63 -44q0 -4 -2 -7zM847 862v15q0 152 165 258q97 48 191 48h22q131 0 251 -96q104 -97 104 -211v-7q0 -131 -152 -248 l35 -107h-2q-48 27 -120 65q-79 -22 -129 -23q-205 0 -326 168q-39 73 -39 138zM889 1266q0 -34 55 -49h10q43 0 53 43v17q-9 48 -46 47h-14q-58 -10 -58 -58zM1051 966q9 -41 43 -41q53 7 53 38v6q0 36 -53 43q-43 -12 -43 -41v-5zM1289 969q10 -44 44 -44h2q51 5 51 46 q0 31 -55 41q-28 0 -42 -43z" />
 <glyph unicode=")" horiz-adv-x="2041" d="M0 256v1534q0 106 75 181t179 75h1531q106 0 181 -75t75 -181v-1534q0 -106 -75 -181t-181 -75h-1531q-104 0 -179 75t-75 181zM254 384q0 -53 38 -90q38 -38 90 -38h1277q53 0 89 38q38 38 37 90v1278q0 53 -37 91q-38 38 -89 37h-1277q-53 0 -90 -37q-38 -38 -38 -91 v-1278zM510 575v128q0 65 63 65h893q65 0 65 -65v-128q0 -63 -65 -63h-893q-63 0 -63 63zM510 1343v128q0 63 63 63h128q63 0 64 -63v-128q0 -63 -64 -63h-128q-63 0 -63 63zM893 959v128q0 65 63 65h510q65 0 65 -65v-128q0 -63 -65 -63h-510q-63 0 -63 63zM893 1343v128 q0 63 63 63h128q65 0 65 -63v-128q0 -63 -65 -63h-128q-63 0 -63 63zM1275 1343v128q0 63 65 63h126q65 0 65 -63v-128q0 -63 -65 -63h-126q-65 0 -65 63z" />
-<glyph unicode="*" horiz-adv-x="0" d="M0 910v75q53 585 608 833q53 -113 70 -161q-253 -102 -383 -312q-164 -271 -94 -570q63 -258 275 -425q225 -176 522 -176q292 0 521 179q213 172 271 427q68 305 -95 567q-121 193 -383 317q12 24 36 77q22 55 38 77q544 -246 604 -820v-104q-34 -379 -295 -621 q-268 -247 -640 -273h-116q-398 32 -647 278q-273 275 -292 632zM903 1732v342q0 9 3 8h181v-686h-181q-3 126 -3 336z" />
-<glyph unicode="+" horiz-adv-x="0" d="M0 84v99q24 544 300 797q-140 102 -189 310q-51 218 34 408q157 357 592 401h91q288 -27 466 -211q200 -207 179 -494q-15 -232 -210 -414q271 -237 297 -794q5 -90 -7 -125q-17 -48 -77 -61h-1389q-70 20 -87 84zM217 201h1130q-24 486 -267 656q-118 -60 -297 -60 q-183 -2 -295 60q-246 -162 -271 -656zM305 1437q3 -130 65 -225q75 -118 221 -178q159 -65 324 -20q147 39 242 148q106 121 106 284q0 183 -133 314q-157 155 -396 134q-130 -12 -225 -75q-89 -58 -145 -150q-61 -101 -59 -232z" />
-<glyph unicode="," horiz-adv-x="0" d="M0 164v1331q27 135 167 162h1767q147 -31 169 -170v-1315q-9 -58 -48 -104q-43 -48 -101 -59q-14 -3 -225 -4h-1362q-208 0 -224 4q-118 24 -143 155zM191 328q263 244 603 580q-90 67 -301 225q-193 145 -302 224v-1029zM326 188h1447q-31 29 -623 602q-75 -60 -124 -51 q-17 5 -41 24q-27 22 -38 27q-53 -51 -297 -283q-186 -176 -295 -285q-31 -31 -29 -34zM350 1471q94 -68 350 -261q220 -166 353 -261q58 44 350 261q213 160 346 265h-701q-432 2 -698 -4zM1302 901q94 -87 287 -273q191 -184 287 -273q32 -31 35 -29q-2 97 0 517 q0 317 -3 514q-48 -36 -304 -227q-184 -138 -302 -229z" />
+<glyph unicode="*" horiz-adv-x="1989" d="M0 910v75q53 585 608 833q53 -113 70 -161q-253 -102 -383 -312q-164 -271 -94 -570q63 -258 275 -425q225 -176 522 -176q292 0 521 179q213 172 271 427q68 305 -95 567q-121 193 -383 317q12 24 36 77q22 55 38 77q544 -246 604 -820v-104q-34 -379 -295 -621 q-268 -247 -640 -273h-116q-398 32 -647 278q-273 275 -292 632zM903 1732v342q0 9 3 8h181v-686h-181q-3 126 -3 336z" />
+<glyph unicode="+" horiz-adv-x="1565" d="M0 84v99q24 544 300 797q-140 102 -189 310q-51 218 34 408q157 357 592 401h91q288 -27 466 -211q200 -207 179 -494q-15 -232 -210 -414q271 -237 297 -794q5 -90 -7 -125q-17 -48 -77 -61h-1389q-70 20 -87 84zM217 201h1130q-24 486 -267 656q-118 -60 -297 -60 q-183 -2 -295 60q-246 -162 -271 -656zM305 1437q3 -130 65 -225q75 -118 221 -178q159 -65 324 -20q147 39 242 148q106 121 106 284q0 183 -133 314q-157 155 -396 134q-130 -12 -225 -75q-89 -58 -145 -150q-61 -101 -59 -232z" />
+<glyph unicode="," horiz-adv-x="2102" d="M0 164v1331q27 135 167 162h1767q147 -31 169 -170v-1315q-9 -58 -48 -104q-43 -48 -101 -59q-14 -3 -225 -4h-1362q-208 0 -224 4q-118 24 -143 155zM191 328q263 244 603 580q-90 67 -301 225q-193 145 -302 224v-1029zM326 188h1447q-31 29 -623 602q-75 -60 -124 -51 q-17 5 -41 24q-27 22 -38 27q-53 -51 -297 -283q-186 -176 -295 -285q-31 -31 -29 -34zM350 1471q94 -68 350 -261q220 -166 353 -261q58 44 350 261q213 160 346 265h-701q-432 2 -698 -4zM1302 901q94 -87 287 -273q191 -184 287 -273q32 -31 35 -29q-2 97 0 517 q0 317 -3 514q-48 -36 -304 -227q-184 -138 -302 -229z" />
 <glyph unicode="0" horiz-adv-x="2544" d="M0 0h2545v2050h-2545v-2050zM212 212v1624h2119v-1624h-2119zM445 437h1308v135q0 79 -164 152q-341 150 -369 155q53 56 113 210q15 43 15 157q0 150 -1 159q-49 174 -250 174q-198 0 -247 -174q-2 -10 -2 -159q0 -114 16 -157q61 -155 112 -210q-27 -5 -367 -157 q-162 -72 -164 -150v-135zM1534 940h442v106h-442v-106zM1534 1186h313v104h-313v-104zM1534 1434h529v105h-529v-105z" />
 <glyph unicode="2" horiz-adv-x="2239" d="M0 1024q0 72 27 133t74 109q48 46 109 74q61 27 135 27q80 0 153 -38l326 306q-9 29 -8 70q0 72 27 133q27 63 75 108q46 46 108 73q63 27 135 27t133 -27q63 -27 109 -73q44 -44 72 -108q27 -61 27 -133t-27 -135q-27 -61 -72 -107q-46 -48 -109 -75q-61 -27 -133 -28 q-49 0 -96 14q-44 14 -80 37l-313 -290q14 -49 14 -97q0 -61 -20 -114l320 -270q39 22 82 34q44 12 93 12q72 0 133 -27q63 -27 109 -74q44 -48 72 -109q27 -63 27 -135t-27 -133q-27 -63 -72 -107q-46 -46 -109 -74q-61 -27 -133 -27t-135 27q-61 27 -108 74 q-48 44 -75 107q-27 61 -27 133q0 22 3 41q2 19 5 38l-343 290q-31 -15 -65 -22q-36 -7 -71 -7q-73 0 -135 27q-61 27 -109 74q-46 46 -74 107q-27 61 -27 135z" />
 <glyph unicode="3" horiz-adv-x="1500" d="M0 159v1450q0 31 14 60q12 29 32 53q22 24 50 39q29 15 59 16h116v148q0 49 45 87q44 36 94 36q51 0 93 -36q43 -38 43 -87v-148h408v148q0 49 41 87q43 36 99 36t97 -36q43 -38 43 -87v-148h97q31 0 62 -14q31 -15 54 -38q24 -22 38 -52q15 -29 15 -60v-1439 q0 -31 -15 -60q-14 -31 -38 -56q-24 -26 -54 -41q-31 -17 -62 -17h-1184q-61 0 -104 48t-43 111zM265 478q0 -29 18 -53q20 -24 48 -24h428q29 0 48 24q20 24 21 53q0 29 -21 53q-19 24 -48 24h-428q-27 0 -48 -24q-19 -24 -18 -53zM265 898q0 -31 18 -60q20 -29 48 -29h836 q31 0 52 29q19 29 18 60q0 27 -18 47q-20 19 -52 19h-836q-27 0 -48 -19q-19 -20 -18 -47zM546 1297q0 -29 19 -53q20 -24 48 -24h546q31 0 51 24q19 24 19 53q0 27 -19 51q-20 24 -51 24h-546q-27 0 -48 -24q-19 -24 -19 -51z" />
@@ -66,6 +66,7 @@
 <glyph unicode="i" horiz-adv-x="3193" d="M0 29v1816h280l584 -1212v1212h268v-1816h-289l-575 1184v-1184h-268zM1370 707q1 172 69 334q67 164 189 249q123 85 275 86q236 0 384 -195q150 -195 150 -490q0 -299 -150 -495q-152 -196 -382 -196q-142 0 -270 82q-130 82 -196 239q-68 159 -69 386zM1652 688 q0 -197 72 -301q73 -104 181 -104t179 104q73 104 73 302q0 193 -73 297q-72 104 -179 105q-108 0 -181 -105q-72 -102 -72 -298zM2652 29v348h273v-348h-273z" />
 <glyph unicode="j" horiz-adv-x="2713" d="M75 20q-29 16 -29 42q0 43 75 115q77 41 179 77q-26 60 -25 125q0 119 78 205q79 85 190 85q109 0 187 -85q79 -85 79 -205q0 7 0 -10q31 5 53 6v1496q0 75 48 126q49 51 123 51h1025q73 0 121 -51q46 -51 46 -126v-1579q184 -51 304 -118q116 -77 116 -121 q0 -25 -41 -39q-39 -14 -97 -14q-22 0 -46 2l-2289 1h-15q-51 0 -82 17zM1082 770q0 -34 36 -62q33 -25 70 -25h3h154q38 0 63 25q26 26 26 62v242q0 38 -26 63q-26 26 -63 26h-176q-36 0 -61 -26q-26 -26 -26 -63v-242zM1082 1408q0 -34 36 -61q34 -26 73 -26h154 q38 0 63 26q26 26 26 61v242q0 38 -26 63q-26 26 -63 26h-176q-36 0 -61 -26q-26 -26 -26 -63v-242zM1654 770q0 -34 36 -62q35 -25 72 -25h3h153q36 0 62 25q26 26 25 62v242q0 38 -25 63q-26 26 -62 26h-175q-38 0 -64 -26t-25 -63v-242zM1654 1408q0 -34 36 -61 q36 -26 75 -26h153q36 0 62 26t25 61v242q0 38 -25 63q-26 26 -62 26h-175q-38 0 -64 -26t-25 -63v-242z" />
 <glyph unicode="k" d="M0 1024q0 -425 300 -724q299 -300 724 -300t724 300q300 299 300 724t-300 724q-299 300 -724 300t-724 -300q-300 -299 -300 -724zM560 1644h177l292 -477l287 477h171l-325 -552h268v-140h-266v-201h268v-133h-270v-272h-271v270h-277v135h277v203h-277v137h277z" />
+<glyph unicode="l" horiz-adv-x="2179" d="M0 1026v126q14 210 108 411q79 164 213 297q294 287 705 318h126q427 -36 708 -318q283 -282 319 -708v-126q-36 -425 -319 -709q-282 -282 -708 -317h-126q-425 36 -709 317q-282 282 -317 709zM155 1036q24 -377 301 -635q270 -248 628 -248q29 0 59 2q369 22 630 301 q251 267 251 627q0 28 -2 57q-19 370 -300 633q-264 248 -620 248q-33 0 -66 -2q-382 -24 -633 -297q-250 -270 -250 -627q0 -29 2 -59zM657 756q44 49 328 329q-53 60 -164 169t-164 168q56 53 108 109q259 -258 291 -289q43 -43 40 -42l41 42q44 44 124 123t125 123 q43 43 39 43q3 0 58 -55q53 -53 53 -54q-56 -64 -162 -168q-119 -118 -164 -165q44 -48 164 -166q106 -104 162 -167q-2 -2 -80 -82l-28 -25l-83 80l-208 208q-41 41 -38 41l-43 -41q-44 -46 -124 -123q-82 -80 -125 -125q-41 -41 -39 -40q-2 0 -56 52z" />
 <glyph unicode="p" horiz-adv-x="2054" d="M9 1229l42 572q7 82 65 139q56 56 138 64l572 44q9 1 18 1q89 0 154 -66l992 -991q65 -65 65 -156q0 -92 -65 -157l-614 -614q-65 -65 -157 -65q-91 0 -156 65l-991 991q-64 64 -64 151q0 11 1 22zM96 1222q-1 -6 -1 -13q0 -53 38 -91l992 -992q37 -37 91 -37h3 q58 0 95 37l615 615q39 39 39 95q0 55 -39 94l-992 992q-39 39 -94 39h-10l-572 -44q-49 -3 -84 -40q-34 -34 -39 -83zM374 1505q0 73 51 125q51 51 125 51q72 0 122 -51q51 -51 52 -125q0 -72 -52 -123q-51 -51 -122 -51q-74 0 -125 51t-51 123zM486 1444q26 -24 64 -24 q36 0 61 24q26 26 26 61q0 38 -26 63q-26 26 -61 26q-38 0 -64 -26q-23 -25 -23 -60q0 -39 23 -64z" />
 <glyph unicode="q" d="M0 1024q0 423 300 724q300 300 724 300q423 0 724 -300q300 -300 300 -724q0 -423 -300 -724q-300 -300 -724 -300t-724 300t-300 724zM147 1024q0 -364 257 -620q255 -257 617 -257h3q364 0 621 257q258 256 258 620t-258 621q-258 258 -621 258q-364 0 -620 -258 q-258 -258 -257 -621zM493 734q3 29 28 48q24 19 54 15q29 -3 48 -27q154 -196 404 -197q251 0 407 200q17 24 47 27q31 5 55 -13q24 -19 27 -48v-10q0 -25 -13 -45q-197 -257 -520 -257h-3h-3q-318 0 -515 252q-16 21 -16 47v8zM587 1126v147q0 46 33 77q32 32 78 32 q44 0 77 -32q32 -31 32 -77v-147q0 -44 -32 -76t-77 -33q-46 1 -78 33t-33 76zM1246 1126v147q0 46 32 77q32 32 77 32q46 0 79 -32q32 -31 32 -77v-147q0 -44 -32 -76t-79 -33q-45 1 -77 33t-32 76z" />
 <glyph unicode="r" d="M0 1024q0 423 300 724q300 300 724 300q423 0 724 -300q300 -300 300 -724q0 -423 -300 -724q-300 -300 -724 -300t-724 300t-300 724zM150 1024q0 -362 256 -618t618 -256t618 256t256 618t-256 618t-618 256t-618 -256t-256 -618zM916 944v624q0 31 23 53q22 22 53 23 q31 0 52 -23q22 -22 23 -53v-592l218 -220q22 -22 22 -53t-22 -53t-53 -22t-53 22l-240 241q-22 22 -23 53z" />

core/src/web/staticres/js/qfw.js

@@ -1,5 +1,5 @@
 //是否有新活动
-var hasNewActive = new Date() >= Date.parse(new Date("2015/12/14 00:00:00")) && new Date() < Date.parse(new Date("2016/1/14 00:00:00"));
+var hasNewActive = false;
 //网站初始化状态
 var webSiteInitFlag = true;
 //登录状态 false--未登录，true--已登录
@@ -8,6 +8,8 @@ var isLogined = false;
 var loginBackType = null;
 //登录完之后强制刷新
 var compulsoryreRresh = false;
+//顶部是否加载完毕
+var topLoadOver = false;
 //表单验证的参数
 var cssctlObj = null;
 var ValidDatatype = {
@@ -491,99 +493,3 @@ function advertAjaxRqe(position){
 		});
 	}
 }
-//认证完之后首次登录
-function afterAutheFirstLogin(result){
-	var identType = result.identType;
-	var entId = result.entId;
-	if(identType == 2){//个人认证
-		$("body").append('{{include "/common/ploginmodal.html"}}');
-		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
-		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
-		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
-	}else{
-		$("body").append('{{include "/common/ologinmodal.html"}}');
-		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
-		$("#fristAutheLoginModal .com-entName").text(result.entName);
-		var comAuthentType = result.comAuthentType;
-		//企业认证标识：1：营业执照；2：企业名片；3：企业邮箱
-		var comAuthentText = comAuthentType==1?"营业执照认证":comAuthentType==2?"名片认证":comAuthentType==3?"邮箱认证":"";
-		var flag = comAuthentText!="";
-		$("#fristAutheLoginModal .com-identTypeText").html("，恭喜您完成"+(identType==1?"企业":identType==3?"机构":"")+"认证"+(flag?"-":"")+comAuthentText);
-		$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon '+(identType==1?"qy":identType==3?"jg":"")+'rz"></i><font class="text-muted">已认证'+(identType==1?"企业":identType==3?"机构":"")+'</font>');
-		if(flag){
-			$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon margin-r-5 '+(comAuthentType==1?"margin-r-10 yyzz":comAuthentType==2?"mp":comAuthentType==3?"yj":"")+'rz"></i><font class="text-muted">'+comAuthentText+'</font>');
-		}
-		if(hasNewActive){
-			$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
-		}else{
-			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
-			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
-		}
-	}
-	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
-	$("#fristAutheLoginModal").modal('show');
-}
-//
-function b_loadTop(){
-	$.ajax({
-	  	type: "POST",
-	  	url: "/front/getWebSiteTop",
-	 	dataType: "json",
-		async: false,
-	  	success: function(result){
-			topLoadOver = true;
-			if(result.status == "y"){
-				isLogined = true;
-				var msgCount = result.msgCount;
-				var hasMsgCount = msgCount > 0;
-				msgCount = msgCount>999?'...':msgCount;
-				var avatar = null;
-				if(avatar != ""){
-					avatar = result.avatar;
-				}
-				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
-				if(hasMsgCount){
-					html += '<a class="b-round-dot"></a>';
-				}
-				html += '</span><a href="/member/show/memberindex">'+result.nickName+'</a>';
-				html += '<div id="head-hideMenu" class="head-hideMenu"><ul>'
-					    	+'<li onclick="window.location.href=\'/member/msgcenter\'"><i class="glyphicon youjian"></i><span>消息中心';
-				if(hasMsgCount){
-					html += '<a class="b-round-dot"></a>';
-				}
-				html += '</span></li>'
-						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1">&nbsp;</i>用户中心</li>'
-						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu">&nbsp;</i>退出</li>';
-						+'</ul></div>';
-				$("#b-loginStatus").html(html)
-				.mouseover(function(){
-					$("#head-hideMenu").show();
-				}).mouseleave(function(){
-					//$("#head-hideMenu").hide();
-				});
-				$("#head-hideMenu").mouseover(function(){
-					$(this).show();
-				}).mouseleave(function(){
-					//$(this).hide();
-				});
-				//处理公用底部扫码登录按钮
-				$("#bottom-bar>li:first").addClass("invisible");
-				//处理认证完之后第一次登录弹出提示框
-				if(result.auditType == "y"){
-					afterAutheFirstLogin(result);
-				}
-			}else{
-				isLogined = false;
-				var html = '<a onclick="loginModalShow();">登录/注册</a>';
-				$("#b-loginStatus").html(html);
-				$("#bottom-bar>li").removeClass("invisible");
-			}
-			try{
-				b_loadTopCallBack(result);
-			}catch(e){}
-		},
-		error: function(e){
-			topLoadOver = true;
-		}
-	});
-}

core/src/web/templates/common/head.html

@@ -55,8 +55,6 @@
 	</table>
 </div>
 <script text="text/javascript">
-//顶部是否加载完毕
-var topLoadOver = false;
 var isMobile = false;
 var keyCode=0;
 document.onkeydown=function(event){
@@ -324,6 +322,37 @@ function setNavbarActive(index,type){
 	$("#head-navbar-ul li:first").removeClass("a-com-active");
 	$("#head-navbar-ul li:eq("+index+")").addClass("a-com-active");
 }
+function afterAutheFirstLogin(result){
+	var identType = result.identType;
+	var entId = result.entId;
+	if(identType == 2){//个人认证
+		$("body").append('{{include "/common/ploginmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
+		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+	}else{
+		$("body").append('{{include "/common/ologinmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName);
+		var comAuthentType = result.comAuthentType;
+		//企业认证标识：1：营业执照；2：企业名片；3：企业邮箱
+		var comAuthentText = comAuthentType==1?"营业执照认证":comAuthentType==2?"名片认证":comAuthentType==3?"邮箱认证":"";
+		var flag = comAuthentText!="";
+		$("#fristAutheLoginModal .com-identTypeText").html("，恭喜您完成"+(identType==1?"企业":identType==3?"机构":"")+"认证"+(flag?"-":"")+comAuthentText);
+		$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon '+(identType==1?"qy":identType==3?"jg":"")+'rz"></i><font class="text-muted">已认证'+(identType==1?"企业":identType==3?"机构":"")+'</font>');
+		if(flag){
+			$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon margin-r-5 '+(comAuthentType==1?"margin-r-10 yyzz":comAuthentType==2?"mp":comAuthentType==3?"yj":"")+'rz"></i><font class="text-muted">'+comAuthentText+'</font>');
+		}
+		if(hasNewActive){
+			//$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
+		}else{
+			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
+			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+		}
+	}
+	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
+	$("#fristAutheLoginModal").modal('show');
+}
 </script>
 <script type='text/javascript'>
 window.BWEUM||(BWEUM={});BWEUM.info = {"stand":true,"agentType":"browser","agent":"bi-collector.oneapm.com/static/js/bw-send-411.4.5.js","beaconUrl":"bi-collector.oneapm.com/beacon","licenseKey":"3Nvir~rAqyZ2Ra7i","applicationID":2274815};</script><script type="text/javascript" src="//bi-collector.oneapm.com/static/js/bw-loader-411.4.5.js">

core/src/web/templates/common/indexhead.html

@@ -7,40 +7,31 @@
 			<li class="b-nav-link b-nav-main index-new-nva-c a-com-active fwsc"><a href="/market/0/list.html">服务市场</a></li>
 			<li class="b-nav-link b-nav-other index-new-nva-c"><a class="setserver"  id="releaseService">发服务</a><a class="b-nav-s"></a></li>
 			<li class="b-nav-link b-nav-other index-new-nva-c"><a id="setdemand"  href="/market/demand/add.html">发需求</a></li>
-			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
-			<li class="a-h-search">
-					<div class="input-group">
-				        <div class="input-group-btn hide">
-				        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
-				        </div> <!--/btn-group -->
-						<form method="post" id="searchForm" action="/market/0/list.html">
-							<span><i class="glyphicon sousuo" id="searchFormBtn"></i></span>
-					        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="{{if .T.hotword}}{{.T.hotword}}{{else}}找服务{{end}}">
-							<input type="hidden" name="city" id="city" value="">
-							<input type="hidden" name="cityNo" id="cityNo" value="">
-							<!-- 服务市场 -->
-							<input type="hidden" name="c_searchtype" id="c_searchtype" value="">
-							<input type="hidden" name="c_fwtype" id="c_fwtype" value="">
-							<input type="hidden" name="c_fbtime" id="c_fbtime" value="">
-							<input type="hidden" name="c_rztype" id="c_rztype" value="">
-							<input type="hidden" name="c_xqtype" id="c_xqtype" value="">
-							<input type="hidden" name="c_sorttype" value="">
-							<!-- 企业社区 -->
-							<input type="hidden" name="c_author" id="hauthor" value="">
-							<input type="hidden" name="c_hfl" id="hfl" value="">
-							<input type="hidden" name="c_zb" id="zb" value="">
-						</form>
-		       		</div><!-- /input-group -->
-				<div class="a-h-nav-btn">
-					<img src="/images/nav-btn.png" class="visible-xs-inline" id="nvaBtn">
-				</div>
+			<li class="b-h-search">
+				<div class="input-group">
+			        <div class="input-group-btn hide">
+			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
+			        </div> <!--/btn-group -->
+					<form method="post" id="searchForm" action="/market/0/list.html">
+						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
+				        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="找服务" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+						<input type="hidden" name="city" id="city" value="">
+						<input type="hidden" name="cityNo" id="cityNo" value="">
+						<!-- 服务市场 -->
+						<input type="hidden" name="c_searchtype" id="c_searchtype" value="">
+						<input type="hidden" name="c_fwtype" id="c_fwtype" value="">
+						<input type="hidden" name="c_fbtime" id="c_fbtime" value="">
+						<input type="hidden" name="c_rztype" id="c_rztype" value="">
+						<input type="hidden" name="c_xqtype" id="c_xqtype" value="">
+						<input type="hidden" name="c_sorttype" value="">
+					</form>
+	       		</div>
 			</li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
 		</ul>
 	</div>
 </div>
 <script type="text/javascript">
-//顶部是否加载完毕
-var topLoadOver = false;
 var isMobile = false;
 var keyCode=0;
 document.onkeydown=function(event){
@@ -51,7 +42,6 @@ document.onkeydown=function(event){
 };
 $(function (){
 	isMobile = !$("#b-loginStatus").is(":visible");
-	b_loadTop();
 	$("#searchFormBtn").click(function(){
 		keyCode = 13;
 		$("form#searchForm").submit();
@@ -72,11 +62,6 @@ $(function (){
 			}	
 		}
 	});
-	$("#header-searchInput").bind("focus blur",function(){
-		//$(".a-h-search").toggleClass("a-com-focus");
-		$(this).prev("i").toggleClass("text-primary");
-		//$("#loginStatus").toggleClass("hide");
-	});
 	//
 	$("[id='releaseService']").click(function(){
 		if(isLogined){
@@ -85,20 +70,5 @@ $(function (){
 			loginModalShow(6);
 		}
 	});
-	//手机版
-	$("#nvaBtn").click(function(){
-		if($(this).attr("src") == "/images/nav-btn.png"){
-			$(this).attr("src","/images/nav-btn-a.png");
-		}else{
-			$(this).attr("src","/images/nav-btn.png");
-		}
-		$("#head-navbar").toggleClass("hidden-xs");
-	});
-	$("body").click(function(e){
-		if(isMobile && e.target.id != "head-navbar-ul" && e.target.id != "nvaBtn"){
-			$("#head-navbar").addClass("hidden-xs");
-		}
-	});
 });
-
 </script>

core/src/web/templates/common/login.html

@@ -11,31 +11,12 @@
 	width: 520px;
 	height: 440px;
 }
-.loginForm .username,.loginForm .password{
-	padding-left: 30px;
-}
-.loginForm .glyphicon{
-	position: absolute;
-  	color: #BBB;
-  	width: 38px;
-  	height: 38px;
-  	line-height: 38px;
-	top: 30px;
-}
 .loginForm{
 	text-align:left;
 }
-.loginForm .zhanghao{
-	font-size: 14px;
-	margin-left: 10px;
-}
-.loginForm .mima{
-	font-size: 17px;
-	margin-left: 7px;
-}
 .loginForm .Validform_checktip {
-	line-height: 30px;
-	height: 30px;
+	line-height: 20px;
+	height: 20px;
 	display: block !important;
 	background: none;
 	padding: 0px;
@@ -50,15 +31,6 @@
 	margin-bottom: 0px;
 	position: relative;
 }
-.login_close{
-	cursor: pointer;
-	float: right;
-	margin-top: 12.5px;
-}
-.login_close:hover{
-	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50);
-	opacity: 0.5;
-}
 .loginFont{
 	font-size:14px;
 	font-weight:bold;
@@ -76,22 +48,8 @@
 	margin:0 0px 0 12px;	
 }
 .login-logo{
-	width: 156px;
-	height: 55px;
-	margin-left:150px;
-	margin-top:20px;
-}
-.loginModal .modal-header{
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	padding: 0px 14px 0px 20px;
-	height: 105px;
-	line-height: 105px;
-	border-bottom:none;
-}
-.loginModal .otherlogin{
-	padding:0 30px;
-	height:275px;
+	width: 130px;
+	height: 40px;
 }
 </style>
 <script src="/js/validform-min.js"></script>
@@ -139,19 +97,11 @@ function setTimes(num,n){
 						//登陆成功
 						clearInterval(t);
 						compulsoryreRresh = true;
-						afterLoginSkip(data);
 						$("img.login-logo").css("marginLeft",180);
 						$("div.modal-content").animate({
 						    width:'550px'
 						});
-						if (data.flag==1 && data.auth==1){
-							$(".f-login").hide();
-							$(".f-logintip").show();
-							$(".f-logintip2").show();
-							var href="/member/yellowpage/show/enterprise/"+data.code+"#service"
-							$("#loginservicebtn").attr("href",href)
-							$(".f-username span").text(data.name);
-						}else if(data.flag==1 && data.auth!=1){
+						if(data.flag==1 && data.auth!=1){
 							if (data.name==null || data.name=="null" || data.name==""){
 								if(username!=null || username!="nil" || username!="null"){
 									data.name=username
@@ -160,14 +110,12 @@ function setTimes(num,n){
 								}
 							}
 							$(".f-login").hide();
-							$(".f-logintip").show();
 							$(".f-logintip1").show();
 							$(".f-username").text(data.name+"，");
-						}else if(data.flag==0){
-							$('#loginModal').modal('hide');
+							afterLoginSkip(data,false);
+						}else{
+							afterLoginSkip(data,true);
 						}
-						
-						reLoadTop();
 					}
 				}catch(e){}
 				conB=true;
@@ -216,7 +164,7 @@ $(function (){
 			}else{
 				//注册页面登录之后
 				$("#loginStatus").trigger("login");
-				afterLoginSkip(data);
+				afterLoginSkip(data,true);
 			}
 			//
 			if($("#loginModal [name='rememberMe']").is(':checked')==true){
@@ -241,76 +189,76 @@ $(function (){
 		
 	});
 });
-function afterLoginSkip(data){
-	switch(loginBackType){
-		case -1:
-			window.location.href = window.location.href;
-			break;
-		case 1://微官网
-			window.location.href="/member/wsite";
-			break;
-		case 2://员工邀请
-			window.location.href="/member/employeemanage/loginUserJoin";
-			break;
-		case 4://注册
-			window.location.href="/";
-			break;
-		case 5://预约
-			window.location.href="/front/appointlogin";
-			break;
-		case 6://投标
-			window.location.href="/front/reurl";
-			break;
-		case 7://用户中心首页
-			window.location.href = "/member/show/memberindex";
-			break;
-		case 8://录入产品服务信息
-			if(data.code==null || data.code == ""){
-				window.location.href = '/member/show/memberindex';
-			}else{
-				window.location.href = '/member/yellowpage/show/showService/'+data.code;
-			}
-			break;
-		case 9://录入企业信息
-			if(data.code==null || data.code == ""){
-				window.location.href = '/member/show/memberindex';
-			}else{
-				window.location.href = '/member/yellowpage/edit/enterprise/'+data.code;
-			}
-			break;
-		case 10://订阅设置
-			window.location.href = '/member/swordfish/rssset';
-			break;
-		case 11://信息列表
-			window.location.href = '/member/swordfish/infolist';
-			break;
-		default:
-			if(compulsoryreRresh){
+function afterLoginSkip(data,flag){
+	//强制刷新
+	if(compulsoryreRresh){
+		window.location.href = window.location.href;
+		return;
+	}
+	if(flag){
+		switch(loginBackType){
+			case -1:
 				window.location.href = window.location.href;
-			}else{
-				$('#loginModal').modal('hide');
-				try{
-					reLoadTop();
-				}catch(e){
-					b_loadTop();
+				break;
+			case 1://微官网
+				window.location.href="/member/wsite";
+				break;
+			case 2://员工邀请
+				window.location.href="/member/employeemanage/loginUserJoin";
+				break;
+			case 4://注册
+				window.location.href="/";
+				break;
+			case 5://预约
+				window.location.href="/front/appointlogin";
+				break;
+			case 6://投标
+				window.location.href="/front/reurl";
+				break;
+			case 7://用户中心首页
+				window.location.href = "/member/show/memberindex";
+				break;
+			case 8://录入产品服务信息
+				if(data.code==null || data.code == ""){
+					window.location.href = '/member/show/memberindex';
+				}else{
+					window.location.href = '/member/yellowpage/show/showService/'+data.code;
 				}
-			}
+				break;
+			case 9://录入企业信息
+				if(data.code==null || data.code == ""){
+					window.location.href = '/member/show/memberindex';
+				}else{
+					window.location.href = '/member/yellowpage/edit/enterprise/'+data.code;
+				}
+				break;
+			case 10://订阅设置
+				window.location.href = '/member/swordfish/rssset';
+				break;
+			case 11://信息列表
+				window.location.href = '/member/swordfish/infolist';
+				break;
+			default:
+				$('#loginModal').modal('hide');
+		}
+	}
+	try{
+		reLoadTop();
+	}catch(e){
+		b_loadTop();
 	}
 }
 </script>
 <!-- 登录弹出框 -->
-<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="loginModal" aria-hidden="true">
+<div class="modal fade b-modal" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="loginModal" aria-hidden="true">
   <div class="modal-dialog loginModal">
 		<!--登录注册框-->
-    <div class="modal-content" style="height: 410px;">
+    <div class="modal-content" style="height: 360px;">
 			<!--注册/登录框 -->
-      <div class="modal-header" style="border-top-left-radius: 6px;border-top-right-radius: 6px;padding: 0px 14px 0px 20px;height: 105px;line-height: 105px;border-bottom:none">
-		<img alt="" src="/images/logo.png" class="login-logo">
-		<img alt="" src="/images/login_close.png" class="login_close" onclick="$('#loginModal').modal('hide');clearInterval(t);">
+      <div class="modal-header text-center">
+		<img alt="" src="/images/logo-white.png" class="login-logo">
+		<span data-dismiss="modal" aria-label="Close" class="close glyphicon guanbi1" onclick="clearInterval(t);"></span>
       </div>
-			<div  class="f-logintip" style="display:none;">
-				<hr class="hidden-xs hr1" style="width:100%;"/>
-			</div>
 	 		<div class="modal-body f-logintip1" style="display:none;padding: 20px 10px 20px 10px;">
 				 	<div style='margin-bottom:20px;'>
 						<div>
@@ -335,32 +283,7 @@ function afterLoginSkip(data){
 						
 					</div>
 			</div>
-			<div class="modal-body f-logintip2" style="display:none;padding: 20px 10px 20px 10px;">
-				 	<div style='margin-bottom:20px;'>
-					<div>
-							<div class="u-tipsok">
-								<h3 style="line-height: 40px;margin: -25px 0 0 50px	;">
-									<div class="f-username"><span></span><img style="margin-left:15px;" src="/images/ent_authe_a.png" height="22"></div>
-									<div style="float:left;margin: -10px 0 30px 0; color:#000;">恭喜你注册成功！</div>
-								</h3>
-							</div>
-						</div>
-					<div class="u-guide">完成以下操作，就可以领取红包啦：</div>
-						<div class="m-logintip" style="margin-bottom:0px;height:190px;">
-							<ul style="font-size:13px;">
-								<li>
-									<span style="font-weight:bold">1.</span>&nbsp;&nbsp;验证企业身份<a target="_blank" href="/member/accountset/index" class="btn btn-primary" style="width:82px;margin-left:13px;">认证</a>
-								</li>
-								<li>
-									<span style="font-weight:bold">2.</span>&nbsp;&nbsp;去发服务，让更多的用户找到你<a target="_blank" href="/member/accountset/index" class="btn btn-primary" style="width:82px;margin-left:13px;">发服务</a>
-								</li>
-							</ul>
-						</div>
-					</div>
-					<div><small>2015年12月14日起，在企明星注册的服务机构在发布服务信息后，即可收到企明星微信平台发放的最高200元的微信红包奖励！欢迎参与！<a target="_blank" href="/p/">点击查看详情</a>。</small></div>
-			</div>			
-			<div class="modal-body f-login" style="text-align:center;padding-top:0;">
-	 	<!--<div class="hidden-xs" style='margin-bottom:20px;'><hr class='hr1'/><span class="text-muted text-primary loginFont" v="wxlogin">微信扫码登录</span><span class="text-muted" style="display:inline-block;margin:0 10px;">|</span><span v="otherlogin" class="text-muted loginFont">手机/邮箱登录</span><hr class="hr1 hr2"/></div>-->
+			<div class="modal-body f-login" style="text-align:center;padding-top:20;">
 		<div class="row">
 		<div class="login wxlogin hidden-xs col-md-5">
 			<div class="text-muted" style="margin-top:5px;font-weight: 700;color:#000;font-size: 14px;">微信扫码登录</div>
@@ -373,19 +296,17 @@ function afterLoginSkip(data){
 		  	<div class="form-group">
 				<div class="Validform_checktip text-primary"></div>
 			    <input name="s_name" type="text" class="form-control username" placeholder="邮箱/手机号" datatype="m|e" nullmsg="请填写邮箱/手机号" errormsg="邮箱/手机号格式错误">
-				<i class="glyphicon zhanghao"></i>
 		  	</div>
 		 	<div class="form-group">
 			  	<div class="Validform_checktip text-primary"></div>
 			    <input name="s_pwd" type="password" class="form-control password" placeholder="密码" datatype="*" nullmsg="请填写密码">
-				<i class="glyphicon mima"></i>
 		  	</div>
 		  	<div class="form-group margin-t-20 font-size-12">
-				<input type="checkbox" name="rememberMe" value="y" style="vertical-align: sub;">&nbsp;下次自动登录
+				<!--<input type="checkbox" name="rememberMe" value="y" style="vertical-align: sub;">&nbsp;下次自动登录-->
 			  	<a class="pull-right text-primary" href="/front/findpwd">忘记密码?</a>
 		  	</div>
 		  	<div class="form-group text-center margin-t-20">
-		    	<button type="submit" class="btn btn-primary" style="background-color: #ff5a5f;width: 100%;font-weight: bold;">登<span class="margin-lr-30"></span>录</button>
+		    	<button type="submit" class="btn btn-primary" style="background-color: #ff5a5f;width: 100%;">登录</button>
 		  	</div>
 		</form>
 		</div>

core/src/web/templates/common/ologinmodal.html

@@ -1,10 +1,10 @@
 <!-- Modal -->
-<div class="modal fade fristAutheLoginModal" id="fristAutheLoginModal" tabindex="-1" role="dialog" aria-labelledby="fristAutheLoginModalLabel">
+<div class="modal fade fristAutheLoginModal b-modal" id="fristAutheLoginModal" tabindex="-1" role="dialog" aria-labelledby="fristAutheLoginModalLabel">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
-				<i class="glyphicon shibai pull-right" data-dismiss="modal" aria-label="Close"></i>
-				<h4 class="modal-title" id="fristAutheLoginModalLabel">认证提示信息</h4>
+				<span data-dismiss="modal" aria-label="Close" class="close glyphicon guanbi1"></span>
+				认证提示信息
 			</div>
 			<div class="modal-body">
 				<form class="form-horizontal" role="form">

core/src/web/templates/common/ploginmodal.html

@@ -1,12 +1,10 @@
 <!-- Modal -->
-<div class="modal fade fristAutheLoginModal" id="fristAutheLoginModal" tabindex="-1" role="dialog" aria-labelledby="fristAutheLoginModalLabel">
+<div class="modal fade fristAutheLoginModal b-modal" id="fristAutheLoginModal" tabindex="-1" role="dialog" aria-labelledby="fristAutheLoginModalLabel">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
-				<i class="glyphicon shibai pull-right" data-dismiss="modal" aria-label="Close"></i>
-				<h4 class="modal-title text-muted" id="fristAutheLoginModalLabel">
-					认证提示信息
-				</h4>
+				<span data-dismiss="modal" aria-label="Close" class="close glyphicon guanbi1"></span>
+				认证提示信息
 			</div>
 			<div class="modal-body">
 				<form class="form-horizontal" role="form">

core/src/web/templates/common/swordfishhead.html

@@ -1,4 +1,3 @@
-{{include "/common/login.html"}}
 <link href="/css/swordfish.css" rel="stylesheet">
 <div class="b-head">
 	{{include "/common/top.html"}}
@@ -46,11 +45,8 @@ function b_loadTopCallBack(result){
 }
 function swordfishLayoutInit(){
 	if(document.body.scrollHeight <= document.body.clientHeight){
-		$(".swordfish-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
+		$(".b-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
 		webSiteInit();
 	}
 }
-$(function(){
-	b_loadTop();
-});
 </script>

core/src/web/templates/common/top.html

@@ -8,4 +8,107 @@
 			<li><span class="img-circle b-com-five"><i class="glyphicon zhengcefagui"></i></span><a href="/front/content_zcfg_list.html">政策法规</a></li>
 		</ul>
 	</div>
-</div>
+</div>
+<script type="text/javascript">
+$(function(){
+	b_loadTop();
+});
+//认证完之后首次登录
+function afterAutheFirstLogin(result){
+	var identType = result.identType;
+	var entId = result.entId;
+	if(identType == 2){//个人认证
+		$("body").append('{{include "/common/ploginmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
+		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+	}else{
+		$("body").append('{{include "/common/ologinmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName);
+		var comAuthentType = result.comAuthentType;
+		//企业认证标识：1：营业执照；2：企业名片；3：企业邮箱
+		var comAuthentText = comAuthentType==1?"营业执照认证":comAuthentType==2?"名片认证":comAuthentType==3?"邮箱认证":"";
+		var flag = comAuthentText!="";
+		$("#fristAutheLoginModal .com-identTypeText").html("，恭喜您完成"+(identType==1?"企业":identType==3?"机构":"")+"认证"+(flag?"-":"")+comAuthentText);
+		$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon '+(identType==1?"qy":identType==3?"jg":"")+'rz"></i><font class="text-muted">已认证'+(identType==1?"企业":identType==3?"机构":"")+'</font>');
+		if(flag){
+			$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon margin-r-5 '+(comAuthentType==1?"margin-r-10 yyzz":comAuthentType==2?"mp":comAuthentType==3?"yj":"")+'rz"></i><font class="text-muted">'+comAuthentText+'</font>');
+		}
+		if(hasNewActive){
+			//$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
+		}else{
+			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
+			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+		}
+	}
+	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
+	$("#fristAutheLoginModal").modal('show');
+}
+//
+function b_loadTop(){
+	$.ajax({
+	  	type: "POST",
+	  	url: "/front/getWebSiteTop",
+	 	dataType: "json",
+		async: false,
+	  	success: function(result){
+			topLoadOver = true;
+			if(result.status == "y"){
+				isLogined = true;
+				var msgCount = result.msgCount;
+				var hasMsgCount = msgCount > 0;
+				msgCount = msgCount>999?'...':msgCount;
+				var avatar = null;
+				if(avatar != ""){
+					avatar = result.avatar;
+				}
+				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
+				if(hasMsgCount){
+					html += '<a class="b-round-dot"></a>';
+				}
+				html += '</span><a href="/member/show/memberindex">'+result.nickName+'</a>';
+				html += '<div id="head-hideMenu" class="head-hideMenu"><ul>'
+					    	+'<li onclick="window.location.href=\'/member/msgcenter\'"><i class="glyphicon youjian"></i><span>消息中心';
+				if(hasMsgCount){
+					html += '<a class="b-round-dot"></a>';
+				}
+				html += '</span></li>'
+						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1"></i>用户中心</li>'
+						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu"></i>退出</li>';
+						+'</ul></div>';
+				$("#b-loginStatus").html(html)
+				.mouseover(function(){
+					$("#head-hideMenu").show();
+				}).mouseleave(function(){
+					$("#head-hideMenu").hide();
+				});
+				$("#head-hideMenu").mouseover(function(){
+					$(this).show();
+				}).mouseleave(function(){
+					$(this).hide();
+				});
+				//处理公用底部扫码登录按钮
+				$("#bottom-bar>li:first").addClass("invisible");
+				//处理认证完之后第一次登录弹出提示框
+				if(result.auditType == "y"){
+					afterAutheFirstLogin(result);
+				}
+			}else{
+				isLogined = false;
+				var html = '<a onclick="loginModalShow();">登录/注册</a>';
+				$("#b-loginStatus").html(html);
+				$("#bottom-bar>li").removeClass("invisible");
+				//登录
+				$("body").append('{{include "/common/login.html"}}');
+			}
+			try{
+				b_loadTopCallBack(result);
+			}catch(e){}
+		},
+		error: function(e){
+			topLoadOver = true;
+		}
+	});
+}
+</script>

core/src/web/templates/index.html

@@ -9,8 +9,7 @@
 <script src="/js/jquery.lazyload.min.js"></script>
 
 </head>
-<body class="index-new-body">
-{{include "/common/login.html"}}
+<body>
 {{include "/common/indexhead.html"}}
 <div class="a-content a-index">	
 	<div class="a-index-head index-new-head">
@@ -264,7 +263,7 @@ $(function(){
 	}else{
 		//活动处理
 		if(hasNewActive){
-			/*扫码送红包活动*/
+			/*扫码送红包活动
 			$(".a-index-hd").append('<img src="/images/smshb.png" onclick="window.open(\'/p\')" class="cursor-pointer"><div class="smshb"><ul id="hd-smshb" class="text-center"></ul></div>');
 			$.post("/front/showAmount",null,function(r){
 				if(r == null || typeof(r) == "undefined" || r.length == 0){
@@ -286,7 +285,7 @@ $(function(){
 						$(this).css({marginTop : "0px"}).find("li:first").appendTo(this);
 					}); 
 				},4000);
-			});
+			});*/
 		}else{
 			$(".a-index-hd").append('<a href="http://3.ihenan.com" target="_blank"><img src="/images/hlwdh.png"></a>');
 		}

core/src/web/templates/member/showenterprise.html

@@ -477,172 +477,6 @@ var entType="企业"
     </div>
   </div>
 </div>
-
-<!-- Modal -->
-<div class="modal fade" id="FRTModal" tabindex="-1" role="dialog" aria-labelledby="FRTModalLabel">
-  	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div id="reg_b">
-		  	<div class="text-muted d_tck_n"></div>
-	  		<div class="modal-body d_tck_fat">
-				
-				<form class="validForm form-horizontal registerform" role="form" id="service" method="post">
-					<!--认证提示信息-->
-				  <div>
-				
-			        <div class="form-group" style="height:20px;">
-			        <label id="col-sm-4" class="col-sm-2 control-label" for="name"></label>
-				    <div class="col-sm-8">
-					</div>
-					<div class="col-sm-2">
-					</div>
-					</div>
-					
-			        <div class="form-group">
-			        <label id="col-sm-4" class="col-sm-2 control-label" for="name"></label>
-				    <div class="col-sm-8">
-					<img src="/images/redpackage.png"/>
-					</div>
-					<div class="col-sm-2">
-					</div>
-					</div>
-					
-			        <div class="form-group">
-			        <label id="col-sm-2" class="col-sm-1 control-label" for="name"></label>
-				    <div class="col-sm-10" align="center" style="font-size:16px;line-height:30px;">
-					企明星发放的红包在赶到您微信的路上，请耐心等候！<br/><span style="color:#ee2a5d;">分享该页面</span>将提高几率获得<span style="color:#ee2a5d;">大额现金红包</span>奖励！来试试吧！
-					</div>
-					<div class="col-sm-1">
-					</div>
-					</div>
-					
-					
-					<div class="form-group">
-			        <label id="col-sm-2" class="col-sm-1 control-label" for="name"></label>
-				    <div class="col-sm-10">
-					友情提示，因参加活动用户数量过多，如果您在十分钟内未收到企明星发放的红包，请及时联系客服QQ。
-					</div>
-					<div class="col-sm-1">
-					</div>
-					</div>
-					
-			        <div class="form-group" style="height:20px;">
-			        <div class="col-sm-5" style="border-bottom:solid #ccc 1px;height:12px;"></div>
-				    <div class="col-sm-2" align="center">
-					<span style="font-size:16px;padding-left:15px;">分享到</span>
-					</div>
-					<div class="col-sm-5" style="border-bottom:solid #ccc 1px;height:12px;">
-					</div>
-					</div>
-					
-			        <div class="form-group" style="margin-left:35px; margin-top:40px;">
-			        <label id="col-sm-2" class="col-sm-1 control-label" for="name"></label>
-				    <div class="col-sm-2">
-				        <div id="share">				
-							<div class="bdsharebuttonbox" >
-							<a href="#" class="bds_weixin" data-cmd="weixin" title="分享到微信"></a>
-							</div>
-						</div>
-					</div>
-					 <div class="col-sm-2">
-				        <div id="share">				
-							<div class="bdsharebuttonbox" align="center">
-						<a href="#" class="bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
-							</div>
-						</div>
-					</div>
-					 <div class="col-sm-2">
-				        <div id="share">				
-							<div class="bdsharebuttonbox" align="center">
-						<a href="#" class="bds_tqq" data-cmd="tqq" title="分享到腾讯微博"></a>
-							</div>
-						</div>
-					</div>
-					 <div class="col-sm-2">
-				        <div id="share">				
-							<div class="bdsharebuttonbox" align="center">
-						<a href="#" class="bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
-							</div>
-						</div>
-					</div>
-					<div class="col-sm-2">
-				        <div id="share">				
-							<div class="bdsharebuttonbox" align="center">
-						<a href="#" class="bds_douban" data-cmd="douban" title="分享到豆瓣网"></a>
-							</div>
-						</div>
-					</div> 
-						<script>window._bd_share_config={
-								"common":{
-									"bdTitle":"企明星企业服务网",
-									"bdDesc" :"亲们，我已经领到了企明星发放的现金大红包！手快有，手慢无，别说我没告诉你们啊！领取方式点击（http://www.qimingxing.info/p/?id=5010001501）",
-									"bdSnsKey":{
-										
-									},
-									"bdText":"",
-									"bdMini":"2",
-									"bdPic":"",
-									"bdStyle":"0",
-									"bdSize":"16",
-									"onBeforeClick":function(cmd,config){
-										if(cmd == "weixin"){
-											config["bdUrl"] = "http://mp.weixin.qq.com/s?__biz=MzA5MTk0MTk5Ng==&mid=401971726&idx=1&sn=89d2470f1de7e80975223041b06c106a";
-										}else{
-											config["bdUrl"] = "http://www.qimingxing.info/p/?id=5010001501";
-										}
-										return config;
-									}
-								},
-								"share":{
-									
-								}
-							};
-							with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>				
-							
-					
-					<div class="col-sm-1">
-					</div>
-					</div>
-					
-					
-			        <div class="form-group" style="margin-left:25px;">
-			        <label id="col-sm-1" class="col-sm-1 control-label" for="name"></label>
-				    <div class="col-sm-2"><span style="padding-left:14px;">微信</span>
-					</div>
-				    <div class="col-sm-2"><span>新浪微博</span>
-					</div>
-				    <div class="col-sm-2"><span>腾讯微博</span>
-					</div>
-				    <div class="col-sm-2"><span>QQ空间</span>
-					</div>
-				    <div class="col-sm-2"><span style="padding-left:8px;">豆瓣</span>
-					</div>
-					<div class="col-sm-1">
-					
-					</div>
-					</div>
-			        <div class="form-group" style="height:5px;">
-			        <label id="col-sm-4" class="col-sm-2 control-label" for="name"></label>
-				    <div class="col-sm-8">
-					</div>
-					<div class="col-sm-2">
-					</div>
-					</div>
-					
-					
-					
-			       
-					</div>
-					</div>
-					
-					</form>
-			
-			</div>
-			</div>
-
-		</div>
-	</div>
-</div>
 </body>
 
 <script type="text/javascript">
@@ -659,16 +493,6 @@ function clearWeixin(){
 		setTimeout(clearWeixin,30);
 	}
 }
-//
-var firstredtype ='{{session "firstredtype"}}';
-   	//第一次发布服务后，发送红包的时候，提示框会弹出分享按钮！
-	if (firstredtype == "y"){
-		$("#FRTModal").modal('show');
-		$.post("/front/deletefirstredtype",null,function(){
-			
-		});
-	}
-
 //
 var s_weixinbarcode = {{.T.entinfo.s_weixinbarcode}}
   if (s_weixinbarcode == ""){

core/src/web/templates/swordfish/index.html

@@ -9,8 +9,8 @@
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid swordfish-index">
-	<div class="swordfish-left">
+<div class="b-content container-fluid swordfish-index">
+	<div class="b-left">
 		<div id="swordfish-guide" class="swordfish-guide carousel slide" data-ride="carousel">
 		    <div class="swordfish-guide-left">
 				<i class="bootstrap-glyphicon glyphicon glyphicon-menu-left" href="#swordfish-guide" data-slide="prev"></i>
@@ -53,7 +53,7 @@
 			</span>
 		</div>
 	</div>
-	<div class="swordfish-right">
+	<div class="b-right">
 		<div class="swordfish-right-title">
 			剑鱼最新消息
 		</div>
@@ -80,8 +80,7 @@ $(function(){
 		}
 		$("#list").html(html);
 	}else{
-		$(".swordfish-index").find(".swordfish-left").removeClass("col-xs-9");
-		$(".swordfish-index").find(".swordfish-right").remove();
+		$(".swordfish-index").find(".b-right").remove();
 	}
 });
 </script>

core/src/web/templates/swordfish/infolist.html

@@ -319,8 +319,8 @@ function loadMore(){
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid">
-	<div class="swordfish-left">
+<div class="b-content container-fluid">
+	<div class="b-left">
 		<div class="swordfish-page-title">
 			<i class="img-circle glyphicon jianyu"></i>推送记录
 		</div>
@@ -338,7 +338,7 @@ function loadMore(){
 			</div>
 		</div>
 	</div>
-	<div class="swordfish-right swordfish-qrcode text-center">
+	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">
 		<br>关注微信公众号：企明星
 	</div>

core/src/web/templates/swordfish/rssset.html

@@ -7,8 +7,8 @@
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid swordfish-rssset">
-	<div class="swordfish-left">
+<div class="b-content container-fluid swordfish-rssset">
+	<div class="b-left">
 		<div class="swordfish-page-title">
 			<i class="img-circle glyphicon jianyu"></i>订阅设置
 		</div>
@@ -77,7 +77,7 @@
 			<div class="swordfish-panel-c">开发中，敬请期待！</div>
 		</div>
 	</div>
-	<div class="swordfish-right swordfish-qrcode text-center">
+	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">
 		<br>关注微信公众号：企明星
 	</div>

weixin/src/qfw/weixin/menu.go

@@ -32,7 +32,7 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	menu.Buttons[1].SubButtons[2].Key = "oidentification"
 
 	menu.Buttons[2].Name = "会员服务"
-	menu.Buttons[2].SubButtons = make([]MenuButton, 4)
+	menu.Buttons[2].SubButtons = make([]MenuButton, 3)
 	menu.Buttons[2].SubButtons[0].Name = "微官网"
 	menu.Buttons[2].SubButtons[0].Type = MenuButtonTypeKey
 	menu.Buttons[2].SubButtons[0].Key = "msite" //"http://" + wf.SysConfig.Domain + "/weixin/site/edit" //微官网编辑
@@ -44,9 +44,9 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	menu.Buttons[2].SubButtons[2].Type = MenuButtonTypeUrl
 	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "lawsearchaction")
 
-	menu.Buttons[2].SubButtons[3].Name = "领取红包"
-	menu.Buttons[2].SubButtons[3].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[3].Url = "http://mp.weixin.qq.com/s?__biz=MzA5MTk0MTk5Ng==&mid=401971726&idx=1&sn=89d2470f1de7e80975223041b06c106a#rd"
+	//menu.Buttons[2].SubButtons[3].Name = "领取红包"
+	//menu.Buttons[2].SubButtons[3].Type = MenuButtonTypeUrl
+	//menu.Buttons[2].SubButtons[3].Url = "http://mp.weixin.qq.com/s?__biz=MzA5MTk0MTk5Ng==&mid=401971726&idx=1&sn=89d2470f1de7e80975223041b06c106a#rd"
 
 	err := Mux.CreateMenu(menu)
 	if err != nil {