分支合并

common/src/qfw/util/encrypt_test.go

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

core/src/luckdraw.json

@@ -0,0 +1,52 @@
+{
+	"startDate":1452750000,
+	"endDate":1454256000,
+	"getAmount":[{
+		"min":0,
+		"max":40,
+		"proportion":0
+	},{
+		"min":50,
+		"max":85,
+		"proportion":24.2
+	},{
+		"min":95,
+		"max":130,
+		"proportion":1
+	},{
+		"min":140,
+		"max":175,
+		"proportion":24.2
+	},{
+		"min":185,
+		"max":220,
+		"proportion":2
+	},{
+		"min":230,
+		"max":265,
+		"proportion":24.2
+	},{
+		"min":275,
+		"max":310,
+		"proportion":0.3
+	},{
+		"min":320,
+		"max":355,
+		"proportion":24.1
+	}],
+	"promotioncode":"2001001501",
+	"weixin":{
+		"sendname":"企明星",
+		"wishing":"企明星扫码送红包活动",
+		"actname":"企明星扫码送红包活动",
+		"remark":"拆红包愉快！",
+		"successtitle":"友情提示",
+		"successremark":"因参加活动的用户较多，如果您在十分钟内未收到企明星发放的红包，请及时联系客服QQ。"
+	},
+	"msg":{
+		"title":"红包到账啦！",
+		"content":"您的企明星红包到账啦，快打开微信猛戳红包！"
+	},
+	"reissueTime":"8:10",
+	"isReissue":false
+}

core/src/main.go

@@ -4,6 +4,7 @@ package main
 import (
 	"flag"
 	"github.com/go-xweb/xweb"
+	_ "qfw/active"
 	_ "qfw/chat"
 	. "qfw/coreconfig"
 	"qfw/filemanage"

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/active/active.go

@@ -0,0 +1,12 @@
+//
+package active
+
+import (
+	"github.com/go-xweb/xweb"
+)
+
+//抽奖活动
+func init() {
+	//添加模块解析
+	xweb.AddAction(&Activemanage{})
+}

core/src/qfw/active/activemanage.go

@@ -0,0 +1,138 @@
+/*
+ *抽奖模块
+ */
+package active
+
+import (
+	"fmt"
+	"github.com/go-xweb/xweb"
+	"math/rand"
+	. "qfw/coreconfig"
+	mob "qfw/mobile"
+	. "qfw/util"
+	. "qfw/util/mongodb"
+	"strconv"
+	"time"
+)
+
+type Activemanage struct {
+	*xweb.Action
+	luckdraw    xweb.Mapper `xweb:"/activity/(\\w+)/([^.]*)"`
+	getluckdraw xweb.Mapper `xweb:"/activity/luckdraw"`
+}
+
+//进入抽奖页面
+func (a *Activemanage) Luckdraw(activecode, id string) error {
+	if activecode == "topcj" {
+		se := SimpleEncrypt{Key: "topnet2015topnet2015"}
+		openid := se.DecodeString(id)
+		a.T["signature"] = mob.GetSignature(a.Url())
+		u := FindOne("winningrecord", "{'s_openid':'"+openid+"'}")
+		if *u != nil {
+			//a.T = *u
+			a.T["flog"] = "A"
+			return a.Render("/active/luckdraw.html", &a.T)
+		}
+		a.SetSession("openid", openid)
+		a.SetSession("s_actcode", activecode)
+		return a.Render("/active/luckdraw.html", &a.T)
+	} else {
+		return nil
+	}
+}
+
+//
+func (a *Activemanage) Getluckdraw() error {
+	flog := "F"
+	id := ""
+	openid := a.GetSession("openid").(string)
+	s_actcode := a.GetSession("s_actcode").(string)
+	if openid == "" {
+		return a.Write(`{"flog":"` + flog + `"}`)
+	} else {
+		u := FindOne("winningrecord", "{'s_openid':'"+openid+"'}")
+		if *u != nil {
+			flog = "A"
+			return a.Write(`{"flog":"` + flog + `"}`)
+		}
+	}
+	data := make(map[string]interface{})
+	data["s_openid"] = openid
+	data["s_actcode"] = s_actcode
+	i := getLuckDraw()
+	s_prize := getPrize(i)
+	data["s_prize"] = s_prize
+	data["l_timestamp"] = time.Now().Unix()
+	nowdate := time.Now().Unix()
+	enddate := LuckDraw.EndDate
+	if nowdate < enddate {
+		id = Save("winningrecord", data)
+		fmt.Println("nowdate:", nowdate, "enddate:", enddate, len(id))
+	}
+	if len(id) > 0 {
+		flog = "T"
+	}
+	return a.Write(`{"flog":"` + flog + `","prize":"` + s_prize + `","rotate":` + strconv.Itoa(int(i)) + `}`)
+
+}
+
+//
+func getLuckDraw() int {
+	array := LuckDraw.GetAmount
+	weightValue := getWeightRandom(array)
+	min := IntAll(array[weightValue]["min"])
+	max := IntAll(array[weightValue]["max"])
+	if max == 0 || (min == 0 && max == 0) {
+		return 1
+	}
+	if min == max {
+		return min
+	} else {
+		amount := min + rand.New(rand.NewSource(time.Now().UnixNano())).Intn(max-min)
+		if amount <= 0 {
+			return 1
+		}
+		return amount
+	}
+	return 0
+}
+
+//
+func getWeightRandom(array []map[string]interface{}) int {
+	var weightSum, stepWeightSum float64
+	for _, v := range array {
+		weightSum += v["proportion"].(float64)
+	}
+	randVal := rand.New(rand.NewSource(time.Now().UnixNano())).Float64()
+	for i := 0; i < len(array); i++ {
+		stepWeightSum += array[i]["proportion"].(float64)
+		if randVal <= stepWeightSum/weightSum {
+			return i
+		}
+	}
+	return 0
+}
+
+//
+func getPrize(i int) string {
+	var prize = ""
+	if i > 0 {
+		if 0 <= i && i < 45 {
+			prize = "iPad mini"
+		} else if 91 <= i && i < 136 {
+			prize = "限量版U盘"
+
+		} else if 181 <= i && i < 226 {
+			prize = "五元现金红包"
+
+		} else if 271 <= i && i < 316 {
+			prize = "《牛奶可乐经济学》"
+
+		} else {
+			prize = "谢谢参与"
+		}
+	} else {
+		prize = "抽奖异常，联系管理员！"
+	}
+	return prize
+}

core/src/qfw/coreconfig/LuckDraw.go

@@ -0,0 +1,23 @@
+package coreconfig
+
+import (
+	"qfw/util"
+)
+
+//系统配置
+type luckDraw struct {
+	GetAmount     []map[string]interface{} `json:"getAmount"`
+	StartDate     int64                    `json:"startDate"`
+	EndDate       int64                    `json:"endDate"`
+	Promotioncode string                   `json:"promotioncode"`
+	ReissueTime   string                   `json:"reissueTime"`
+	Weixin        map[string]interface{}   `json:"weixin"`
+	Msg           map[string]interface{}   `json:"msg"`
+	IsReissue     bool                     `json:"isReissue"`
+}
+
+var LuckDraw luckDraw
+
+func readluckDraw() {
+	util.ReadConfig("./luckdraw.json", &LuckDraw)
+}

core/src/qfw/coreconfig/coreconfig.go

@@ -11,4 +11,5 @@ func init() {
 	readTimeTaskConfig()
 	readServiceClassify()
 	readredPackage()
+	readluckDraw()
 }

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/front/webcentent.go

@@ -25,7 +25,7 @@ type Newscont struct {
 	//前台新闻资讯等信息内容
 	webcontent xweb.Mapper `xweb:"GET /front/webcontent/(\\w+).html"`
 	//活动内容
-	webactivitycontent xweb.Mapper `xweb:"GET /front/webactivitycontent/(\\w+)"`
+	webactivitycontent xweb.Mapper `xweb:"GET /front/webactivitycontent/(\\w+).html"`
 	//关于我们内容，联系我们内容，法律声明内容
 	webaboutcontent xweb.Mapper `xweb:"GET /front/webaboutcontent/(\\w+).html"`
 	//帮助中心内容

core/src/qfw/manage/auditing.go

@@ -662,34 +662,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

@@ -216,7 +216,8 @@ func (m *Member) GetLogin(key string) error {
 				}
 			}
 			if bcon {
-				UpdateCookieSession(m.Action, "s_nickname", false, *user)
+				UpdateCookieSession(m.Action, "s_name", false, *user)
+				updateAudittype(m.Action, user)
 				flag := 0
 				if redis.GetStr("sso", "new_"+key) == res {
 					flag = 1
@@ -424,6 +425,14 @@ func (m *Member) RegisterComplete() error {
 	return m.Render("/member/registercomplete.html", &m.T)
 }
 
+func updateAudittype(action *xweb.Action, r *map[string]interface{}) {
+	if action.GetSession("audittype") == "y" {
+		Update("user", &map[string]interface{}{
+			"_id": ObjectIdHex(strings.Split(fmt.Sprintf("%s", (*r)["_id"]), `"`)[1]),
+		}, `{'$set':{'s_audittype':'n'}}`, false, false)
+	}
+}
+
 //登录
 func (m *Member) Login() {
 	var status string = "n"
@@ -432,42 +441,36 @@ func (m *Member) Login() {
 	if s_pwd != "" {              //密码为空不可登录
 		var loginType string            //登录类型
 		s_name := m.GetString("s_name") //用户名
-		r := *FindOne("user", M{"$or": []M{M{"s_name": s_name}, M{"s_phone": s_name}, M{"s_email": s_name}}})
-		if r == nil || len(r) == 0 {
+		r := FindOne("user", M{"$or": []M{M{"s_name": s_name}, M{"s_phone": s_name}, M{"s_email": s_name}}})
+		if r == nil || len(*r) == 0 {
 			info = "s_error" //用户不存在
 		} else {
-			if s_name == r["s_name"].(string) {
+			if s_name == (*r)["s_name"].(string) {
 				loginType = "s_name"
-			} else if r["s_phone"] != nil && s_name == r["s_phone"].(string) {
+			} else if (*r)["s_phone"] != nil && s_name == (*r)["s_phone"].(string) {
 				loginType = "s_phone" //手机登录
-			} else if r["s_email"] != nil && s_name == r["s_email"].(string) {
+			} else if (*r)["s_email"] != nil && s_name == (*r)["s_email"].(string) {
 				loginType = "s_email" //邮箱登录
 			}
-			if GetMd5String(s_pwd) != r["s_pwd"] {
+			if GetMd5String(s_pwd) != (*r)["s_pwd"] {
 				info = "p_error" //密码错误
 			} else {
 				//获取绑定企业信息
-				if r["s_enterpriseid"] != nil && r["s_enterpriseid"].(string) != "" {
-					code = r["s_enterpriseid"].(string)
+				if (*r)["s_enterpriseid"] != nil && (*r)["s_enterpriseid"].(string) != "" {
+					code = (*r)["s_enterpriseid"].(string)
 					//enter := *FindOne("enterprise", `M{"_id":"`+r["s_enterpriseid"].(string)+`"}`)
-					enter := *FindById("enterprise", r["s_enterpriseid"].(string), nil)
+					enter := *FindById("enterprise", (*r)["s_enterpriseid"].(string), nil)
 					if enter != nil && enter["OpLocDistrict"] != nil {
-						r["opLocDistrict"] = enter["OpLocDistrict"]
+						(*r)["opLocDistrict"] = enter["OpLocDistrict"]
 					}
 				}
-				status = strconv.Itoa(r["i_type"].(int)) //用户类型
-				freeze = fmt.Sprint(r["i_freeze"])       //冻结状态
+				status = strconv.Itoa((*r)["i_type"].(int)) //用户类型
+				freeze = fmt.Sprint((*r)["i_freeze"])       //冻结状态
 				if freeze != "2" {
 					//更新session、cookie
-					UpdateCookieSession(m.Action, loginType, m.GetString("rememberMe") == "y", r)
-				}
-				stype := m.GetSession("audittype")
-				r_id := strings.Split(fmt.Sprintf("%s", r["_id"]), `"`)[1]
-				if stype == "y" {
-					Update("user", &map[string]interface{}{
-						"_id": ObjectIdHex(r_id),
-					}, `{'$set':{'s_audittype':'n'}}`, false, false)
+					UpdateCookieSession(m.Action, loginType, m.GetString("rememberMe") == "y", *r)
 				}
+				updateAudittype(m.Action, r)
 			}
 		}
 	} else {

core/src/qfw/member/yellowpage.go

@@ -461,7 +461,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

@@ -22,11 +22,11 @@ func init() {
 }
 
 func (m *Mobile) Guide() error {
-	m.T["signature"] = getSignature(m.Url())
+	m.T["signature"] = GetSignature(m.Url())
 	return m.Render("/swordfish/wxindex.html", &m.T)
 }
 func (m *Mobile) Share() error {
-	m.T["signature"] = getSignature(m.Url())
+	m.T["signature"] = GetSignature(m.Url())
 	return m.Render("/swordfish/wxshare.html", &m.T)
 }
 
@@ -44,12 +44,11 @@ func (m *Mobile) Wxrssset() error {
 			}
 		}
 	}()
-	userId := m.Session().Get("userId")
-	if userId != nil {
-		m.T["signature"] = getSignature(m.Url())
-		userInfo := mongodb.FindById("user", userId.(string), nil)
+	if m.Session().Get("userId") != nil {
+		m.T["signature"] = GetSignature(m.Url())
+		userInfo := mongodb.FindById("user", m.GetSession("userId").(string), nil)
 		if i_m_guide := (*userInfo)["i_m_guide"]; util.IntAll(i_m_guide) == 0 {
-			mongodb.Update("user", `{"_id":"`+userId.(string)+`"}`, map[string]interface{}{
+			mongodb.Update("user", `{"_id":"`+m.GetSession("userId").(string)+`"}`, map[string]interface{}{
 				"$set": map[string]interface{}{
 					"i_m_guide": 1,
 				},
@@ -233,7 +232,7 @@ func (m *Mobile) WxpushList(s_m_openid string, _id string, msgid string) error {
 	**/
 	m.T["data"] = *mongodb.FindById("wxpush", _id, `{"s_content":1,"s_words":1,"a_visitedindex":1,"a_publishtime":1,"s_type":1}`)
 	m.T["_id"] = _id
-	m.T["signature"] = getSignature(m.Url())
+	m.T["signature"] = GetSignature(m.Url())
 	return m.Render("/swordfish/wxpush.html", &m.T)
 }
 
@@ -244,7 +243,7 @@ func (m *Mobile) WxpushAjaxReq() error {
 	}, false, false)
 	return nil
 }
-func getSignature(action string) []string {
+func GetSignature(action string) []string {
 	url := coreconfig.SysConfig.DomainName + action
 	var signature []string
 	if ret := redis.Get("other", "wxshare-"+url); ret != nil {

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

@@ -953,28 +953,6 @@ a{
 	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;

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

@@ -469,4 +469,67 @@ a:focus, a:hover{
 .a-index-head .a-i-h-middle > ul > li {
 	background-color:#fff;
 	margin-bottom:0px;
-}
+}
+/*******找回密码********/
+.fw-new-content{
+	background-image:url('/images/u0111.png');
+	background-repeat: no-repeat;
+    background-position: 0px 5px;
+	
+}
+.fw-new-content .fw-new-title{
+	font-size: 24px;
+	color: #4E5051; 
+	padding-top:37px;
+}
+.fw-new-content .ufwimg{
+	width:437px;
+}
+.fw-new-content #step{
+	padding-top:10px;
+	margin-bottom:50px;
+}
+.fw-new-content .row .qrzh span{
+    font-weight: 700;
+    font-size: 14px;
+    color: #FF5A5F;
+	padding-left:50px;
+}
+.fw-new-content .row .aqyz span{
+    font-size: 14px;
+    color: #A0A0A0;
+	padding-left:10px;
+}
+.fw-new-content .row .czmm span{
+    font-size: 14px;
+    color: #A0A0A0;
+	padding-right:15px;
+}
+.fw-new-content .fwtb1{
+	margin-bottom:20px;
+}
+.fw-new-content .qfw-btn {
+    width: 238px;
+	height:34px;
+}
+.fw-new-content .subbtn{
+	margin-top:60px;
+}
+.fwbody{
+	background-color:#F0F0F0;
+}
+.fw-new-content .member-panel{
+	background-color:#fff;
+	display:inline-block;
+	margin-top: 37px; 
+	border:1px solid #ccc;
+	width:740px;
+	height:500px;
+	box-shadow: #aaa 0px 0px 5px;
+}
+.fw-new-content .fw-new-zh span,.fw-new-content .fw-new-yzm span{
+	float:right;margin:10px -5px 0px 0px;
+}
+.fw-new-content .afterSendIdentCode{
+	
+}

core/src/web/staticres/js/active/Rotate.js

@@ -0,0 +1,313 @@
+// VERSION: 2.2 LAST UPDATE: 13.03.2012
+/* 
+ * Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+ * 
+ * Made by Wilq32, wilq32@gmail.com, Wroclaw, Poland, 01.2009
+ * Website: http://code.google.com/p/jqueryrotate/ 
+ */
+
+// Documentation removed from script file (was kinda useless and outdated)
+
+(function($) {
+var supportedCSS,styles=document.getElementsByTagName("head")[0].style,toCheck="transformProperty WebkitTransform OTransform msTransform MozTransform".split(" ");
+for (var a=0;a<toCheck.length;a++) if (styles[toCheck[a]] !== undefined) supportedCSS = toCheck[a];
+// Bad eval to preven google closure to remove it from code o_O
+// After compresion replace it back to var IE = 'v' == '\v'
+var IE = eval('"v"=="\v"');
+
+jQuery.fn.extend({
+    rotate:function(parameters)
+    {
+        if (this.length===0||typeof parameters=="undefined") return;
+            if (typeof parameters=="number") parameters={angle:parameters};
+        var returned=[];
+        for (var i=0,i0=this.length;i<i0;i++)
+            {
+                var element=this.get(i);	
+                if (!element.Wilq32 || !element.Wilq32.PhotoEffect) {
+
+                    var paramClone = $.extend(true, {}, parameters); 
+                    var newRotObject = new Wilq32.PhotoEffect(element,paramClone)._rootObj;
+
+                    returned.push($(newRotObject));
+                }
+                else {
+                    element.Wilq32.PhotoEffect._handleRotation(parameters);
+                }
+            }
+            return returned;
+    },
+    getRotateAngle: function(){
+        var ret = [];
+        for (var i=0,i0=this.length;i<i0;i++)
+            {
+                var element=this.get(i);	
+                if (element.Wilq32 && element.Wilq32.PhotoEffect) {
+                    ret[i] = element.Wilq32.PhotoEffect._angle;
+                }
+            }
+            return ret;
+    },
+    stopRotate: function(){
+        for (var i=0,i0=this.length;i<i0;i++)
+            {
+                var element=this.get(i);	
+                if (element.Wilq32 && element.Wilq32.PhotoEffect) {
+                    clearTimeout(element.Wilq32.PhotoEffect._timer);
+                }
+            }
+    }
+});
+
+// Library agnostic interface
+
+Wilq32=window.Wilq32||{};
+Wilq32.PhotoEffect=(function(){
+
+	if (supportedCSS) {
+		return function(img,parameters){
+			img.Wilq32 = {
+				PhotoEffect: this
+			};
+            
+            this._img = this._rootObj = this._eventObj = img;
+            this._handleRotation(parameters);
+		}
+	} else {
+		return function(img,parameters) {
+			// Make sure that class and id are also copied - just in case you would like to refeer to an newly created object
+            this._img = img;
+
+			this._rootObj=document.createElement('span');
+			this._rootObj.style.display="inline-block";
+			this._rootObj.Wilq32 = 
+				{
+					PhotoEffect: this
+				};
+			img.parentNode.insertBefore(this._rootObj,img);
+			
+			if (img.complete) {
+				this._Loader(parameters);
+			} else {
+				var self=this;
+				// TODO: Remove jQuery dependency
+				jQuery(this._img).bind("load", function()
+				{
+					self._Loader(parameters);
+				});
+			}
+		}
+	}
+})();
+
+Wilq32.PhotoEffect.prototype={
+    _setupParameters : function (parameters){
+		this._parameters = this._parameters || {};
+        if (typeof this._angle !== "number") this._angle = 0 ;
+        if (typeof parameters.angle==="number") this._angle = parameters.angle;
+        this._parameters.animateTo = (typeof parameters.animateTo==="number") ? (parameters.animateTo) : (this._angle); 
+
+        this._parameters.step = parameters.step || this._parameters.step || null;
+		this._parameters.easing = parameters.easing || this._parameters.easing || function (x, t, b, c, d) { return -c * ((t=t/d-1)*t*t*t - 1) + b; }
+		this._parameters.duration = parameters.duration || this._parameters.duration || 1000;
+        this._parameters.callback = parameters.callback || this._parameters.callback || function(){};
+        if (parameters.bind && parameters.bind != this._parameters.bind) this._BindEvents(parameters.bind); 
+	},
+	_handleRotation : function(parameters){
+          this._setupParameters(parameters);
+          if (this._angle==this._parameters.animateTo) {
+              this._rotate(this._angle);
+          }
+          else { 
+              this._animateStart();          
+          }
+	},
+
+	_BindEvents:function(events){
+		if (events && this._eventObj) 
+		{
+            // Unbinding previous Events
+            if (this._parameters.bind){
+                var oldEvents = this._parameters.bind;
+                for (var a in oldEvents) if (oldEvents.hasOwnProperty(a)) 
+                        // TODO: Remove jQuery dependency
+                        jQuery(this._eventObj).unbind(a,oldEvents[a]);
+            }
+
+            this._parameters.bind = events;
+			for (var a in events) if (events.hasOwnProperty(a)) 
+				// TODO: Remove jQuery dependency
+					jQuery(this._eventObj).bind(a,events[a]);
+		}
+	},
+
+	_Loader:(function()
+	{
+		if (IE)
+		return function(parameters)
+		{
+			var width=this._img.width;
+			var height=this._img.height;
+			this._img.parentNode.removeChild(this._img);
+							
+			this._vimage = this.createVMLNode('image');
+			this._vimage.src=this._img.src;
+			this._vimage.style.height=height+"px";
+			this._vimage.style.width=width+"px";
+			this._vimage.style.position="absolute"; // FIXES IE PROBLEM - its only rendered if its on absolute position!
+			this._vimage.style.top = "0px";
+			this._vimage.style.left = "0px";
+
+			/* Group minifying a small 1px precision problem when rotating object */
+			this._container =  this.createVMLNode('group');
+			this._container.style.width=width;
+			this._container.style.height=height;
+			this._container.style.position="absolute";
+			this._container.setAttribute('coordsize',width-1+','+(height-1)); // This -1, -1 trying to fix ugly problem with small displacement on IE
+			this._container.appendChild(this._vimage);
+			
+			this._rootObj.appendChild(this._container);
+			this._rootObj.style.position="relative"; // FIXES IE PROBLEM
+			this._rootObj.style.width=width+"px";
+			this._rootObj.style.height=height+"px";
+			this._rootObj.setAttribute('id',this._img.getAttribute('id'));
+			this._rootObj.className=this._img.className;			
+		    this._eventObj = this._rootObj;	
+		    this._handleRotation(parameters);	
+		}
+		else
+		return function (parameters)
+		{
+			this._rootObj.setAttribute('id',this._img.getAttribute('id'));
+			this._rootObj.className=this._img.className;
+			
+			this._width=this._img.width;
+			this._height=this._img.height;
+			this._widthHalf=this._width/2; // used for optimisation
+			this._heightHalf=this._height/2;// used for optimisation
+			
+			var _widthMax=Math.sqrt((this._height)*(this._height) + (this._width) * (this._width));
+
+			this._widthAdd = _widthMax - this._width;
+			this._heightAdd = _widthMax - this._height;	// widthMax because maxWidth=maxHeight
+			this._widthAddHalf=this._widthAdd/2; // used for optimisation
+			this._heightAddHalf=this._heightAdd/2;// used for optimisation
+			
+			this._img.parentNode.removeChild(this._img);	
+			
+			this._aspectW = ((parseInt(this._img.style.width,10)) || this._width)/this._img.width;
+			this._aspectH = ((parseInt(this._img.style.height,10)) || this._height)/this._img.height;
+			
+			this._canvas=document.createElement('canvas');
+			this._canvas.setAttribute('width',this._width);
+			this._canvas.style.position="relative";
+			this._canvas.style.left = -this._widthAddHalf + "px";
+			this._canvas.style.top = -this._heightAddHalf + "px";
+			this._canvas.Wilq32 = this._rootObj.Wilq32;
+			
+			this._rootObj.appendChild(this._canvas);
+			this._rootObj.style.width=this._width+"px";
+			this._rootObj.style.height=this._height+"px";
+            this._eventObj = this._canvas;
+			
+			this._cnv=this._canvas.getContext('2d');
+            this._handleRotation(parameters);
+		}
+	})(),
+
+	_animateStart:function()
+	{	
+		if (this._timer) {
+			clearTimeout(this._timer);
+		}
+		this._animateStartTime = +new Date;
+		this._animateStartAngle = this._angle;
+		this._animate();
+	},
+    _animate:function()
+    {
+         var actualTime = +new Date;
+         var checkEnd = actualTime - this._animateStartTime > this._parameters.duration;
+
+         // TODO: Bug for animatedGif for static rotation ? (to test)
+         if (checkEnd && !this._parameters.animatedGif) 
+         {
+             clearTimeout(this._timer);
+         }
+         else 
+         {
+             if (this._canvas||this._vimage||this._img) {
+                 var angle = this._parameters.easing(0, actualTime - this._animateStartTime, this._animateStartAngle, this._parameters.animateTo - this._animateStartAngle, this._parameters.duration);
+                 this._rotate((~~(angle*10))/10);
+             }
+             if (this._parameters.step) {
+                this._parameters.step(this._angle);
+             }
+             var self = this;
+             this._timer = setTimeout(function()
+                     {
+                     self._animate.call(self);
+                     }, 10);
+         }
+
+         // To fix Bug that prevents using recursive function in callback I moved this function to back
+         if (this._parameters.callback && checkEnd){
+             this._angle = this._parameters.animateTo;
+             this._rotate(this._angle);
+             this._parameters.callback.call(this._rootObj);
+         }
+     },
+
+	_rotate : (function()
+	{
+		var rad = Math.PI/180;
+		if (IE)
+		return function(angle)
+		{
+            this._angle = angle;
+			this._container.style.rotation=(angle%360)+"deg";
+		}
+		else if (supportedCSS)
+		return function(angle){
+            this._angle = angle;
+			this._img.style[supportedCSS]="rotate("+(angle%360)+"deg)";
+		}
+		else 
+		return function(angle)
+		{
+            this._angle = angle;
+			angle=(angle%360)* rad;
+			// clear canvas	
+			this._canvas.width = this._width+this._widthAdd;
+			this._canvas.height = this._height+this._heightAdd;
+						
+			// REMEMBER: all drawings are read from backwards.. so first function is translate, then rotate, then translate, translate..
+			this._cnv.translate(this._widthAddHalf,this._heightAddHalf);	// at least center image on screen
+			this._cnv.translate(this._widthHalf,this._heightHalf);			// we move image back to its orginal 
+			this._cnv.rotate(angle);										// rotate image
+			this._cnv.translate(-this._widthHalf,-this._heightHalf);		// move image to its center, so we can rotate around its center
+			this._cnv.scale(this._aspectW,this._aspectH); // SCALE - if needed ;)
+			this._cnv.drawImage(this._img, 0, 0);							// First - we draw image
+		}
+
+	})()
+}
+
+if (IE)
+{
+Wilq32.PhotoEffect.prototype.createVMLNode=(function(){
+document.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
+		try {
+			!document.namespaces.rvml && document.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
+			return function (tagName) {
+				return document.createElement('<rvml:' + tagName + ' class="rvml">');
+			};
+		} catch (e) {
+			return function (tagName) {
+				return document.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
+			};
+		}		
+})();
+}
+
+})(jQuery);

core/src/web/staticres/js/active/json.js

@@ -0,0 +1 @@
+{"isHasChance":"true","rotate":290,"results":"这你也信，被骗了吧!!"}

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

@@ -1,5 +1,4 @@
-//是否有新活动
-var hasNewActive = false;
+var hasNewActive = new Date() >= Date.parse(new Date("2015/12/14 00:00:00")) && new Date() < Date.parse(new Date("2016/2/1 00:00:00"));
 //网站初始化状态
 var webSiteInitFlag = true;
 //登录状态 false--未登录，true--已登录
@@ -222,6 +221,7 @@ var SendIdentCode = {
 		var childNode = parentNode.children("div");
 		if(c == -1){
 			thisClass.flag = true;
+			$(obj).attr("disabled","disabled");
 			childNode.addClass("text-primary").html('抱歉，您今天发送的验证码次数已超限制，请明天再来。');
 			return;
 		}
@@ -230,6 +230,8 @@ var SendIdentCode = {
 			checkCodeObj.attr("disabled","disabled");
 		}
 		$(obj).addClass("text-muted").removeClass("cursor-pointer").text("已发送");
+		$(obj).css("background-color","ccc");
+		$(obj).css("border","1px solid #ccc");
 		var count = 59;
 		childNode.removeClass("text-primary").text("校验码已通过"+sendType+"发出,如果没有收到,您可在"+count--+"秒后重新发送");
 		var intgerval = setInterval(function (){
@@ -241,6 +243,9 @@ var SendIdentCode = {
 				$(obj).text("获取"+sendType+"验证码");
 				parentNode.hide();
 				clearInterval(intgerval);
+				$(obj).css("background-color","FF5A5F");
+				$(obj).css("border","1px solid #FF5A5F");
+				$(obj).css("color","ffffff");
 			}else{
 				childNode.removeClass("text-primary").text("校验码已通过"+sendType+"发出,如果没有收到,您可在"+count--+"秒后重新发送");
 			}

core/src/web/staticres/wxswordfish/share.js

@@ -10,7 +10,7 @@ function initShare(signature){
 		});
 		wx.ready(function () {
 	        wx.onMenuShareTimeline({
-			    title: '剑鱼-招标订阅，招标信息早知道！', // 分享标题
+			    title: '剑鱼招标订阅免费用，关注即可抽取iPadmini。', // 分享标题
 			    link: 'http://www.qimingxing.info/swordfish/share', // 分享链接
 			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/share-icon.png', // 分享图标
 			    success: function () { 
@@ -22,7 +22,7 @@ function initShare(signature){
 			});
 			
 			wx.onMenuShareAppMessage({
-			    title: '剑鱼-招标订阅，招标信息早知道！', // 分享标题
+			    title: '剑鱼招标订阅免费用，关注即可抽取iPadmini。', // 分享标题
 			    desc: '关注微信并设置剑鱼关键词，全国招标信息统统推送给您！', // 分享描述
 			    link: 'http://www.qimingxing.info/swordfish/share', // 分享链接
 			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/share-icon.png', // 分享图标

core/src/web/templates/active/luckdraw.html

@@ -0,0 +1,109 @@
+
+<!DOCTYPE>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>企明星新年大抽奖</title>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
+<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
+<meta name="renderer" content="webkit">
+<link href="/css/bootstrap.min.css" rel="stylesheet">
+<script src="/js/jquery.js"></script>
+<script src="/js/active/Rotate.js"></script>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="/wxswordfish/share.js"></script>
+<script src="/js/bootstrap.min.js"></script>
+<script>
+	initShare({{.T.signature}});
+</script>
+<style>
+*{padding:0; margin:0;}
+.lotteryMain{ width:100%;}
+.lotteryBg{ width:100%; height:603px; margin:0 auto; background:url(/images/activeimages/lotteryBg.jpg) no-repeat center center; position:relative; overflow:hidden;background-size: 375px 603px;}
+#run{ width:145px; height:145px; position:absolute; left:50%; top:50%;  margin-left:-73px; margin-top:-53px; z-index:1; transform:rotate(0deg); -ms-transform:rotate(0deg); }
+#btn_run{ width:80px; height:80px; background:url(/images/activeimages/btn_start.png) no-repeat; border:none; outline:none; position:absolute; left:50%; top:50%; margin-left:-40px; margin-top:-22px; z-index:2;cursor:pointer;background-position:0px 0px;background-size: 100% 100%;}
+</style>
+</head>
+
+<body  style="background-color:#FA417C;">
+<button class="btn btn-primary btn-lg modstart hidden" data-toggle="modal" 
+   data-target="#myModal">
+   开始
+</button>
+<!-- 模态框（Modal） -->
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
+   aria-labelledby="myModalLabel" aria-hidden="true" style="margin-top: 25%;
+">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <div class="modal-body">
+            
+         </div>
+         <div class="modal-footer">
+            <button type="button" class="btn btn-primary" 
+               data-dismiss="modal">关闭
+            </button>
+         </div>
+      </div><!-- /.modal-content -->
+</div><!-- /.modal -->
+</div>
+<section class="lotteryMain">
+	<div class="lotteryBg">
+    	<img id="run" src="/images/activeimages/start.png" />
+        <input id="btn_run" type="button" value="" />
+    </div>
+</section>  
+<script>
+
+$(function(){ 
+    var flog = {{.T.flog}};
+	if (flog == "A"){
+		$(".modal-body").html("小主莫贪心，每人只有一次抽奖机会呦！<br/><br/>小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）")
+		$(".modstart").click();
+		$("#btn_run").attr('disabled',true).css("cursor","pointer");
+	}
+     $("#btn_run").click(function(){
+		$("#btn_run").attr('disabled',true).css("cursor","default"); 
+        lottery(); 
+    });
+	
+}); 
+function lottery(){ 
+    $.ajax({ 
+        type: 'post', 
+        url: '/activity/luckdraw', 
+        dataType: 'json', 
+        cache: false, 
+        error: function(){return false;}, 
+        success:function(obj){
+			if (obj.flog == "T"){
+				$("#run").rotate({ 
+					duration:5000, //转动时间 
+					angle: 0, //默认角度
+					animateTo:360*3+obj.rotate, //转动角度 
+					easing: $.easing.easeOutSine, 
+					callback: function(){ 
+						//alert(obj.results); 
+						$("#btn_run").attr('disabled',true).css("cursor","pointer"); 
+						if (obj.prize == "谢谢参与"){
+							$(".modal-body").html("小主不要桑心，这次没有中奖不代表什么，猴年依然会好运气爆棚滴~~<br/><br/>小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）")
+							$(".modstart").click();
+						}else{
+							$(".modal-body").html("小主是真真的好运气，"+obj.prize+"落入您囊中，请速速微信联系企明星确认领奖事宜!<br/><br/>小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）")
+							$(".modstart").click();
+						}
+					} 
+				});
+			}else if (obj.flog=="A"){
+				$(".modal-body").html("小主莫贪心，每人只有一次抽奖机会呦！<br/><br/>小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）")
+				$(".modstart").click();
+			}else if (obj.flog=="F"){
+				$(".modal-body").html("小主来晚了，抽奖活动已过期！如果有疑问请联系企明星！")
+				$(".modstart").click();
+			}
+        } 
+    }); 
+};
+</script>  
+</body>
+</html>

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

@@ -8,34 +8,15 @@
 	padding-left: 0px;
 }
 .loginModal {
-	width: 490px;
+	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,23 +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{
-	display:none;
-	padding:0 30px;
-	height:275px;
+	width: 130px;
+	height: 40px;
 }
 </style>
 <script src="/js/validform-min.js"></script>
@@ -139,20 +96,10 @@ 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
@@ -161,14 +108,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;
@@ -217,7 +162,7 @@ $(function (){
 			}else{
 				//注册页面登录之后
 				$("#loginStatus").trigger("login");
-				afterLoginSkip(data);
+				afterLoginSkip(data,true);
 			}
 			//
 			if($("#loginModal [name='rememberMe']").is(':checked')==true){
@@ -242,152 +187,128 @@ $(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-dialog loginModal">
+<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">
+    	<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>
-			<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>
+	      	<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="modal-body f-logintip1" style="display:none;padding: 20px 10px 20px 10px;">
+			 	<div style='margin-bottom:20px;'>
+					<div>
 						<div class="u-tipsok">
-								<h3>
-									<div class="f-username" style="float:left;"></div>
-									<div style="float:left;">恭喜你注册成功！</div>
-								</h3>
-							</div>
-						</div>
-						<div class="u-guide" style="margin-top:20px;"></div>
-						<div class="m-logintip">
-							<ul> 
-								<li>
-									●&nbsp;&nbsp;验证企业身份<a href="/member/accountset/index" class="btn btn-primary" style="width:82px;margin-left:5px;">认证</a>
-								</li>
-								<li>
-									●“剑鱼”向企业推送富有价值的信息情报等，去体验<a href="/front/swordfish" class="btn btn-primary" style="width:82px;margin-left:13px;">剑鱼</a>
-								</li>
-							</ul>
+							<h3>
+								<div class="f-username" style="float:left;"></div>
+								<div style="float:left;">恭喜你注册成功！</div>
+							</h3>
 						</div>
-						
 					</div>
+					<div class="u-guide" style="margin-top:20px;"></div>
+					<div class="m-logintip">
+						<ul> 
+							<li>
+								●&nbsp;&nbsp;验证企业身份<a href="/member/accountset/index" class="btn btn-primary" style="width:82px;margin-left:5px;">认证</a>
+							</li>
+							<li>
+								●“剑鱼”向企业推送富有价值的信息情报等，去体验<a href="/front/swordfish" class="btn btn-primary" style="width:82px;margin-left:13px;">剑鱼</a>
+							</li>
+						</ul>
+					</div>
+				</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 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>
+						<img alt="加载中.." style="width:124px;height:127px;margin:20px;" id="wxPic" class="border">
+						<div class="text-muted" style="line-height: 22px;margin-top:5px;font-family: '宋体 Regular', 宋体;font-size: 12px;color: rgb(160, 160, 160);">使用微信扫描登录<br/>新用户自动注册</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="login wxlogin hidden-xs">
-			<img alt="加载中.." style="width:250px;height:250px;" id="wxPic" class="border">
-			<div class="text-muted" style="margin-top:5px;">请使用微信扫描登录<br/>新用户扫码确认后会自动完成注册</div>
-		</div>
-		<div class="login otherlogin">
-			<form class="form-horizontal loginForm" method="post">
-		  	<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;下次自动登录
-			  	<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="width: 100%;font-weight: bold;">登<span class="margin-lr-30"></span>录</button>
-		  	</div>
-		</form>
-		</div>
-	</div>
+					<div class="login col-md-7" style="border-left:1px solid #F0F0F0;">
+						<form class="form-horizontal loginForm" method="post" style="width:220px;margin-left: 40px;">
+						  	<div class="text-muted" style="margin-top:5px;font-weight: 700;color:#000;font-size: 14px;">邮箱/手机登录</div>
+							<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="邮箱/手机号格式错误">
+						  	</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="请填写密码">
+						  	</div>
+						  	<div class="form-group margin-t-20 font-size-12">
+								<!--<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%;">登录</button>
+						  	</div>
+						</form>
+					</div>
+				</div>
+			</div>
 		</div>
- </div>
+ 	</div>
 </div>

core/src/web/templates/index.html

@@ -6,6 +6,8 @@
 <meta name="Keywords" content="{{Msg "seo" "qfw.homepage.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
 <link href="/css/index-new.css" rel="stylesheet">
+<script src="/js/jquery.lazyload.min.js"></script>
+
 </head>
 <body>
 {{include "/common/indexhead.html"}}
@@ -15,7 +17,7 @@
 			<div class="text-center">全部服务分类</div>
 			<ul id="one-levelClassify">
 			{{range $k, $v := .T.serviceClassify}}
-				<li data-code="{{$v.code}}"><img id="index-new-qztb" src="/images/{{$v.image}}" onerror="this.src='/images/u166.png'"> {{$v.name}}<img class="index-new-zb hide" src="/images/u0107.png"/></li>
+				<li data-code="{{$v.code}}"><img class="lazy" data-original="/images/{{$v.image}}" id="index-new-qztb" onerror="this.src='/images/u166.png'"> {{$v.name}}<img  data-original='/images/u0107.png' class="lazy index-new-zb hide" /></li>
 			{{end}}
 			</ul>
 		</div>
@@ -32,7 +34,7 @@
 					{{range $k,$v := $s}}
 					 <div class="item{{if eq $k 0}} active{{end}}">
 					{{if $v.s_link}}<a href="{{$v.s_link}}">{{end}}
-				         <img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} class="img-responsive" src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'">
+				         <img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}   src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" class="img-responsive"   onerror="this.src='/images/u166.png'">
 					{{if $v.s_link}}</a>{{end}}
 					</div>
 					{{end}}
@@ -57,27 +59,27 @@
 				<li class="a-com-title hidden-xs"><b>我要</b></li>
 				<li class="font-size-12 a-com-last" id="iWant">
 					<div>
-						<img src="/images/zcgs.png">
+						<img  data-original="/images/zcgs.png" class="lazy" >
 						<br><a href="/market/010101/list.html">注册新公司</a>
 					</div>
 					<div class="a-com-two">
-						<img src="/images/djz.png">
+						<img  data-original="/images/djz.png" class="lazy" >
 						<br><a href="/market/010201/list.html">找人代记账</a>
 					</div>
 					<div>
-						<img src="/images/rz.png">
+						<img  data-original="/images/rz.png" class="lazy" >
 						<br><a href="/market/020101/list.html">快速融资</a>
 					</div>
 					<div class="a-com-four">
-						<img src="/images/sbzl.png">
+						<img  data-original="/images/sbzl.png" class="lazy" >
 						<br><a href="/market/050201/list.html">注册商标/专利</a>
 					</div>
 					<div class="a-com-five hidden-xs">
-						<img src="/images/flyz.png">
+						<img  data-original="/images/flyz.png" class="lazy" >
 						<br><a href="/market/050101/list.html">寻找法律援助</a>
 					</div>
 					<div class="a-com-six hidden-xs">
-						<img src="/images/wdzx.png">
+						<img  data-original="/images/wdzx.png" class="lazy" >
 						<br><a href="/market/030301/list.html">网店装修</a>
 					</div>
 				</li>
@@ -90,7 +92,7 @@
 	<div class="a-transverse-advert hidden-xs">
 	{{$s:=(Ad "index-center-09" 1)}}
 	{{range $k,$v := $s}}
-		<a{{if $v.s_link}} href="{{$v.s_link}}"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}{{if $v.s_pic}} src="{{$v.s_pic}}"{{end}}></a>
+		<a{{if $v.s_link}} href="{{$v.s_link}}"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}></a>
 	{{end}}
 	</div>
 	-->
@@ -119,7 +121,7 @@
 			{{range $k,$v := $s}}
 			<div class="index-new-rmxq-listcon" style="{{if gt $k 0}} border-left:1px solid #E5E6E9; {{end}}"  data-id="{{$v.s_id}}">
 			<a target="_blank"  href="{{$v.s_link}}"></a>
-			<div class="index-new-rmxq-listimg text-center"><a target="_blank" href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'"></a></div>
+			<div class="index-new-rmxq-listimg text-center"><a target="_blank" href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"   onerror="this.src='/images/u166.png'"></a></div>
 			<div class="text-center index-new-rmxq-remark"><span><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></span></div>
 			<div class="index-new-rmxq-listtype text-center"><span><a class="a-com-servcename">{{$v.o_extend.type}}</a></span></div>
 			<div class="index-new-rmxq-listas text-center "><span><a class="a-com-last" ></a></span></div>
@@ -132,7 +134,7 @@
 	<div class="a-transverse-advert hidden-xs">
 	{{$s:=(Ad "index-center-10" 1)}}
 	{{range $k,$v := $s}}
-		<a target="_blank" {{if $v.s_link}} href="{{$v.s_link}}"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}{{if $v.s_pic}} src="{{$v.s_pic}}"{{end}}></a>
+		<a target="_blank" {{if $v.s_link}} href="{{$v.s_link}}"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}{{if $v.s_pic}} data-original="{{$v.s_pic}}" class="lazy" {{end}}></a>
 	{{end}}
 	</div>
 <!--
@@ -148,7 +150,7 @@
 			{{$s:=(Ad "index-center-06" 4)}}
 			{{range $k,$v := $s}}
 			<div class="index-new-qysqlist text-center"  style="{{if gt $k 0}} border-left:1px solid #E5E6E9; {{end}}">
-			<a  target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'"></a>
+			<a  target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"  onerror="this.src='/images/u166.png'"></a>
 			</div>
 			{{end}}
 		</div>
@@ -159,9 +161,9 @@
 		<font><a target="_blank" href="/front/wsite.html">微官网</a></font><br/>
 		<span>助力互联网时代，免费打造个性十足炫酷无比的微官网</span></div>
 		<div class="index-new-wgw-fgx text-center">
-		<span> <img src="/images/u4171.png"/></span>
+		<span> <img  data-original="/images/u4171.png" class="lazy" /></span>
 		<span>案例展示</span>
-		<span><img src="/images/u4171.png"/></span>
+		<span><img  data-original="/images/u4171.png" class="lazy" /></span>
 		</div>
 		<div class="row index-new-wgwcon text-center">
 			{{$s:=(Ad "index-center-07" 6)}}
@@ -189,7 +191,7 @@
  			{{range $k,$v:=.T.data}}
  			{{ if lt $k 3}}
 			<ul class="a-wrap a-com-ul-block{{if ge $k 3}} a-com-last{{end}}{{if ge $k 2}} hidden-xs{{end}}" {{if lt $k 2}} style="border-right:1px solid #ccc;padding-bottom:0px;"{{end}}>
-				<li class="index-new-first"><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html"><img  src="{{if $v.s_pic1}}{{if eq (index $v "s_pic1") ""}}{{index $v "s_pic"}}{{else}}{{index $v "s_pic1"}}{{end}}{{else}}{{index $v "s_pic"}}{{end}}"  onerror="this.src='/images/u166.png'"></a></li>
+				<li class="index-new-first"><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html"><img  data-original="{{if $v.s_pic1}}{{if eq (index $v "s_pic1") ""}}{{index $v "s_pic"}}{{else}}{{index $v "s_pic1"}}{{end}}{{else}}{{index $v "s_pic"}}{{end}}" class="lazy"   onerror="this.src='/images/u166.png'"></a></li>
 				<li class="index-new-xwzx-title"><a class="data" target="_blank" title="{{index $v "s_title"}}" href="/front/webcontent/{{index $v "_id"}}.html">{{index $v "s_shorttitle"}}</a></li>
 				<li class="index-new-xwzx-content">{{index $v "s_shortdescription"}}</li>
 				<li class="index-new-xwzx-date"><span>{{if eq (index $v "releasetime") ""}}{{index $v "l_createdate"}}{{else}}{{index $v "releasetime"}}{{end}}</span></li>
@@ -261,7 +263,8 @@ $(function(){
 	}else{
 		//活动处理
 		if(hasNewActive){
-			/*扫码送红包活动*/
+			$(".a-index-hd").append('<img src="/images/activeimages/chjhd.png" onclick="window.open(\'/front/webactivitycontent/5697403b7e1eac37d5000001.html\')" class="cursor-pointer">');
+			/*扫码送红包活动
 			$(".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){
@@ -283,7 +286,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>');
 		}
@@ -406,6 +409,9 @@ $(function(){
 	if(links!=param){
 		loginModalShow()
 	}
+	$("img.lazy").lazyload({
+     effect      : "fadeIn"
+	});
 });
 </script>
 </body>

core/src/web/templates/manage/addarticle.html

@@ -243,6 +243,7 @@ margin-top:-8px;
 		<option value="zh"> 展会 </option>
 		<option value="qtlm"> 其他栏目 </option>
 		<option value="wxlm"> 微信栏目 </option>
+		<option value="zhsk"> 知识库 </option>
 		</select>
 		</div>
 		</div>

core/src/web/templates/manage/articlelist.html

@@ -53,7 +53,7 @@ $(function(){
   ,classname:"table-hover"
   ,css:{"height":"430px"}
   //,post:{"contenttype":""}
-  ,buttons: ['<div style="margin:5px 20px 0px 30px;" class="controls pull-right"><span><a href="/manage/addarticle"><button class="btn btn-info" onclick="" type="button">添加文章</button></a></span></div><div style="width:50%;margin:5px" class="input-group pull-right" id="search"><input type="text" id="searchtext" value=""  data-original-title="Search" class="form-control" placeholder="请输入检索条件..."><span class="input-group-btn"><button class="btn btn-success" onclick="SearchContent()" data-original-title="Search" id="searchtip" type="button">检索</button></span></div><div style="margin:5px;" class="controls pull-right"><select class="form-control" id="select" ><option value=""> 请选择栏目 </option><option value="qykb"> 企业网快报 </option><option value="mtpj">媒体评价 </option><option value="hyzx">行业资讯 </option><option value="zcfg"> 政策法规 </option><option  value="zthd"> 专题活动 </option><option value="zh" > 展会 </option><option value="qtlm"> 其他栏目 </option><option value="wxlm"> 微信栏目 </option></select></div>']
+  ,buttons: ['<div style="margin:5px 20px 0px 30px;" class="controls pull-right"><span><a href="/manage/addarticle"><button class="btn btn-info" onclick="" type="button">添加文章</button></a></span></div><div style="width:50%;margin:5px" class="input-group pull-right" id="search"><input type="text" id="searchtext" value=""  data-original-title="Search" class="form-control" placeholder="请输入检索条件..."><span class="input-group-btn"><button class="btn btn-success" onclick="SearchContent()" data-original-title="Search" id="searchtip" type="button">检索</button></span></div><div style="margin:5px;" class="controls pull-right"><select class="form-control" id="select" ><option value=""> 请选择栏目 </option><option value="qykb"> 企业网快报 </option><option value="mtpj">媒体评价 </option><option value="hyzx">行业资讯 </option><option value="zcfg"> 政策法规 </option><option  value="zthd"> 专题活动 </option><option value="zh" > 展会 </option><option value="qtlm"> 其他栏目 </option><option value="wxlm"> 微信栏目 </option><option value="zhsk"> 知识库 </option></select></div>']
   , url: '/manage/articlelist/list'
   , columns: [
         {
@@ -93,6 +93,8 @@ $(function(){
 			v = "政策法规"
 			} else if(v == "wxlm") {
 			v = "微信栏目"
+			}else if(v == "zhsk") {
+			v = "知识库"
 			}
 			return v
 		}

core/src/web/templates/manage/newscontent.html

@@ -77,6 +77,9 @@ margin-top:-8px;
 	background-color:#00ffff;
 	cursor:pointer;
 }
+.index-new-image img{
+	    max-width: 850px;
+}
 </style>
 </head>
 <body>
@@ -99,7 +102,7 @@ margin-top:-8px;
 							<h4><p style="font-weight:bold; border-bottom:1px dashed #98D6DC; padding-bottom:20px;" class="text-center">{{.T.s_title}}</p></h4>
 							<div>
 							<p style="font-size:12px; margin-bottom:30px;" class="text-center">{{if eq .T.s_author ""}}发布人：{{.T.s_editorname}}{{else}}作者：{{.T.s_author}}{{end}}　　  发布日期： {{if not .T.releasetime}}{{.T.l_createdate}} {{else}}　{{.T.releasetime}}{{end}}　　 （文章来源：<a style="font-size:14px; color:#0000FF;" target="_blank"  href="{{.T.s_url}}">{{.T.s_source}}</a>）</p>                 </div>
-							<div  style="font-size:14px; line-height:25px; width:90%; margin:auto;">
+							<div class="index-new-image" style="font-size:14px; line-height:25px; width:90%; margin:auto;">
 							    {{.T.s_content}}
 								<span style="display:none;">{{.T._id}}</span>
 								</div>
@@ -255,6 +258,7 @@ margin-top:-8px;
 		<option value="zh" {{if  eq .T.s_contenttype "zh"}} selected="selected" {{end}}> 展会 </option>
 		<option value="qtlm" {{if  eq .T.s_contenttype "qtlm"}} selected="selected" {{end}}> 其他栏目 </option>
 		<option value="wxlm" {{if  eq .T.s_contenttype "wxlm"}} selected="selected" {{end}}> 微信栏目 </option>
+		<option value="zhsk" {{if  eq .T.s_contenttype "zhsk"}} selected="selected" {{end}}> 知识库 </option>
 		</select>
 		</div>
 		</div>

core/src/web/templates/manage/webactivitycontent.html

@@ -1,18 +1,44 @@
 <html>
 <head>
-<title>文章内容</title>
+<title>活动内容</title>
 {{include "/common/inc.html"}}
 <script src="/js/validform-min.js"></script>
+<link href="/css/index-new.css" rel="stylesheet">
+<style>
 
+.index-new-nva{  
+   	box-shadow: #aaa 0px 0px 10px; 
+}
+.index-new-chjhd{
+   	width:1200px;
+	margin:auto; 
+	margin-top:10px;
+	margin-bottom:10px;
+	
+}
+</style>
 </head>
 <body>
-<div style="width:90%; margin:auto;">
-{{include "/common/head.html"}}
+
+<div class="index-new-head b-head">
+	{{include "/common/login.html"}}
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			
+			<li class="pull-right b-loginStatus" id="b-loginStatus" style="z-index: 1;"></li>
+		</ul>
+	</div>
+</div>
+<div class="index-new-chjhd">{{.T.s_content}}</div>
+<div style="width:90%; margin:auto;" class="hidden">
+<!-- {{include "/common/head.html"}}-->
 <!-- 中间 -->
-<div class="row" style="width:96%; margin:0 auto; margin-top:130px;">
-		<div id="content" style="margin-left:0px;">
+<div class="row " style="width:96%; margin:0 auto;margin-top:10px;">
+		<div id="content" style="margin-left:0px;background-color: rgb(240, 240, 240);">
 			
-			<div class="container-fluid">
+			<!-- <div class="container-fluid">
 				<div style="margin-top:0px;" class="row-fluid">
 					<div class="span12">		
 						<div class="widget-box">
@@ -30,7 +56,7 @@
 				</div>
 
 			</div>
-			
+			-->
 		</div>
 
 
@@ -61,6 +87,50 @@ $(function (){
 		}
 	});
 });
+</script>
+
+<script type="text/javascript">
+//顶部是否加载完毕
+var isMobile = false;
+var keyCode=0;
+document.onkeydown=function(event){
+    var e = event || window.event || arguments.callee.caller.arguments[0];
+    if(e && e.keyCode==13){ // enter 键
+        keyCode=13
+    }
+};
+$(function (){
+	isMobile = !$("#b-loginStatus").is(":visible");
+	$("#searchFormBtn").click(function(){
+		keyCode = 13;
+		$("form#searchForm").submit();
+	});
+	$("form#searchForm").submit(function(){
+		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
+		if(input_val==""){
+			input_val = $("#header-searchInput").attr('placeholder');
+		}
+		if (keyCode==13){
+	 		if(input_val==""||input_val=="请输入关键字"){
+				keyCode=0;
+				return false;
+			}else {
+				$("input[name='words']").val(input_val);
+				keyCode=0;
+				return true;
+			}	
+		}
+	});
+	//
+	$("[id='releaseService']").click(function(){
+		if(isLogined){
+			window.location.href = "/front/reurl";
+		}else{
+			loginModalShow(6);
+		}
+	});
+});
+
 </script>
 </body>
 </html>

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

@@ -3,85 +3,123 @@
 <title>找回密码</title>
 {{include "/common/inc.html"}}
 <script src="/js/validform-min.js"></script>
+<link href="/css/index-new.css" rel="stylesheet">
 <style type="text/css">
 h5{
 	margin-top: 0px;
 	margin-bottom: 0px;
 	font-weight: bold;
 }
-#step_4 button{
-	margin-left: 120px;
+#step_4 #findpwdSuccess button{
+	background-color:#FF5A5F;
+	margin-top:100px;
+	margin-right: 66px;
+}
+#step_4 #findpwdFail button{
+	margin-top:100px;
+	margin-right: 66px;
+}
+#step_4 span{
+    font-size: 20px;
+    color: #4E5051;
 }
 .checkCodeIdValid.Validform_right{
 	display: none !important;	
 }
+.index-new-nva{  
+   box-shadow: #aaa 0px 0px 10px;  
+}
+.input-group .form-control:first-child{
+	border-radius:4px;
+}
+.fw-new-hqy{
+	padding-right:10px;
+}
+.fw-new-hqy span{
+	background-color:#FF5A5F;
+	border:1px solid #FF5A5F;
+}
+.fw-new-content .fwtb2{
+	margin-bottom:35px;
+}
+.fw-new-content .afterSendIdentCode{
+	padding:20px 0px;
+}
+.fw-new-content .afterSendIdentCode .text-muted{
+	text-align:left;
+}
 </style>
 </head>
-<body>
-<div class="container-fluid">
-	<div class="qfw-header">
-		<div>
-			<a href="/"><img alt="" src="/images/logo.png" class="header_logo"></a>
-			<img alt="" src="/images/v_line.png" class="header_line">
-			<font class="text-muted">找回密码</font>
-		</div>
-		<div class="header-ul">
-			<ul>
-				<li><a href="/">返回首页</a></li>
-				<li class="splitLine"></li>
-				<li><a href="/front/web_helpcenterlist.html">帮助中心</a></li>
-				<li class="splitLine"></li>
-				<li><a href="/front/web_feedbacklist.html">意见反馈</a></li>
-			</ul>
-		</div>
+<body class="fwbody"><!---->
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			
+		</ul>
 	</div>
-	<div class="a-line"></div>
 </div>
 <!-- 中间 -->
-<div class="a-content qfw-content">
-	<div class="qfw-content panel panel-default member-panel" style="margin-top: 30px;">
+<div class="a-content qfw-content text-center fw-new-content">
+<div class="fw-new-title">找回企明星帐号密码</div>
+	<div class="qfw-content panel panel-default member-panel ">
 		<div class="panel-body">
+				<img src="/images/ufw01.png" class="ufwimg"/>
 			<div class="row" id="step">
-				<ul class="witchStep">
-					<li class="text-muted text-primary li_active_b" style="background-image: url('/images/whiteRound.png');width: 106px;">1.确认账号</li>
-					<li class="text-muted text-primary li_active_a" style="background-image: url('/images/grayLine.png');width: 10px;"></li>
-					<li class="text-muted" style="background-image: url('/images/whiteRound.png');width: 106px;">2.安全验证</li>
-					<li class="text-muted" style="background-image: url('/images/grayLine.png');width: 10px;"></li>
-					<li class="text-muted" style="background-image: url('/images/whiteRound.png');width: 106px;">3.重置密码</li>
-				</ul>
+				<div class="col-sm-4 qrzh" ><span>确认账号</span></div>
+				<div class="col-sm-4 aqyz" ><span>安全验证</span></div>
+				<div class="col-sm-4 czmm" ><span>重置密码</span></div>
 			</div>
 			<!--第一步-->
 			<form class="form-horizontal accountForm" method="post" id="step_1">
 			<input type="hidden" value="1" name="flag">
-				<div class="row">
-					<div class="col-md-12">
-						<h5>请填写你需要找回的账号</h5><br>
+				<div class="row fwtb1">
+				
+					<div class="col-md-2">
+					</div>
+					<div class="col-md-10">
+						<h5 style="float:left;">请填写你需要找回的账号</h5><br>
 					</div>
 				</div>
 			  	<div class="form-group">
-			    <div class="col-md-4">
-			      <input type="text" name="loginName" class="form-control" onKeyUp="rePlaceSpace(this)" datatype="m|e" nullmsg="请输入邮箱/手机号" errormsg="邮箱/手机号格式错误" ajaxurl="/front/ajaxReq?oprType=accountIsExisit">
+					<div class="col-md-1">
+					</div>
+					<div class="col-md-2 fw-new-zh">
+					<span>帐　号</span>
+					</div>
+			    <div class="col-md-5">
+			      <input type="text" name="loginName" class="form-control" onKeyUp="rePlaceSpace(this)" datatype="m|e" placeholder="邮箱/手机号" nullmsg="请输入邮箱/手机号" errormsg="邮箱/手机号格式错误" ajaxurl="/front/ajaxReq?oprType=accountIsExisit">
 			    </div>
-			    <div class="col-md-8">
+			    <div class="col-md-4">
 				    <span class="Validform_checktip">请输入邮箱/手机号</span>
 			    </div>
 			  </div>
 			  	<div class="form-group">
-				    <div class="input-group col-md-4 checkCodeId">
+					<div class="col-md-1">
+					</div>
+					<div class="col-md-2 fw-new-yzm">
+					<span>验证码</span>
+					</div>
+				    <div class="input-group col-md-5 checkCodeId">
 				      	<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" onKeyUp="rePlaceUnDigital(this)" datatype="n4" nullmsg="请输入验证码" errormsg="验证码格式错误" aria-describedby="checkCodeId">
 					    <span class="input-group-addon" id="checkCodeId">
 							<img id="captcha" src="/tool/captcha" onClick="reLoadCaptcha();">
 							<a onClick="reLoadCaptcha();" class="text-primary">刷新</a>
 						</span>
 					</div>
-				   	<div class="col-md-8">
+				   	<div class="col-md-4">
 						<span class="Validform_checktip checkCodeIdValid">请输入验证码</span>
 					</div>
 				  </div>
-			    <div class="form-group">
-					<div class="col-md-4">
+			    <div class="form-group subbtn">
+					<div class="col-md-3">
+					</div>
+					<div class="col-md-5">
 					<button type="submit" class="btn btn-default qfw-btn" disabled="disabled">下一步</button>
-				 </div>
+				 	</div>
+					<div class="col-md-4">
+					</div>
 				</div>
 			</form>
 			<!--第二步安全验证-->
@@ -89,33 +127,52 @@ h5{
 				<input type="hidden" value="2" name="flag">
 				<input type="hidden" name="loginName">
 				<input type="hidden" name="loginType">
-				<div class="row">
-					<h5>为了你的帐号安全，请完成身份验证</h5><br>
+				<div class="row fwtb2">
+				
+				
+					<div class="col-md-2">
+					</div>
+					<div class="col-md-10">
+						<h5 style="float:left;">为了你的帐号安全，请完成身份验证</h5><br>
+					</div>
 				</div>
-				<div class="form-group">
-				    <label class="col-md-1 control-label"><h5><span class="userNameType"></span>验证</h5></label>
-				    <div class="col-md-11"></div>
+				<div class="form-group hidden">
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label"><h5><span class="userNameType"></span>手机号验证</h5></label>
+				    <div class="col-md-9"></div>
 				  </div>
 				<div class="form-group">
-				    <label class="col-md-1 control-label userNameType" style="font-weight: normal;"></label>
-				    <div class="col-md-4 encryUserName" style="padding-top: 7px;"></div>
-				    <div class="col-md-7"></div>
-				  </div>
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label userNameType" style="font-weight: normal;">手机号</label>
+				    <div class="col-md-3 encryUserName" style="padding-top: 7px;margin-right: -7px;"></div>
+				    <div class="col-md-2 fw-new-hqy"><span id="sendIdentCodeBtn" class="btn btn-default">获取验证码</span></div>
+				  	<div class="col-md-2"></div>
+				</div>
 				<div class="form-group">
-				    <label class="col-md-1 control-label" style="font-weight: normal;">验证码</label>
-				    <div class="input-group col-md-4 checkCodeId">
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label" style="font-weight: normal;">验证码</label>
+				    <div class="input-group col-md-5 checkCodeId">
 			      		<input type="text" name="identCode" datatype="n6" maxlength="6" onKeyUp="rePlaceUnDigital(this)" nullmsg="请输入验证码" errormsg="验证码格式错误" class="form-control" ajaxurl="/front/ajaxReq?oprType=checkIdentCode">
-						<span class="input-group-addon"><div id="sendIdentCodeBtn" class="sendIdentCodeBtn">获取验证码</div></span>
+						<span class="input-group-addon hide"><div id="sendIdentCodeBtn" class="sendIdentCodeBtn">获取验证码</div></span>
 				    </div>
-				    <div class="col-md-7"><span class="Validform_checktip">请输入验证码</span></div>
+				    <div class="col-md-4"><span class="Validform_checktip">请输入验证码</span></div>
 				</div>
 				<div class="form-group afterSendIdentCode">
-					<div class="col-md-offset-1 col-md-11 text-muted"></div>
+					<label class="col-md-2 fw-new-moreword">
+					</label>
+					<div class="col-md-10 text-muted"></div>
 				</div>
 			    <div class="form-group">
-				 <div class="col-md-offset-1 col-md-4">
-					<button type="submit" class="btn btn-default qfw-btn" disabled="disabled">下一步</button>
-				 </div>
+					<div class="col-md-3">
+					</div>
+					 <div class="col-md-5">
+						<button type="submit" class="btn btn-default qfw-btn" disabled="disabled">下一步</button>
+					 </div>
+					<div class="col-md-4">
+					</div>
 				</div>
 			</form>
 			<!--第三步-->
@@ -123,27 +180,40 @@ h5{
 				<input type="hidden" name="loginName">
 				<input type="hidden" name="loginType">
 				<input type="hidden" value="3" name="flag">
-				<div class="row" style="margin-bottom: 20px;">
-					<font class="text-muted">您正在找回的账号是：</font><span class="encryAccount encryUserName" style="font-weight: bold;"></span>
+				<div class="row" style="margin-bottom: 30px;">
+					<div class="col-md-2">
+					</div>
+					<div class="col-md-10">
+					<font class="text-muted"  style="float:left;margin-left: -17px;">您正在找回的账号是：</font><span class="encryAccount encryUserName" style="font-weight: bold;float:left;">15737190152</span>
+					</div>
 				</div>
 				<div class="form-group">
-				    <label class="col-md-1 control-label">新密码</label>
-				    <div class="col-md-4">
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label">新&nbsp;&nbsp;密&nbsp;码</label>
+				    <div class="col-md-5">
 				      <input type="password" name="s_pwd" class="form-control" onpaste="return false" datatype="ns6-14" nullmsg="请输入密码">
 				    </div>
-				    <div class="col-md-7"><span class="Validform_checktip">长度为6~14个字符的数字、字母组合，区分大小写</span></div>
+				    <div class="col-md-4"><span class="Validform_checktip">长度为6~14个字符的数字、字母组合，区分大小写</span></div>
 				  </div>
 				<div class="form-group">
-				    <label class="col-md-1 control-label">确认密码</label>
-				    <div class="col-md-4">
+					<div class="col-md-1">
+					</div>
+				    <label class="col-md-2 control-label">确认密码</label>
+				    <div class="col-md-5">
 				      <input type="password" class="form-control" onpaste="return false" recheck="s_pwd" datatype="ns6-14" nullmsg="请再次输入密码" errormsg="两次输入的密码不一致">
 				    </div>
-				    <div class="col-md-7"><span class="Validform_checktip"></span></div>
+				    <div class="col-md-4"><span class="Validform_checktip"></span></div>
 				  </div>
-				<div class="form-group">
-					<div class="col-md-offset-1 col-md-4">
+				<div class="form-group" style="margin-top:60px;">
+					<div class="col-md-3">
+					</div>
+					<div class="col-md-5">
 					<button type="submit" class="btn btn-default qfw-btn" disabled="disabled">确认</button>
-				 </div>
+				 	
+					<div class="col-md-4">
+					</div>
+				</div>
 				</div>
 			</form>
 			<!-- 第四步 -->
@@ -189,12 +259,15 @@ $(function(){
 						$("#step_2 .userNameType").text("邮箱");
 						$("#sendIdentCodeBtn").text("获取邮箱验证码");
 					}
+					$(".ufwimg").attr("src","/images/ufw0"+data.flag+".png");
 					$("[name='loginType']").val(data.result);
 					SendIdentCode.init($("#sendIdentCodeBtn"),data.loginName,null,data.count);
 					$(".witchStep li:eq(2)").addClass("text-primary li_active_b");
 					$(".witchStep li:eq(3)").addClass("text-primary li_active_a");
+					$(".fw-new-moreword").html("");
 				}else if(data.flag == 3){
 					$(".witchStep li:eq(4)").addClass("text-primary li_active_b");
+					$(".ufwimg").attr("src","/images/ufw0"+data.flag+".png")
 				}
 				var lastStepProcess = function(obj){
 					$("#"+obj).removeClass("hidden");
@@ -239,21 +312,21 @@ $(function(){
 		var name = $(this).attr("name");
 		if(name == "loginName" || name == "checkCodeId"){
 			if(validForm.eq(0).check(true) && $("#step_1").find(".Validform_wrong").length == 0){
-				$("#step_1 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled");
+				$("#step_1 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled").css("background-color","#FF5A5F");
 			}else{
-				$("#step_1 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true);
+				$("#step_1 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true).css("background-color","rgb(174, 167, 159)");
 			}
 		}else if(name == "identCode"){
 			if(validForm.eq(1).check(true) && $("#step_2").find(".Validform_wrong").length == 0){
-				$("#step_2 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled");
+				$("#step_2 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled").css("background-color","#FF5A5F");
 			}else{
-				$("#step_2 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true);
+				$("#step_2 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true).css("background-color","rgb(174, 167, 159)");
 			}
 		}else{
 			if(validForm.eq(2).check(true) && $("#step_3").find(".Validform_wrong").length == 0){
-				$("#step_3 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled");
+				$("#step_3 [type='submit']").addClass("btn-primary").removeClass("btn-default").removeAttr("disabled").css("background-color","#FF5A5F");
 			}else{
-				$("#step_3 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true);
+				$("#step_3 [type='submit']").addClass("btn-default").removeClass("btn-primary").attr("disabled",true).css("background-color","rgb(174, 167, 159)");
 			}
 		}
 		if($(this).val().length == 0){
@@ -265,5 +338,6 @@ function reLoadCaptcha(){
 	document.getElementById('captcha').src='/tool/captcha?rnd='+Math.random();
 }
 </script>
+
 </body>
 </html>

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 == ""){

weixin/src/config.json

@@ -20,14 +20,20 @@
 	"entAuthTip":"，请按向导进行操作。第1步(共2步)：请输入完整的企业名称。\n（认证过程只涉及您所在企业的公开信息。除非事先获得您的授权，企明星不会将您的个人隐私信息公开或透露给第三方机构。输入q或Q,退出认证操作。）",
 	"perAuthTip":"，请按向导进行操作。第1步(共2步)：请输入商家名称。\n（除非事先获得您的授权，企明星不会将您的个人隐私信息公开或透露给第三方机构。输入q或Q,退出认证操作。）",
 	"othAuthTip":"，请按向导进行操作。第1步(共2步)：请输入完整的组织机构名称。\n（认证过程只涉及您所在机构的公开信息。除非事先获得您的授权，企明星不会将您的个人隐私信息公开或透露给第三方机构。输入q或Q,退出认证操作。）",
-	"welcomeTip":"您已成功注册企明星！\n企明星是一个为全国企业提供专业化服务的互联网平台。\n即日起在企明星新注册的服务商家发布服务即可领取最高200元现金红包。\n请使用电脑登录网站http://www.qimingxing.info/ 点击右侧“发服务”完成以下操作即可获得红包：\n1.“实名认证”，进行企业身份认证。\n2.发布“服务信息”，让更多用户找到你。\n活动详情参看下方菜单“领取红包”。",
-	"oWelcomeTip":"您已成功注册企明星！\n企明星是一个为全国企业提供专业化服务的互联网平台。\n即日起在企明星新注册的服务商家发布服务即可领取最高200元现金红包。\n请使用电脑登录网站http://www.qimingxing.info/ 点击右侧“发服务”完成以下操作即可获得红包：\n1.“实名认证”，进行企业身份认证。\n2.发布“服务信息”，让更多用户找到你。\n活动详情参看下方菜单“领取红包”。",
-	"loginTip":"您已经成功登录企明星，请在电脑端操作。",
-	"freezeTip":"您的帐号已经冻结，请联系管理员。",
-	"messagetpl":{
-		"identifytplid":"sKn4r0or615ETYC-aI5OACPO_Q4-B8GYmgWoqcDghN4",
-		"offLinemsgtplid":"ExIeyFfoDNVJXhRDq09JbsjH_zbEJCB6gw6rxcV7atw",
-		"msgnotifytplid":"fcke7PqteAtclzHV3ScdiePH48vxaH6M5aJF0O_7by8",
-		"managernotirytplid":"dplgu5Q644vzPdqcPXY7RqgItS3eXACmU1XDl27CvTA"
-	}
+	"oWelcomeTip":"您已成功注册企明星！\n企明星是一个为全国企业提供专业化服务的互联网平台。
+",
+        "loginTip":"您已经成功登录企明星，请在电脑端操作。",
+        "freezeTip":"您的帐号已经冻结，请联系管理员。",
+        "messagetpl":{
+                "identifytplid":"oGxkPyaV42z3KWykt58Tow9mBe_ImJvi8R3ajorVWOY",
+                "offLinemsgtplid":"ExIeyFfoDNVJXhRDq09JbsjH_zbEJCB6gw6rxcV7atw",
+                "msgnotifytplid":"b7iuAMiTCIolnPhTdueKBVYThEMf2D-Bh2M_9v3J-68",
+                "managernotifytplid":"dplgu5Q644vzPdqcPXY7RqgItS3eXACmU1XDl27CvTA"
+        },
+        "activity":{
+                "activitycode":"topcj",
+                "title":"企明星新年抽奖活动进行中",
+                "picurl":"http://www.qimingxing.info/images/choujiang.png"
+        }
+
 }

weixin/src/qfw/weixin/dao/logsdao.go

@@ -45,3 +45,9 @@ func SavePayBonusLogs(openid, billno, actname string, amount int) bool {
 		return false
 	}
 }
+
+//查找指定活动的中奖记录
+func FindWinningRecord(openid, activitycode string) bool {
+	ret := mongodb.FindOne("winningrecord", M{"s_openid": openid, "s_actcode": activitycode})
+	return ret != nil && len(*ret) > 0
+}

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 {

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -4,10 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"math/rand"
 	"net"
 	"net/http"
 	"qfw/weixin/dao"
+	wf "qfw/weixinconfig"
 	"strconv"
 	"time"
 )
@@ -60,6 +62,15 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 		UserSession[r.FromUserName] = NewUserSession("robot")
 		w.ReplyText("嗨，小星来陪你解闷。有什么开心的，不开心的说说来，大伙乐呵乐呵。\n输入q或Q离开。")
 		return
+	} else if r.Content == "抽奖" { //进入抽奖环节
+		//查改用户是否已经抽过奖
+		if dao.FindWinningRecord(r.FromUserName, wf.SysConfig.Activity["activitycode"]) {
+			w.ReplyText("小主莫贪心，每人只有一次抽奖机会呦")
+		} else {
+			targeturl := fmt.Sprintf("http://%s/activity/%s/%s", wf.SysConfig.Domain, wf.SysConfig.Activity["activitycode"], se.EncodeString(r.FromUserName))
+			log.Println("choujiang url:", targeturl)
+			w.ReplyNews([]Article{Article{PicUrl: wf.SysConfig.Activity["picurl"], Title: wf.SysConfig.Activity["title"], Url: targeturl}})
+		}
 	} else {
 		//属于在线咨询，暂时直接中转到微信客服系统
 		w.Reply2CustomerService()

weixin/src/qfw/weixinconfig/weixinconfig.go

@@ -28,6 +28,7 @@ type wxconfig struct {
 	OWelcomeTip     string            `json:"oWelcomeTip"`
 	LoginTip        string            `json:"loginTip"`
 	FreezeTip       string            `json:"freezeTip"`
+	Activity        map[string]string `json:"activity"` //活动配置
 }
 
 //系统配置