Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

common/src/qfw/util/common.go

@@ -341,3 +341,18 @@ func HashCode(uid string) int {
 	}
 	return int(h)
 }
+
+//获取离n天的秒差
+func GetDayStartSecond(n int) int64 {
+	now := time.Now()
+	tom := time.Date(now.Year(), now.Month(), now.Day()+n, 0, 0, 0, 0, time.Local)
+	return tom.Unix()
+}
+
+func InterfaceArrTointArr(arr []interface{}) []int {
+	tmp := make([]int, 0)
+	for _, v := range arr {
+		tmp = append(tmp, int(v.(float64)))
+	}
+	return tmp
+}

common/src/qfw/util/credit/credit.go

@@ -3,13 +3,13 @@ package credit
 
 import (
 	"fmt"
+	"github.com/go-xweb/xweb"
 	"qfw/util"
 	mogo "qfw/util/mongodb"
 	"qfw/util/rpc"
 )
 
 var Rc rpc.RpcCall
-var Replay *int
 var CreditA map[string]uint64
 var SysConfig map[string]interface{}
 
@@ -26,22 +26,30 @@ const (
 	A_FFW    = "a10" //发服务
 	A_FXQ    = "a11" //发需求
 	A_CKGXW  = "a12" //查看关系网
-	A_FXFW   = "a13" //分享服务
+	A_FXFWXQ = "a13" //分享服务
 	A_WCJY   = "a14" //完成交易
 	A_WCJYPJ = "a15" //完成交易评价
 
-	B_QD   = "b1" //签到
-	B_FFW  = "b2" //发服务
-	B_FXQ  = "b3" //发需求
-	B_FXFW = "b4" //分享服务
-	C_JY   = "c1" //交易
-	C_PJ   = "c2" //评价
-	C_TG   = "c3" //邀请用户
+	B_QD       = "b1" //签到
+	B_QD_T     = 7    //最高连续签到次数
+	B_QYCX     = "b2" //企业查询
+	B_QYCX_T   = 5    //查询次数
+	B_FFW      = "b3" //发服务
+	B_FFW_T    = 3    //发服务次数
+	B_FXQ      = "b4" //发需求
+	B_FXQ_T    = 3    //发需求次数
+	B_FXFWXQ   = "b5" //分享服务/需求
+	B_FXFWXQ_T = 2    //分享次数
+
+	C_JY = "c1" //交易
+	C_PJ = "c2" //评价
+	C_TG = "c3" //邀请用户
 
 	D_WXCZ  = "d1" //微信充值
 	E_EWMZR = "e1" //二维码转入
-	A_JY    = "A1" //剑鱼
-	A_ZZ    = "B1" //转赠
+
+	V_JY = "A1" //剑鱼
+	V_ZZ = "B1" //转赠
 )
 
 func init() {
@@ -60,10 +68,11 @@ func InCreditA(userId, code string, credit_a int) (bool, int, error) {
 	if len(userId) < 1 {
 		return result, credit_a, nil
 	}
+	var Replay *int
 	if !AIsHasDo(code, credit_a) {
 		param := make(map[string]interface{})
 		err := Rc.InCreadit(&rpc.CreditData{Code: code, Uid: userId, Num: 0, OtherParam: param}, Replay)
-		if err == nil {
+		if err == nil && *Replay == 1 {
 			result, credit_a = UpuserCreditA(code, userId, credit_a)
 		}
 		return result, credit_a, err
@@ -77,9 +86,10 @@ func InCreditB(userId, code string) (bool, error) {
 	if len(userId) < 1 {
 		return b, nil
 	}
+	var Replay *int
 	param := make(map[string]interface{})
 	err := Rc.InCreadit(&rpc.CreditData{Code: code, Uid: userId, Num: 0, OtherParam: param}, Replay)
-	if err == nil {
+	if err == nil && *Replay == 1 {
 		b = true
 	}
 	return b, err
@@ -108,3 +118,16 @@ func AIsHasDo(code string, num int) bool {
 	}
 	return b
 }
+
+//扣积分
+func OutCreditB(userId, code string, score int, param map[string]interface{}) (b bool) {
+	if len(userId) < 5 {
+		return
+	}
+	var Replay *int
+	err := Rc.OutCreadit(&rpc.CreditData{Code: code, Uid: userId, Num: score, OtherParam: param}, Replay)
+	if err == nil && *Replay == 1 {
+		b = true
+	}
+	return
+}

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))
+}

common/src/qfw/util/rpc/credit.go

@@ -12,7 +12,8 @@ type RpcCall struct {
 
 type CreditData struct {
 	Code       string //积分代码
-	Uid        string //用户
+	Uid        string //用户ID
+	Umid       string //用户m_open_id
 	Num        int    //积分值
 	OtherParam map[string]interface{}
 }

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/coreutil/weixinrpc_test.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/rpc"
 	qrpc "qfw/util/rpc"
 	"testing"
 	"time"
@@ -101,3 +102,14 @@ func TestSay(t *testing.T) {
 func Test_GetJSInterfaceParam(t *testing.T) {
 	fmt.Println(GetJSInterfaceParam("www.baidu.com"))
 }
+
+func Test_credit(t *testing.T) {
+	client, _ := rpc.DialHTTP("tcp", "127.0.0.1:8765")
+	defer client.Close()
+	data := qrpc.CreditData{}
+	data.Code = "d1"
+	data.Uid = "55a39942af53740186000004"
+	data.Num = 3000
+	var reply int
+	client.Call("CreditRpc.InCreadit", &data, &reply)
+}

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/credit/creditdetail.go

@@ -5,21 +5,24 @@ package credit
 
 import (
 	"github.com/go-xweb/xweb"
+	. "gopkg.in/mgo.v2/bson"
 	"log"
 	"qfw/util"
 	cd "qfw/util/credit"
 	"qfw/util/mongodb"
+	"qfw/util/redis"
+	"time"
 )
 
 type credit struct {
 	*xweb.Action
-	myCredit   xweb.Mapper `xweb:"/member/credit/myCredit"`   //我的积分
-	creditRule xweb.Mapper `xweb:"/member/credit/creditRule"` //积分规则
+	myCredit    xweb.Mapper `xweb:"/member/credit/myCredit"`    //我的积分
+	creditRule  xweb.Mapper `xweb:"/member/credit/creditRule"`  //积分规则
+	inCreditAjx xweb.Mapper `xweb:"/member/credit/inCreditAjx"` //ajx调用
 }
 
 func (c *credit) MyCredit() error {
 	userId := util.ObjToString(c.GetSession("userId"))
-	log.Println("userId", userId)
 	if len(userId) > 0 {
 		user := *mongodb.FindById("user", userId, nil)
 		c.T["user"] = user
@@ -35,9 +38,43 @@ func (c *credit) MyCredit() error {
 		c.T["A_FFW"] = cd.AIsHasDo(cd.A_FFW, credit_a)       //发服务
 		c.T["A_FXQ"] = cd.AIsHasDo(cd.A_FXQ, credit_a)       //发需求
 		c.T["A_CKGXW"] = cd.AIsHasDo(cd.A_CKGXW, credit_a)   //查看关系网
-		c.T["A_FXFW"] = cd.AIsHasDo(cd.A_FXFW, credit_a)     //分享服务
+		c.T["A_FXFWXQ"] = cd.AIsHasDo(cd.A_FXFWXQ, credit_a) //分享服务需求
 		c.T["A_WCJY"] = cd.AIsHasDo(cd.A_WCJY, credit_a)     //完成交易
 		c.T["A_WCJYPJ"] = cd.AIsHasDo(cd.A_WCJYPJ, credit_a) //完成交易评价
+		if ret := redis.Get("other", cd.B_QD+"_"+userId); ret != nil {
+			tmp := util.InterfaceArrTointArr(ret.([]interface{}))
+			qd := false
+			if time.Unix(int64(tmp[0]), 0).Day() == time.Now().Day() {
+				qd = true
+			}
+			c.T["B_QD"] = map[string]interface{}{"A": qd, "B": tmp[1]}
+		} else {
+			c.T["B_QD"] = map[string]interface{}{"B": 1}
+		}
+		if ret := redis.Get("other", cd.B_FFW+"_"+userId); ret != nil {
+			tmp := util.InterfaceArrTointArr(ret.([]interface{}))
+			c.T["B_FFW"] = map[string]interface{}{"A": tmp[0], "B": tmp[1], "C": tmp[2]}
+		} else {
+			c.T["B_FFW"] = map[string]interface{}{"A": 0, "B": 0, "C": cd.B_FFW_T}
+		}
+		if ret := redis.Get("other", cd.B_FXQ+"_"+userId); ret != nil {
+			tmp := util.InterfaceArrTointArr(ret.([]interface{}))
+			c.T["B_FXQ"] = map[string]interface{}{"A": tmp[0], "B": tmp[1], "C": tmp[2]}
+		} else {
+			c.T["B_FXQ"] = map[string]interface{}{"A": 0, "B": 0, "C": cd.B_FXQ_T}
+		}
+		if ret := redis.Get("other", cd.B_FXFWXQ+"_"+userId); ret != nil {
+			tmp := util.InterfaceArrTointArr(ret.([]interface{}))
+			c.T["B_FXFWXQ"] = map[string]interface{}{"A": tmp[0], "B": tmp[1], "C": tmp[2]}
+		} else {
+			c.T["B_FXFWXQ"] = map[string]interface{}{"A": 0, "B": 0, "C": cd.B_FXFWXQ_T}
+		}
+		if ret := redis.Get("other", cd.B_QYCX+"_"+userId); ret != nil {
+			tmp := util.InterfaceArrTointArr(ret.([]interface{}))
+			c.T["B_QYCX"] = map[string]interface{}{"A": tmp[0], "B": tmp[1], "C": tmp[2]}
+		} else {
+			c.T["B_QYCX"] = map[string]interface{}{"A": 0, "B": 0, "C": cd.B_QYCX_T}
+		}
 		return c.Render("/member/credit/mycredit.html", &c.T)
 	} else {
 		return nil
@@ -45,6 +82,31 @@ func (c *credit) MyCredit() error {
 	return c.Render("/member/credit/mycredit.html")
 }
 
+func (c *credit) InCreditAjx() error {
+	userId := util.ObjToString(c.GetSession("userId"))
+	result := make(M)
+	if len(userId) > 0 {
+		credit_a := util.IntAll(c.GetSession("credit_a"))
+		param := c.GetString("param")
+		//分享服务
+		if param == "fx" {
+			if cd.AIsHasDo(cd.A_FXFWXQ, credit_a) {
+				//日常任务
+				cd.InCreditB(userId, cd.B_FXFWXQ)
+			} else {
+				//一次性任务
+				cd.InCreditA(userId, cd.A_FXFWXQ, credit_a)
+				cd.InCreditB(userId, cd.B_FXFWXQ)
+			}
+		}
+		if param == "qd" {
+			cd.InCreditB(userId, cd.B_QD)
+			log.Println("qiandao")
+		}
+	}
+	c.ServeJson(result)
+	return nil
+}
 func (c *credit) CreditRule() error {
 	return c.Render("/member/credit/creditrule.html")
 }

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 == "first" {
-					Update("user", &map[string]interface{}{
-						"_id": ObjectIdHex(r_id),
-					}, `{'$set':{'s_audittype':'second'}}`, false, false)
+					UpdateCookieSession(m.Action, loginType, m.GetString("rememberMe") == "y", *r)
 				}
+				updateAudittype(m.Action, r)
 			}
 		}
 	} else {
@@ -662,7 +665,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")   //推广邮件代码
 	m.DelSession("credit_a")      //a积分任务
@@ -747,10 +750,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)
 }
@@ -1134,6 +1133,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

@@ -15,7 +15,7 @@ import (
 	"qfw/coreutil"
 	"qfw/redpackage"
 	"qfw/util"
-	credit "qfw/util/credit"
+	"qfw/util/credit"
 	"qfw/util/elastic"
 	. "qfw/util/fsw"
 	"qfw/util/mongodb"
@@ -171,7 +171,7 @@ func (yp *Yellowpage) EditEnterprise(id string) error {
 	}
 	id = strings.Split(id, "#")[0]
 
-	yp.T["entinfo"] = yps.GetEntInfo(id, true)
+	yp.T["entinfo"] = yps.GetEntInfo(id)
 
 	yp.T["entid"] = id
 
@@ -250,7 +250,7 @@ func (yp *Yellowpage) ShowEnterprise(id string) error {
 	}
 	id = strings.Split(id, "#")[0]
 
-	yp.T["entinfo"] = yps.GetEntInfo(id, true)
+	yp.T["entinfo"] = yps.GetEntInfo(id)
 
 	yp.T["entid"] = id
 	yp.T["serviceClassify"] = coreconfig.ServiceClassify
@@ -270,7 +270,7 @@ func (yp *Yellowpage) ShowService(id string) error {
 	yp.T["serviceName"] = "添加产品服务信息"
 	yp.T["serviceClassify"] = coreconfig.ServiceClassify
 
-	yp.T["entinfo"] = yps.GetEntInfo(id, true)
+	yp.T["entinfo"] = yps.GetEntInfo(id)
 	opLocD := yp.GetSession("opLocDistrict")
 	yp.T["opLocDistrict"] = opLocD
 	return yp.Render("/member/editservice.html", &yp.T)
@@ -305,7 +305,7 @@ func (yp *Yellowpage) EditService(id string) error {
 		yp.T["price"] = price
 	}
 
-	yp.T["entinfo"] = yps.GetEntInfo(serentid, true)
+	yp.T["entinfo"] = yps.GetEntInfo(serentid)
 	yp.T["entid"] = serentid
 	//根据服务ID获取服务信息
 
@@ -430,7 +430,15 @@ func (yp *Yellowpage) AddService() error {
 		tempFlag = len(_id) > 0
 		//发服务送积分
 		if tempFlag {
-			//credit.InCreditB(util.ObjToString(userid), credit.B_FFW)
+			credit_a := util.IntAll(yp.GetSession("credit_a"))
+			if credit.AIsHasDo(credit.A_FFW, credit_a) {
+				//日常任务
+				credit.InCreditB(util.ObjToString(userid), credit.B_FFW)
+			} else {
+				//一次性任务
+				credit.InCreditB(util.ObjToString(userid), credit.B_FFW)
+				credit.InCreditA(util.ObjToString(userid), credit.A_FFW, credit_a)
+			}
 		}
 	}
 	currentuser := mongodb.FindById("user", yp.GetSession("userId").(string), nil)
@@ -453,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/mobile.go

@@ -13,6 +13,7 @@ type Mobile struct {
 	guide         xweb.Mapper `xweb:"/swordfish/guide"`
 	share         xweb.Mapper `xweb:"/swordfish/share"`
 	wxrssset      xweb.Mapper `xweb:"/swordfish/page"`
+	getMyCredit   xweb.Mapper `xweb:"/member/credit/getcredit"`
 	msgSet        xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
 	ajaxReq       xweb.Mapper `xweb:"/swordfish/ajaxReq"`
 	advise        xweb.Mapper `xweb:"/mobile/advise"`

core/src/qfw/mobile/wxmenu.go

@@ -8,7 +8,7 @@ import (
 	"qfw/coreconfig"
 	"qfw/coreutil"
 	"qfw/util"
-	"qfw/util/consts"
+	"qfw/util/credit"
 	"qfw/util/mongodb"
 	"qfw/util/redis"
 	"runtime"
@@ -22,14 +22,15 @@ 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)
 }
 
+//进入订阅页面
 func (m *Mobile) Wxrssset() error {
 	defer func() {
 		if r := recover(); r != nil {
@@ -43,13 +44,11 @@ func (m *Mobile) Wxrssset() error {
 			}
 		}
 	}()
-	userId := m.Session().Get("userId")
-	//userId = "55a39942af53740186000004"
-	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,
 				},
@@ -57,120 +56,110 @@ func (m *Mobile) Wxrssset() error {
 			return m.Redirect("/swordfish/guide")
 		}
 		m.T["msgset"] = (*userInfo)["o_msgset"]
-		entid := util.ObjToString((*userInfo)["s_enterpriseid"])
-		if entid != "" {
-			local := mongodb.FindById("enterprise", entid, `{"_id":0,"OpLocDistrict":1,"i_area":1}`)
-			localids := (*local)["OpLocDistrict"]
-			i_area := (*local)["i_area"]
-			if localids != nil && len(localids.(string)) > 2 {
-				localid := localids.(string)
-				localid = localid[:2]
-				m.T["scode"] = localid
-				m.T["sname"] = consts.SRcode[localid]
-			} else if i_area != nil && len(fmt.Sprintf("%d", i_area)) > 2 {
-				area := fmt.Sprintf("%d", i_area)
-				area = area[:2]
-				m.T["scode"] = area
-				m.T["sname"] = consts.SRcode[area]
-			}
-		}
-		//m.T["mid"] = openid
 		return m.Render("/swordfish/wxrssset.html", &m.T)
 	} else {
 		return m.Render("_err.html")
 	}
+}
 
-	/**
-	enstr := strings.Split(se.DecodeString(str), ",")
-	if len(enstr) >= 3 {
-		openid := enstr[0]
-		if len(openid) == 0 {
-			return nil
-		}
-		userInfo := mongodb.FindOneByField("user", `{"s_m_openid":"`+openid+`"}`, `{"_id":1,"o_msgset":1,"s_enterpriseid":1}`)
-		if userInfo == nil || len(*userInfo) == 0 {
-			return nil
-		} else {
-			m.T["msgset"] = (*userInfo)["o_msgset"]
-			entid := util.ObjToString((*userInfo)["s_enterpriseid"])
-			if entid != "" {
-				local := mongodb.FindById("enterprise", entid, `{"_id":0,"OpLocDistrict":1,"i_area":1}`)
-				localids := (*local)["OpLocDistrict"]
-				i_area := (*local)["i_area"]
-				if localids != nil && len(localids.(string)) > 2 {
-					localid := localids.(string)
-					localid = localid[:2]
-					m.T["scode"] = localid
-					m.T["sname"] = consts.SRcode[localid]
-				} else if i_area != nil && len(fmt.Sprintf("%d", i_area)) > 2 {
-					area := fmt.Sprintf("%d", i_area)
-					area = area[:2]
-					m.T["scode"] = area
-					m.T["sname"] = consts.SRcode[area]
-				}
-			}
-			m.T["mid"] = openid
-			return m.Render("/member/message/wxrssset.html", &m.T)
-		}
+//获取积分
+func (m *Mobile) GetMyCredit() error {
+	userId := m.GetSession("userId")
+	res := map[string]interface{}{}
+	if userId != nil {
+		res["flag"] = true
+		res["val"] = getCreditById(userId.(string))
 	} else {
-		return m.Render("_err.html")
+		res["flag"] = false
 	}
-	**/
+	m.ServeJson(&res)
+	return nil
 }
 
-//订阅消息设置
-func (m *Mobile) MsgSet() error {
-	data := m.GetString("data")
-	/**
-	mid := m.GetString("mid")
-	if mid == "" {
-		return nil
+func getCreditById(userId string) int {
+	user := mongodb.FindById("user", userId, `{"_id":0,"i_credit":1}`)
+	if *user != nil {
+		return util.IntAll((*user)["i_credit"])
 	}
-	**/
-	bcon := true
-	doc := map[string]interface{}{}
-	if data != "" {
-		mson := map[string]interface{}{}
-		err := json.Unmarshal([]byte(data), &mson)
-		if err != nil || mson == nil || len(mson) == 0 {
-			log.Println("保存订阅设置出错", err)
-		} else {
-			for _, v := range mson {
-				util.Try(func() {
-					item := v.(map[string]interface{})
-					a_key := util.ObjArrToStringArr(item["a_key"].([]interface{}))
-					if a_key == nil || len(a_key) == 0 || len(a_key) > 5 {
-						bcon = false
-					} else {
-						for _, v := range a_key {
-							if len(v) > 300 {
-								bcon = false
-								break
+	return 0
+}
+
+//直接查询开启状态和截止日期
+func getMsgSetById(userId string) map[string]interface{} {
+	user := mongodb.FindById("user", userId, `{"_id":0,"i_credit":1,"o_msgset.tender.i_status":1,"o_msgset.tender.l_enddate":1,"o_msgset.bid.i_status":1,"o_msgset.bid.l_enddate":1}`)
+	if *user != nil {
+		return *user
+	}
+	return nil
+}
+
+//扣分操作
+func (m *Mobile) SwordfishPay() {
+	userId := m.GetSession("userId")
+	res := map[string]interface{}{}
+	if userId != nil {
+		types := m.GetSlice("types")
+		res["flag"] = true
+		if len(types) > 0 {
+			//获取积分
+			user := getMsgSetById(userId.(string))
+			if user == nil {
+				res["flag"] = false
+			} else {
+				i_credit := util.IntAll(user["i_credit"])
+				if i_credit > 0 {
+					isPay := map[string]interface{}{}
+					for _, v := range types {
+						util.Try(func() {
+							obj_typei := user["o_msgset"].(map[string]interface{})[v]
+							b_newopen := false
+							if obj_typei == nil {
+								b_newopen = true
+							} else {
+								obj_type := obj_typei.(map[string]interface{})
+								st := obj_type["i_status"]
+								objt := obj_type["l_enddate"]
+								if st == nil || objt == nil {
+									b_newopen = true
+								} else {
+									//判断是否开启
+									i_st := st.(int)
+									l_objt := objt.(int64)
+									if !(i_st == 1 && l_objt > util.GetDayStartSecond(0)) {
+										b_newopen = true
+									}
+								}
 							}
+							if b_newopen { //进行扣费操作
+								isPay[v] = v
+							}
+						}, func(e interface{}) {
+							log.Println(e)
+						})
+					}
+					i_credit -= len(isPay) * 1000
+					if i_credit >= 0 {
+						if credit.OutCreditB(userId.(string), credit.V_JY, -len(isPay)*1000, isPay) {
+							//先扣分，然后更新，然后返回结果
+							res["credit"] = i_credit
+							res["oprstatus"] = true
 						}
+					} else {
+						res["credit"] = i_credit
 					}
-				}, func(e interface{}) {
-					log.Println("验证关键词出错", e)
-					bcon = false
-				})
+
+				} else {
+					res["credit"] = i_credit
+				}
 			}
 		}
-		mson["l_modifydate"] = time.Now().Unix()
-		doc["o_msgset"] = mson
 	} else {
-		bcon = false
-	}
-	da := map[string]interface{}{
-		"msg": util.If(bcon, "保存成功", "保存失败"),
+		res["flag"] = false
 	}
-	if bcon {
-		mongodb.Update("user", `{"_id":"`+util.ObjToString(m.GetSession("userId"))+`"}`, &map[string]interface{}{
-			"$set": doc,
-		}, false, false)
-	}
-	m.ServeJson(da)
-	return nil
+
 }
+
+//剑鱼保存
 func (m *Mobile) AjaxReq() error {
 	reqType := m.GetString("reqType")
 	var flag = "n"
@@ -209,16 +198,15 @@ func (m *Mobile) AjaxReq() error {
 	default:
 		if userId := m.GetSession("userId"); userId != nil {
 			msgset := make(map[string]interface{})
-			//投标公告
 			set := make(map[string]interface{})
 			for _, v := range []string{"tender", "bid"} {
 				if len(m.GetString(v+"_scope")) > 0 {
-					tmp := make(map[string]interface{})
-					tmp["a_key"] = m.GetSlice(v + "_keys")
-					tmp["s_scope"] = m.GetString(v + "_scope")
-					tmp["i_status"], _ = m.GetInteger(v + "_status")
-					tmp["l_modifydate"] = time.Now().Unix()
-					set["o_msgset."+v] = tmp
+					//还有一个截止时间字段和一个剑鱼服务状态
+					switchstatus, _ := m.GetInteger(v + "_switchstatus")
+					set["o_msgset."+v+".i_switchstatus"] = switchstatus
+					set["o_msgset."+v+".a_key"] = m.GetSlice(v + "_keys")
+					set["o_msgset."+v+".s_scope"] = m.GetString(v + "_scope")
+					set["o_msgset."+v+".l_modifydate"] = time.Now().Unix()
 				}
 			}
 			//更新数据库
@@ -244,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)
 }
 
@@ -255,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/qfw/search/searchService.go

@@ -11,13 +11,13 @@ import (
 	. "qfw/member"
 	. "qfw/util"
 	"qfw/util/consts"
+	"qfw/util/credit"
 	"qfw/util/elastic"
 	ip "qfw/util/ip17mon"
 	. "qfw/util/mongodb"
 	"qfw/util/redis"
 	"strconv"
 	"strings"
-	_ "strings"
 )
 
 //获取某个企业服务列表数据
@@ -100,6 +100,24 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 		}
 		//查询生成列表数据
 		data, pagination := searhWebContentent(querymap, n, reqType)
+
+		//查询送积分
+		queryStr := querymap["query"]
+		if len(queryStr) > 0 {
+			userId := ObjToString(n.GetSession("userId"))
+			if len(userId) > 0 {
+				credit_a := IntAll(n.GetSession("credit_a"))
+				if credit.AIsHasDo(credit.A_QYCX, credit_a) {
+					//日常任务
+					credit.InCreditB(userId, credit.B_QYCX)
+				} else {
+					//一次性任务
+					credit.InCreditB(userId, credit.A_QYCX)
+					credit.InCreditA(userId, credit.B_QYCX, credit_a)
+					n.Session().UpdateByCustomField("id", userId, "credit_a", credit_a)
+				}
+			}
+		}
 		n.Render("/search/enterpriseList.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
 	} else {
 		//反转生成map

core/src/qfw/searchmarket/demand.go

@@ -12,12 +12,12 @@ import (
 	"html/template"
 	"log"
 	. "qfw/coreconfig"
-	"reflect"
-
 	util "qfw/util"
+	"qfw/util/credit"
 	. "qfw/util/elastic"
 	"qfw/util/image"
 	mongo "qfw/util/mongodb"
+	"reflect"
 	"regexp"
 	"strings"
 	"time"
@@ -172,7 +172,18 @@ func (d *Demand) AddDemand() error {
 				}
 			}
 			rs := mongo.Save("demand", demandInfo)
-			UpdateNewDoc("demand", "demand", mongo.FindById("demand", rs, ""))
+			b := UpdateNewDoc("demand", "demand", mongo.FindById("demand", rs, ""))
+			if b {
+				credit_a := util.IntAll(d.GetSession("credit_a"))
+				if credit.AIsHasDo(credit.A_FXQ, credit_a) {
+					//日常任务
+					credit.InCreditB(util.ObjToString(s_userid), credit.B_FXQ)
+				} else {
+					//一次性任务
+					credit.InCreditB(util.ObjToString(s_userid), credit.B_FXQ)
+					credit.InCreditA(util.ObjToString(s_userid), credit.A_FXQ, credit_a)
+				}
+			}
 			if s_userid == nil {
 				return d.Write("n")
 			}

core/src/qfw/swordfish/swordfishmanage.go

@@ -57,7 +57,7 @@ func (s *SwordFish) RsssetAjaxReq() error {
 	}
 	//使用剑鱼送积分
 	if flag == "y" {
-		_, credit_a, _ := credit.InCreditA(userId, credit.A_JY, util.IntAll(s.GetSession("credit_a")))
+		_, credit_a, _ := credit.InCreditA(userId, credit.V_JY, util.IntAll(s.GetSession("credit_a")))
 		s.Session().UpdateByCustomField("id", userId, "credit_a", credit_a)
 	}
 	s.ServeJson(map[string]interface{}{

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -39,7 +39,7 @@ func FormatDate(src *interface{}) string {
 	return str
 }
 
-func GetEntInfo(id string, flag bool) interface{} {
+func GetEntInfo(id string) interface{} {
 	res := FindById("enterprise", id, `{"RegNo":1, "EntName":1, "EntType":1, "EntTypeName":1, "OpLocDistrict":1, "LeRep":1, "LegCerNO":1, "Tel":1, "Dom":1, "OpScope":1, "OpFrom":1, "OpTo":1, "RegCap":1, "EstDate":1, "CompForm":1, "CompFormName":1, "OpState":1, "OpStateName":1, "RegOrgName":1, "IssBLicDate":1, "Timestamp":1, "s_synopsis":1, "SourceType":1, "s_weixin":1, "s_enturl, "i_province":1, "i_city":1, "i_area":1,"s_action":1,"s_persion":1,"s_mobile":1,"s_address":1,"s_avatar":1,"s_microwebsite":1,"s_qq":1,"s_submitid":1}`)
 	if res != nil {
 		id := (*res)["s_submitid"]
@@ -102,13 +102,6 @@ func GetEntInfo(id string, flag bool) interface{} {
 		}
 		//
 		(*res)["EntTypeLabel"] = (mobile.GetDiffName(EntType))[0]
-		if flag {
-			RegNo, _ := (*res)["RegNo"].(string)
-			relation := makeRelation(RegNo, en)
-			if relation != nil {
-				(*res)["relation"] = relation
-			}
-		}
 
 		(*res)["entid"] = id
 		return *res
@@ -118,50 +111,16 @@ func GetEntInfo(id string, flag bool) interface{} {
 
 //企业黄查询结果
 func (yp *Yellowpage) EnterpriseInfo(id string) error {
-	//redisEnt := redis.Get("ent", "Key")
 	id = strings.Split(id, "#")[0]
-	//没有登录
-	key := "enterpriseInfo_" + id
-	//登录并认证
-	keyuser := "enterpriseInfo_user_" + id
-	//登录没有认证
-	keyunrzuser := "enterpriseInfo_unrzuser_" + id
-	if yp.GetSession("userId") == nil {
-		//用户没有登录
-		if ret, err := redis.GetBytes("enterprise", key); err == nil {
-			return yp.SetBody(*ret)
-		} else {
-			yp.T["res"] = GetEntInfo(id, false)
-			content, err := yp.Render4Cache("/yellowpage/ungxenterpriseinfo.html", &yp.T)
-			if err == nil {
-				redis.PutBytes("enterprise", key, &content, ONEDAY)
-			}
-			return yp.SetBody(content)
-		}
-	} else if util.IntAll(yp.GetSession("identWay")) == 1 {
-		//已认证
-		if ret, err := redis.GetBytes("enterprise", keyuser); err == nil {
-			return yp.SetBody(*ret)
-		} else {
-			yp.T["res"] = GetEntInfo(id, true)
-			contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
-			if erruser == nil {
-				redis.PutBytes("enterprise", keyuser, &contentuser, ONEDAY)
-			}
-			return yp.SetBody(contentuser)
-		}
+	if ret, err := redis.GetBytes("enterprise", id); err == nil {
+		return yp.SetBody(*ret)
 	} else {
-		//用户没有认证登录
-		if ret, err := redis.GetBytes("enterprise", keyunrzuser); err == nil {
-			return yp.SetBody(*ret)
-		} else {
-			yp.T["res"] = GetEntInfo(id, false)
-			contentuser, erruser := yp.Render4Cache("/yellowpage/unrzenterpriseinfo.html", &yp.T)
-			if erruser == nil {
-				redis.PutBytes("enterprise", keyunrzuser, &contentuser, ONEDAY)
-			}
-			return yp.SetBody(contentuser)
+		yp.T["res"] = GetEntInfo(id)
+		contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
+		if erruser == nil {
+			redis.PutBytes("enterprise", id, &contentuser, ONEDAY)
 		}
+		return yp.SetBody(contentuser)
 	}
 }
 
@@ -284,6 +243,14 @@ func isContainInQueryCache(querykey string, cache *list.List) bool {
 	return false
 }
 
+func (yp *Yellowpage) GetRelation() error {
+	relation := makeRelation(yp.GetString("regNo"), yp.GetString("entName"))
+	if relation != nil {
+		yp.ServeJson(M{"relation": relation})
+	}
+	return nil
+}
+
 //生成图用的结果
 func makeRelation(mnregno, mnname string) interface{} {
 	t1 := time.Now()

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-13 18:36:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-13 18:36:29"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-15 10:25:52"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-15 10:25:52"}},"marketisstart":true,"marketrate":300}

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

@@ -950,32 +950,10 @@ a{
 	display: block;
 	padding-left:10px;
 }
-.a-index-hd>img{
+.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;
@@ -2056,20 +2034,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;
@@ -2349,6 +2313,25 @@ style="color:#D03102;margin-right:5px;"
 .b-right-content{
 	padding: 10px;
 }
+.b-modal .modal-header{
+	background-color: #FF5A5F;
+	color: #FFFFFF;
+	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;
+}
+.b-findnull{
+	width: 200px;
+	height: 180px;
+}
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {

core/src/web/staticres/css/entcommunity.css

@@ -38,7 +38,7 @@ a:focus, a:hover{
 	color: #16a086 !important;
 }
 .entlist-page .nav-tabs{
-	background-color: #f0f0f0;
+	background-color: #f7f8fa;
 	margin-top: 20px;
 	margin-left: -15px;
 	margin-right: -15px;
@@ -66,4 +66,30 @@ a:focus, a:hover{
 }
 .entlist-page .nav-tabs>.active:hover{
 	background-color: #FFFFFF;
+}
+.entlist-status-r,.entlist-status-g{
+	color: #ffffff;
+	display: inline-block;
+	padding-left: 2px;
+	padding-right: 10px;
+}
+.entlist-status-r{
+	background-image: url("/images/status-r.png");
+	background-size: 100% 100%;
+}
+.entlist-status-g{
+	background-image: url("/images/status-g.png");
+	background-size: 100% 100%;
+}
+.entlist-page .qfw-entcontent-padding>img{
+	width: 90px;
+	height: 90px;
+	vertical-align: top;
+	position: absolute;
+	top: 50%;
+	margin-top: -45px;
+}
+.entlist-page .qfw-entcontent-padding>div{
+	display: inline-block;
+	padding-left: 100px;
 }

core/src/web/staticres/css/enterprise.css

@@ -69,7 +69,7 @@ span.highlight {
 #navs {position:relative}
 #navs .renzheng {position:absolute;right:10px;bottom:0px;}
 /******列表详细信息*******/
-.borderB .qfw-entcontent-padding{padding:10px 20px;line-height: 25px;}
+.borderB .qfw-entcontent-padding{padding:20px 20px;line-height: 25px;position: relative;}
 .qfw-entcontent-padding .lineb a{font-size:16px;}
 .borderB .qfw-entcontent-padding div span{padding-right: 0px;}
 .qfw-entcontent-padding div span{padding-right: 30px;display: inline-block;}

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/css/qfw.css

@@ -499,22 +499,8 @@ a.new_red:hover, a.new_red:active {
 	border-top-right-radius: 5px;
 }
 .modal-header{
-	background-color: #FF5A5F;
-	color: #FFFFFF;
 	border-top-left-radius: 4px;
 	border-top-right-radius: 4px;
-	padding-left: 20px;
-	padding-right: 10px;
-	font-size: 16px;
-}
-.modal-header .close{
-	opacity: 1;
-	text-shadow: none;
-	font-weight: normal;
-	color: #FFFFFF;
-}
-.modal-header .close:focus, .modal-header .close:hover{
-	opacity: 1;
 }
 .form-control{
 	border-radius: 0px;
@@ -935,6 +921,34 @@ span.highlight {
 	content: "\6C";
 }
 
+.qq1:before {
+	content: "\6D";
+}
+
+.dizhi:before {
+	content: "\6E";
+}
+
+.ren2:before {
+	content: "\6F";
+}
+
+.shouji:before {
+	content: "\5B";
+}
+
+.wangzhi1:before {
+	content: "\5C";
+}
+
+.youjian2:before{
+	content: "\5D";
+}
+
+.jinbi:before{
+	content: "\5E";
+}
+
 .icon-small {
 	font-size: 12px;
 }

core/src/web/staticres/fonts/index.html

@@ -1,527 +0,0 @@
-<html>
-<head>
-<title>字体图标测试</title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta name="Generator" content="EditPlus">
-<meta name="Author" content="">
-<meta name="Keywords" content="">
-<meta name="Description" content="">
-<style>
-@font-face {
-	font-family: 'qimingxing';
-	src: url('qimingxing.woff');
-}
-
-.glyphicon {
-	position: relative;
-	top: 1px;
-	display: inline-block;
-	font-family: 'qimingxing';
-	font-style: normal;
-	font-weight: normal;
-	line-height: 1;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.anquan:before {
-	content: "\44";
-}
-
-.bianji:before {
-	content: "\22";
-}
-
-.biaojidizhi:before {
-	content: "\23";
-}
-
-.fuwu:before {
-	content: "\24";
-}
-
-.chenggongtishi:before {
-	content: "\25";
-}
-
-.dengjijiguan:before {
-	content: "\26";
-}
-
-.dengjizhuangtai:before {
-	content: "\27";
-}
-
-.douban:before {
-	content: "\28";
-}
-
-.falvshengming:before {
-	content: "\29";
-}
-
-.faren:before {
-	content: "\30";
-}
-
-.fenxiang:before {
-	content: "\32";
-}
-
-.gongshixinxi:before {
-	content: "\33";
-}
-
-.gongshijianjie:before {
-	content: "\34";
-}
-
-.guanxiwang:before {
-	content: "\35";
-}
-
-.huidingbu:before {
-	content: "\36";
-}
-
-.jiazai:before {
-	content: "\37";
-}
-
-.jingyingfanwei:before {
-	content: "\38";
-}
-
-.kehubiaoqian:before {
-	content: "\39";
-}
-
-.lianxidianhua:before {
-	content: "\40";
-}
-
-.lianxidizhi:before {
-	content: "\41";
-}
-
-.lianxiren:before {
-	content: "\42";
-}
-
-.lianxiwomen:before {
-	content: "\43";
-}
-
-.liaotianjilu:before {
-	content: "\45";
-}
-
-.liebiao:before {
-	content: "\46";
-}
-
-.mima:before {
-	content: "\47";
-}
-
-.qiyeleixing:before {
-	content: "\48";
-}
-
-.quanping:before {
-	content: "\4a";
-}
-
-.quanxianfenpei:before {
-	content: "\4b";
-}
-
-.riqi:before {
-	content: "\4c";
-}
-
-.shibai:before {
-	content: "\4d";
-}
-
-.shimingrenzheng:before {
-	content: "\4e";
-}
-
-.shuaxin2:before {
-	content: "\4f";
-}
-
-.sousuo:before {
-	content: "\50";
-}
-
-.tishi:before {
-	content: "\53";
-}
-
-.wangzhi:before {
-	content: "\54";
-}
-
-.wodehuangye:before {
-	content: "\55";
-}
-
-.weiguanwang:before {
-	content: "\56";
-}
-
-.weixinhao:before {
-	content: "\58";
-}
-
-.xiaoxi:before {
-	content: "\59";
-}
-
-.xiayibu:before {
-	content: "\5a";
-}
-
-.xitongshezhi:before {
-	content: "\62";
-}
-
-.youjian:before {
-	content: "\63";
-}
-
-.yuangongguanli:before {
-	content: "\64";
-}
-
-.kefuzaixian:before {
-	content: "\65";
-}
-
-.grrz:before {
-	content: "\66";
-}
-
-.zhanghao:before {
-	content: "\67";
-}
-
-.zhuanjie:before {
-	content: "\68";
-}
-
-.zhucehao:before {
-	content: "\69";
-}
-
-.zhusuo:before {
-	content: "\6a";
-}
-
-.zican:before {
-	content: "\6b";
-}
-
-.biaoqian:before {
-	content: "\70";
-}
-
-.biaoqing:before {
-	content: "\71";
-}
-
-.bofangjilu:before {
-	content: "\72";
-}
-
-.yjrz:before {
-	content: "\73";
-}
-
-.jgrz:before {
-	content: "\74";
-}
-
-.enterjian:before {
-	content: "\75";
-}
-
-.fuxuangougou:before {
-	content: "\76";
-}
-
-.guanbi:before {
-	content: "\77";
-}
-
-.iconfontcolor71:before {
-	content: "\78";
-}
-
-.liaotian:before {
-	content: "\79";
-}
-
-.ren:before {
-	content: "\7A";
-}
-
-.shangyihua:before {
-	content: "\7B";
-}
-
-.shangyiye:before {
-	content: "\7C";
-}
-
-.shuaxin:before {
-	content: "\7D";
-}
-
-.svgzuidahua:before {
-	content: "\7E";
-}
-
-.tupian:before {
-	content: "\A1";
-}
-
-.uploading:before {
-	content: "\A2";
-}
-
-.mprz:before {
-	content: "\A3";
-}
-
-.yyzzrz:before {
-	content: "\A4";
-}
-
-.yingyong:before {
-	content: "\A5";
-}
-
-.zhuanrengong:before {
-	content: "\A6";
-}
-
-.qyrz:before {
-	content: "\A7";
-}
-
-.zuixiaohua:before {
-	content: "\A8";
-}
-
-.qq:before {
-	content: "\7e";
-}
-
-.jianyu:before {
-	content: "\51";
-}
-
-.zhengcefagui:before {
-	content: "\52";
-}
-
-.fuwushichang:before {
-	content: "\49";
-}
-
-.qiyeshequ:before {
-	content: "\57";
-}
-
-.weiguanwang1:before {
-	content: "\61";
-}
-
-.icon-small {
-	font-size: 12px;
-}
-
-.icon-mini {
-	font-size: 10px;
-}
-
-.icon-large {
-	font-size: 24px;
-}
-
-.icon-xlarge {
-	font-size: 48px;
-}
-
-span {
-	line-height: 32px;
-	display: block;
-	height: 32px;
-	width: 270px;
-}
-</style>
-</head>
-
-<body>
-	<span class="glyphicon anquan icon-large">安全</span>
-	<span class="glyphicon bianji icon-large">编辑</span>
-	<span class="glyphicon biaojidizhi icon-large">标记地址</span>
-	<span class="glyphicon fuwu icon-large">服务</span>
-	<br>
-	<br>
-
-
-	<span class="glyphicon dengjizhuangtai icon-large">登记状态</span>
-	<span class="glyphicon dengjijiguan icon-large">登记机关</span>
-	<span class="glyphicon chenggongtishi icon-large">成功提示</span>
-	<span class="glyphicon douban icon-large">豆瓣</span>
-	<br>
-	<br>
-
-
-	<span class="glyphicon falvshengming icon-large">法律声明</span>
-	<span class="glyphicon faren icon-large">法人</span>
-	<span class="glyphicon gongshixinxi icon-large">公示简介</span>
-	<span class="glyphicon gongshijianjie icon-large">公示简介</span>
-	<br>
-	<br>
-
-
-
-
-	<span class="glyphicon fenxiang icon-large">分享</span>
-	<span class="glyphicon guanxiwang icon-large">关系网</span>
-	<span class="glyphicon huidingbu icon-large">回顶部</span>
-	<span class="glyphicon jiazai icon-large">加载</span>
-	<br>
-	<br>
-
-
-
-
-	<span class="glyphicon jingyingfanwei icon-large">经营范围</span>
-	<span class="glyphicon kehubiaoqian icon-large">客户标签</span>
-	<span class="glyphicon lianxidianhua icon-large">联系电话</span>
-	<span class="glyphicon lianxidizhi icon-large">联系地址</span>
-	<br>
-	<br>
-
-
-	<span class="glyphicon lianxiren icon-large">联系人</span>
-	<span class="glyphicon lianxiwomen icon-large">联系我们</span>
-	<span class="glyphicon liaotian icon-large">聊天</span>
-	<span class="glyphicon liaotianjilu icon-large">聊天记录</span>
-	<br>
-	<br>
-
-	<span class="glyphicon liebiao icon-large">列表</span>
-	<span class="glyphicon mima icon-large">密码</span>
-	<span class="glyphicon qiyeleixing icon-large">企业类型</span>
-	<br>
-	<br>
-
-
-	<span class="glyphicon quanping icon-large">全屏</span>
-	<span class="glyphicon quanxianfenpei icon-large">权限分配</span>
-	<br>
-	<br>
-
-
-
-
-	<span class="glyphicon riqi icon-large">日期</span>
-	<span class="glyphicon shibai icon-large">失败</span>
-	<span class="glyphicon shimingrenzheng icon-large">实名认证</span>
-	<span class="glyphicon shuaxin icon-large">刷新</span>
-	<span class="glyphicon shuaxin2 icon-large">刷新</span>
-	<br>
-	<br>
-
-
-	<span class="glyphicon sousuo icon-large">搜索</span>
-	<span class="glyphicon tishi icon-large">提示</span>
-	<br>
-	<br>
-
-	<span class="glyphicon wangzhi icon-large">网址</span>
-	<span class="glyphicon wodehuangye icon-large">我的黄页</span>
-	<span class="glyphicon weiguanwang icon-large">微官网</span>
-	<br>
-	<br>
-
-	<span class="glyphicon weixinhao icon-large">微信号</span>
-	<span class="glyphicon xiaoxi icon-large">消息</span>
-	<span class="glyphicon xiayibu icon-large">下一步</span>
-	<br>
-	<br>
-
-	<span class="glyphicon xitongshezhi icon-large">系统设置</span>
-	<span class="glyphicon youjian icon-large">邮件</span>
-	<span class="glyphicon yuangongguanli icon-large">员工管理</span>
-	<span class="glyphicon kefuzaixian icon-large">客服在线</span>
-	<br>
-	<br>
-
-
-	<span class="glyphicon zhanghao icon-large">帐号</span>
-	<span class="glyphicon zhuanjie icon-large">转接</span>
-	<span class="glyphicon zhucehao icon-large">注册号</span>
-	<br>
-	<br>
-
-	<span class="glyphicon zhusuo icon-large">住所</span>
-	<span class="glyphicon zican icon-large">资产</span>
-	<br>
-	<br>
-
-	<span class="glyphicon qq icon-large">企鹅</span>
-	<span class="glyphicon qyrz icon-large">企业认证</span>
-	<span class="glyphicon jgrz icon-large">机构认证</span>
-	<br>
-	<br>
-	<span class="glyphicon yyzzrz icon-large">营业执照认证</span>
-	<span class="glyphicon yjrz icon-large">邮件认证</span>
-	<span class="glyphicon grrz icon-large">个人认证</span>
-	<br>
-	<br>
-	<span class="glyphicon mprz icon-large">名片认证</span>
-	<br>
-	<br>
-	<span class="glyphicon biaoqing icon-large">表情</span>
-	<span class="glyphicon bofangjilu icon-large">播放记录</span>
-	<span class="glyphicon enterjian icon-large">退出</span>
-	<br>
-	<br>
-	<span class="glyphicon fuxuangougou icon-large">复选勾</span>
-	<span class="glyphicon guanbi icon-large">关闭</span>
-	<span class="glyphicon iconfontcolor71 icon-large">心</span>
-	<br>
-	<br>
-	<span class="glyphicon ren icon-large">人</span>
-	<span class="glyphicon shangyihua icon-large">上一划</span>
-	<span class="glyphicon shangyiye icon-large">上一页</span>
-	<br>
-	<br>
-	<span class="glyphicon fuxuangougou icon-large">复选勾</span>
-	<span class="glyphicon svgzuidahua icon-large">最大化</span>
-	<span class="glyphicon tupian icon-large">图片</span>
-	<br>
-	<br>
-	<span class="glyphicon uploading icon-large">上传中</span>
-	<span class="glyphicon yingyong icon-large">应用</span>
-	<span class="glyphicon zhuanrengong icon-large">转人工</span>
-	<br>
-	<br>
-	<span class="glyphicon jianyu icon-large">剑鱼</span>
-	<span class="glyphicon zhengcefagui icon-large">政策法规</span>
-	<span class="glyphicon fuwushichang icon-large">服务市场</span>
-	<br>
-	<br>
-	<span class="glyphicon qiyeshequ icon-large">企业社区</span>
-	<span class="glyphicon weiguanwang1 icon-large">微官网</span>
-</body>
-</html>

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/frontenterprise.js → core/src/web/staticres/js/entportrait.js

@@ -1171,9 +1171,4 @@ function setcxSelect(){
 		required:0
 	});
 	$.cxSelect.setVal(province,city,area);	
-}
-
-
-
-
-
+}

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

@@ -1,5 +1,4 @@
-//是否有新活动
-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 = 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--+"秒后重新发送");
 			}
@@ -487,100 +492,4 @@ 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"></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");
-			}
-			try{
-				b_loadTopCallBack(result);
-			}catch(e){}
-		},
-		error: function(e){
-			topLoadOver = true;
-		}
-	});
 }

core/src/web/staticres/js/qfwtable.js

@@ -1,7 +1,7 @@
 
 !function($){
 	var tipmsg="没有找到相关内容，换个关键词试试";
-	var _nilHtml='<div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span  class="glyphicon glyphicon-question-sign text-primary"></span >&nbsp;<strong class="text-muted">$tipmsg</strong></h4></div>';
+	var _nilHtml='<div class="text-center" style="margin:20px auto;"><img src="/images/findnull.png" class="b-findnull"><h4><span  class="glyphicon glyphicon-question-sign text-primary"></span >&nbsp;<strong class="text-muted">$tipmsg</strong></h4></div>';
 	var DataTable = function ( element, options ) {
     this.$element = $(element);
     this.options = options;

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

@@ -130,7 +130,33 @@ function ScopeDialog(type,clickLi){
 }
 //取积分
 function getCredit(){
-	
+	var score=0
+	$.ajax({
+		dataType:"json",
+		url:"/member/credit/getcredit",
+		type:"POST",
+		async:false,
+		success:function(msg){
+			if(msg){
+				if(msg.flag){
+					score=msg.val					
+				}else{
+					alert("请重新进入页剑鱼页面后操作")
+				}
+			}			
+		},
+		error:function(x,st,err){
+			alert("请稍后再试"+st)
+		}
+	})
+	return score
+}
+var snopshot=[];
+
+function showSnopshot(){
+	//提示扣积分
+	alert(getCredit())
+	$(".credit-tip").show()
 }
 
 function commonAjaxReq(object,module){
@@ -142,25 +168,21 @@ function commonAjaxReq(object,module){
 	if($("#"+module+"-on-off").hasClass("open")){
 		//开服务要校验
 		if(module=="tender"){
-			if(!Tender.status){
-				//提示扣积分
-				//先取积分，规则然后提示
-				$(".creditTip-dialog").show()
-				$("html,body").addClass("overflow-hidden")
-				//生成快照
-				dataObj["snopshot"]=true
+			if(typeof(msgset.tender) != "undefined"){
+				if(!msgset.tender.i_switchstatus){
+					snopshot["tender"]=true	
+					showSnopshot()
+				}
 			}
 		}else if(module=="bid"){
-			if(!Bid.status){
-				//提示扣积分
-				$(".creditTip-dialog").show()
-				$("html,body").addClass("overflow-hidden")
-				//生成快照
-				dataObj["snopshot"]=true
+			if(typeof(msgset.bid) != "undefined"){
+				if(!msgset.bid.i_switchstatus){
+					snopshot["bid"]=true
+					showSnopshot()	
+				}
 			}
 		}
 	}
-
 	var keysString = "",scopeString = "";
 	var thisClass = this;
 	this.afterCommit = function(){
@@ -227,7 +249,8 @@ function commonAjaxReq(object,module){
 	if(dataObj[module+"_keys"].length > 0 && dataObj[module+"_scope"] == ""){
 		dataObj[module+"_scope"] = "A";
 	}
-	dataObj[module+"_status"] = $("#"+module+"-on-off").hasClass("open")?1:0
+	dataObj[module+"_switchstatus"] = $("#"+module+"-on-off").hasClass("open")?1:0
+	
 	/*****************************************/
 	$.ajax({
 		type: "POST",
@@ -292,17 +315,17 @@ $(function(){
 	if(typeof(msgset.tender) != "undefined"){
 		setKeyWord("tender",msgset.tender.a_key);
 		setScope("tender",msgset.tender.s_scope);
-		if(msgset.tender.i_status){
+		if(msgset.tender.i_switchstatus){
 			turnOn($("#tender-on-off"));
-			Tender.status=true
+			//判断要不要还原提示
 		}
 	}
 	if(typeof(msgset.bid) != "undefined"){
 		setKeyWord("bid",msgset.bid.a_key);
 		setScope("bid",msgset.bid.s_scope);
-		if(msgset.bid.i_status){
+		if(msgset.bid.i_switchstatus){
 			turnOn($("#bid-on-off"));
-			Bid.status=true
+			//判断要不要还原提示
 		}
 	}
 	//开关

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/staticres/wxswordfish/style.css

@@ -525,12 +525,12 @@ img{
 	margin:1px;
 	padding:5px;
 	background-color:#FAF5DF;
-	height:130px;
 	border:1px solid #F5DC9A;
 }
 .tip-button{
 	float: right;
  	margin-right: 50px;
+	margin-top:5px;
 }
 .tip-button span{
 	border-radius:5px;
@@ -542,4 +542,7 @@ img{
 }
 .tip-button span:nth-child(1){
 	background-color:#24C0D7;
+}
+.visible{
+	display:none;
 }

core/src/web/templates/_err.html

@@ -9,10 +9,10 @@
 	</div>
 	<div class="row" style="margin:50px 0;">
 		<div class="col-lg-6 col-md-6 col-sm-6 " style="text-align:right">
-		 <img src="/images/u20.png" />
+		 <img src="/images/404.png" width="200" height="275"/>
 		</div>
 		<div class="col-lg-6 col-md-6 col-sm-6 " style="padding-top: 50px;padding-bottom: 50px;">
-			<div style="text-indent:20px;"><h4><span  class="bootstrap-glyphicon glyphicon glyphicon-question-sign text-primary"></span >&nbsp;<strong class="text-muted">网络错误，页面找不到</strong></h4></div>
+			<div style="padding-left: 55px;"><h4><strong class="text-muted">网络错误，页面找不到</strong></h4></div>
 			<div id="alink" class="text-center" style="width:300px;margin-top:30px;"><h4 style="display:inline-block;"><a href="{{.T.refer}}"><img s1="reload.png" s2="u170.png" src="/images/reload.png" style="width:18px;margin-right:5px;">刷新页面</a>　|　</h4><h4 style="display:inline-block"><a href="/"><img s1="home1.png" s2="home2.png" src="/images/home1.png" style="width:18px;margin-right:5px;">返回首页</a></h4></div>
 		</div>
 	</div>

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/enthead.html

@@ -36,25 +36,16 @@ document.onkeydown=function(event){
     }
 };
 $(function (){
-	b_loadTop();
 	$("#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;
-			}
+	 		$("input[name='words']").val(input_val);
+			keyCode=0;
+			return true;
 		}
 	});
 	//设置即时下拉

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

@@ -322,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

@@ -42,7 +42,6 @@ document.onkeydown=function(event){
 };
 $(function (){
 	isMobile = !$("#b-loginStatus").is(":visible");
-	b_loadTop();
 	$("#searchFormBtn").click(function(){
 		keyCode = 13;
 		$("form#searchForm").submit();

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/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"}}
@@ -50,7 +49,4 @@ function swordfishLayoutInit(){
 		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/common/yptop.html

@@ -1,65 +0,0 @@
-<div class="qfw-header">
-	<div class="header-top">
-		<ul class="leftul"><li>企业服务网>用户中心 </li></ul>
-		
-		<ul style="padding-right:15px;">
-			{{if session "userName"}}
-			<li><a href="">{{session "userName"}}</a><a href="../../../member/logout">【退出】</a></li>
-			<li class="splitLine"></li>
-			<li class="dropdown">
-			<a id="dLabel" data-target="#" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false" style="margin: 0px 8px;">
-			    我的企业网<span class="caret"></span>
-			  </a>
-			  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel" style="min-width: 55px !important;">
-			    <li role="presentation"><a>实名认证</a></li>
-			    <li role="presentation"><a>我的黄页</a></li>
-			    <li role="presentation"><a>服务管理</a></li>
-			  </ul>
-			</li>
-			<li class="splitLine"></li>
-			{{else}}
-			<li><a data-toggle="modal" data-target="#loginModal">登录</a></li>
-			<li class="splitLine"></li>
-			<li><a href="../../../member/register">注册</a></li>
-			<li class="splitLine"></li>
-			{{end}}
-			<li><a>网站导航</a></li>
-		</ul>
-	</div>
-	<div class="header-table">		        
-		<div class="col-xs-5">
-			<table  style="  margin-top: 15px;">
-			<tr><td> <span style="font-size:20px;padding-top:5px;">
-				{{if .T.entinfo.EntName }}
-					{{.T.entinfo.EntName}}
-				{{else}}
-					暂无企业名称
-				{{end}}
-			</span></td></tr>
-			<tr class="hidden-xs"><td><img src="../../../images/qfw_qyrz.png"> 企业认证  <img src="../../../images/qfw_qw.png" style="width: 18px;height: 18px;"> 企网{{.T.entyear}}年 </td></tr>
-			</table>
-			
-		</div>
-		<div class="col-xs-5 hidden-xs" style="background-color: #6CC3FF;">
-		       	<div class="collapse navbar-collapse" style="padding: 0px !important;">
-			      <ul class="nav navbar-nav qfw-navbar">
-			        <li><a href="#" class="qfw-navbar-active" style="background-color: #6CC3FF;">企业信息</a></li>
-		            <li><a href="../search/service/ser" style="background-color: #6CC3FF;">服务列表</a></li>
-				   <!--用户登录后显示-->
-		            <li><a href="#" onclick="javascript:alert('功能模块开发中请等待...');" style="background-color: #6CC3FF;">信用档案</a></li>					
-			      </ul>
-			    </div>
-	       
-
-		</div>
-		<!--用户登录后显示-->
-		<div class="col-xs-2">
-			<div class="col-md-offset-1 col-md-3 text-center"  style="  margin-top: 15px;">
-			{{if session "userName"}}
-				<button class="btn btn-info btn-lg btn-width-150"  type="submit" onclick="btnSaveForm();">保存</button>
-			{{end}}
-			</div>
-		</div>
-		<!--用户登录后显示-->
-	</div>
-</div>

core/src/web/templates/index.html

@@ -6,9 +6,10 @@
 <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/login.html"}}
 {{include "/common/indexhead.html"}}
 <div class="a-content a-index">	
 	<div class="a-index-head index-new-head">
@@ -16,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>
@@ -33,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}}
@@ -58,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>
@@ -91,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>
 	-->
@@ -120,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>
@@ -133,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>
 <!--
@@ -149,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>
@@ -160,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)}}
@@ -190,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>
@@ -262,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){
@@ -284,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>');
 		}
@@ -407,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/web_newexpresslist.html

@@ -98,7 +98,7 @@ font-weight:normal;
 		</td>
 		</tr>
 		{{else}}
-		<tr style="border-bottom:0px;"><td><div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div></td></tr>
+		<tr style="border-bottom:0px;"><td><div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/findnull.png" class="b-findnull"><h4><span class="glyphicon biaojidizhi icon_default"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div></td></tr>
         {{end}}		
 		</tbody>
 		</table>

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

@@ -61,7 +61,7 @@
 			  </td>
 			  </tr>
 			{{else}}
-		<tr style="border-bottom:0px;"><td><div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div></td></tr>
+		<tr style="border-bottom:0px;"><td><div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/findnull.png" class="b-findnull"><h4><span class="glyphicon biaojidizhi icon_default"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div></td></tr>
 			{{end}}
 		  
 		  

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/credit/mycredit.html

@@ -99,7 +99,7 @@
 								<td width="10%" align="center">
 								<span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
 								<td width="30%" style="padding:110px">
-								去 <button class="btn btn-primary" onclick="toUrl('')">完成验证</button></td>
+								去 <button class="btn btn-primary" onclick="toUrl('/member/accountset/index')">完成验证</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowone">
@@ -111,69 +111,109 @@
 								<td width="10%" align="center">
 								<span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成
 								</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">绑定邮箱</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/member/accountset/index')">绑定邮箱</span></td>
 								{{end}}
 								
 							</tr>
 							<tr class="rowtwo">
 								<td width="60%" style="text-indent: 7em;">* 绑定手机，得50积分</td>
+								{{if .T.A_BSJ}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">绑定手机</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/member/accountset/index')">绑定手机</span></td>
+								{{end}}
 							</tr>
 							<tr class="rowone">
-								<td width="60%" style="text-indent: 7em;">* 完善你的企业黄页，得50积分</td>
+								<td width="60%" style="text-indent: 7em;">* 完善你的企业黄页，得50积分（实名认证后才可使用）</td>
 								{{if .T.A_CJMP}}
 								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
 								<td width="30%" style="padding:110px"></td>
 								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('')">完善资料</button></td>
+								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}')">完善资料</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowtwo">
 								<td width="60%" style="text-indent: 7em;">* 完成一次企业查询，得50积分</td>
+								{{if .T.A_QYCX}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">企业社区</span>查询</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/search/enterprise/ent.html')">企业社区</span>查询</td>
+								{{end}}
 							</tr>
 							<tr class="rowone">
 								<td width="60%" style="text-indent: 7em;">* 发布一条服务信息，得50积分（实名认证后才可使用）</td>
+								{{if .T.A_FFW}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">发服务</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}#service')">发服务</span></td>
+								{{end}}
 							</tr>
 							<tr class="rowtwo">
 								<td width="60%" style="text-indent: 7em;">*  发布一条需求信息，得50积分</td>
+								{{if .T.A_FXQ}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">发需求</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/market/demand/add.html')">发需求</span></td>
+								{{end}}
 							</tr>
 							<tr class="rowone">
 								<td width="60%" style="text-indent: 7em;">* 去剑鱼订阅一组关键词，得50积分</td>
+								{{if .T.A_SYJY}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">剑鱼</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/front/swordfish')">剑鱼</span></td>
+								{{end}}
 							</tr>
 							<tr class="rowtwo">
 								<td width="60%" style="text-indent: 7em;">* 查看神奇的关系网，得50积分（实名认证后才可查看）</td>
+								{{if .T.A_CKGXW}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">企业社区</span>查看</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/search/enterprise/ent.html')">企业社区</span>查看</td>
+								{{end}}
 							</tr>
 							<tr class="rowone">
 								<td width="60%" style="text-indent: 7em;">* 分享一条服务/需求信息，得50积分</td>
+								{{if .T.A_FXFWXQ}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span>分享</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/market/0/list.html')">服务市场</span>分享</td>
+								{{end}}
 							</tr>
 							<tr class="rowtwo">
-								<td width="60%" style="text-indent: 7em;">* 完成一次交易，得50积分</td>
+								<td width="60%" style="text-indent: 7em;">* 完成一次交易，得100积分</td>
+								{{if .T.A_WCJY}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/market/0/list.html')">服务市场</span></td>
+								{{end}}
 							</tr>
 							<tr class="rowone">
-								<td width="60%" style="text-indent: 7em;">* 完成一次交易评价，得50积分</td>
-								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span></td>
-							</tr>
-							<tr class="rowtwo">
-								<td width="60%" style="text-indent: 7em;">* 邀请新用户，得150积分</td>
+								<td width="60%" style="text-indent: 7em;">* 完成一次交易评价，得80积分</td>
+								{{if .T.A_WCJYPJ}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">邀请</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/market/0/list.html')">服务市场</span></td>
+								{{end}}
 							</tr>
 						</table>
 						<div class="btzrw">
@@ -187,29 +227,53 @@
 								<td width="30%" align="center"><b>操作</b></td>
 							</tr>
 							<tr class="rowone">
-								<td width="60%" style="text-indent: 7em;">连续签到第一天，得10积分</td>
+								<td width="60%" style="text-indent: 7em;">连续签到第{{.T.B_QD.B}}天，得{{.T.B_QD.B}}0积分</td>
+								{{if .T.B_QD.A}}
 								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
-								<td width="30%" style="padding:110px"></td>
+								{{else}}
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px"></td>								
+								{{end}}
 							</tr>
 							<tr class="rowtwo">
-								<td width="60%" style="text-indent: 7em;">完成5次企业查询，得50积分</td>
-								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">0/5</span></td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">企业社区</span>完成</td>
+								<td width="60%" style="text-indent: 7em;">完成5次企业查询，得50积</td>
+								{{if .T.B_QYCX.A }}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_QYCX.B}}/{{.T.B_QYCX.C}}</span></td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_QYCX.B}}/{{.T.B_QYCX.C}}</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/search/enterprise/ent.html')">企业社区</span>完成</td>
+								{{end}}
 							</tr>
 							<tr class="rowone">
 								<td width="60%" style="text-indent: 7em;">发布3条服务，得60积分</td>
-								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">0/3</span></td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span>完成</td>
+								{{if .T.B_FFW.A }}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_FFW.B}}/{{.T.B_FFW.C}}</span></td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_FFW.B}}/{{.T.B_FFW.C}}</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}#service')">发服务</span></td>
+								{{end}}
 							</tr>
 							<tr class="rowtwo">
 								<td width="60%" style="text-indent: 7em;">发布3条需求，得60积分</td>
-								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">0/3</span></td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span>完成</td>
+								{{if .T.B_FXQ.A}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_FXQ.B}}/{{.T.B_FXQ.C}}</span></td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_FXQ.B}}/{{.T.B_FXQ.C}}</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/market/demand/add.html')">发需求</span></td>
+								{{end}}
 							</tr>
 							<tr class="rowone">
 								<td width="60%" style="text-indent: 7em;">分享2条服务/需求信息，得40积分</td>
-								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">0/2</span></td>
-								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span>分享</td>
+								{{if .T.B_FXFWXQ.A}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_FXFWXQ.B}}/{{.T.B_FXFWXQ.C}}</span></td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">{{.T.B_FXFWXQ.B}}/{{.T.B_FXFWXQ.C}}</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('/market/0/list.html')">服务市场</span>分享</td>
+								{{end}}
 							</tr>
 							<tr class="rowtwo">
 								<td width="60%" style="text-indent: 7em;">邀请一个新用户（微信剑鱼分享邀请新用户），得150积分</td>
@@ -252,6 +316,10 @@ function checkContent(id){
 function outoClick(id){ 
 	document.getElementById(id).click();
 }
+
+function toUrl(url){
+	window.location.href=url
+}
 </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 == ""){

core/src/web/templates/search/enterpriseList.html

@@ -49,56 +49,68 @@
 				{{range $k,$v:=.T.data}}
 					<div class="borderB">
 						<div class="qfw-entcontent-padding">
-							<div class="lineb " >
-								<a target="_blank" href="/enterprise/{{index $v "_id"}}.html">
-									{{$lens:=len (index $v "EntName")}}									 
-									{{if eq $lens 0}}
-										{{index $v "LeRep"}}
-									{{else}}
-										{{index $v "EntName"}}
-									{{end}}
-								</a>
-								
-								{{ if index $v "s_action"}}
-									{{ if eq (index $v "s_action") "01"}}
-										<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证企业　</small></span>
-										{{ if $v.i_comauthenttype }}
-												{{ if eq $v.i_comauthenttype 2}}
-													<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
-												{{else if eq $v.i_comauthenttype 1}}
-													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-												{{else if eq $v.i_comauthenttype 3}}
-													<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
-												{{end}}
+							<img src="/images/ent-logo.png">
+							<div>
+								<div class="lineb " >
+									<a target="_blank" href="/enterprise/{{index $v "_id"}}.html"><b>
+										{{$lens:=len (index $v "EntName")}}									 
+										{{if eq $lens 0}}
+											{{index $v "LeRep"}}
 										{{else}}
-												<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+											{{index $v "EntName"}}
 										{{end}}
-									{{else if eq (index $v "s_action") "02"}}
-										<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
-									{{else if eq (index $v "s_action") "03"}}
-										<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
+									</b></a>
+									{{if index $v "OpStateName"}}
+									<div class="{{if eq (index $v "OpStateName") "注销" "吊销"}}entlist-status-r{{else}}entlist-status-g{{end}}">
+									<script>
+										var OpStateName = {{index $v "OpStateName"}};
+										if(OpStateName.length > 2){
+											OpStateName = OpStateName.substring(0,2);
+										}
+										document.write(OpStateName);
+									</script>
+									</div>
 									{{end}}
-								{{end}}
-							</div>
-							
-							<div>
-								<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
-								{{if index $v "EntType"}}
-									{{if eq $v.EntType "9600"}}
-										<span>经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
-									{{else if eq $v.EntType "5810"}}
-										<span>负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
-									{{else}}
-										<span>法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+									{{ if index $v "s_action"}}
+										{{ if eq (index $v "s_action") "01"}}
+											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证企业　</small></span>
+											{{ if $v.i_comauthenttype }}
+													{{ if eq $v.i_comauthenttype 2}}
+														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+													{{else if eq $v.i_comauthenttype 1}}
+														<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+													{{else if eq $v.i_comauthenttype 3}}
+														<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+													{{end}}
+											{{else}}
+													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+											{{end}}
+										{{else if eq (index $v "s_action") "02"}}
+											<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
+										{{else if eq (index $v "s_action") "03"}}
+											<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
+										{{end}}
 									{{end}}
-								{{end}}
-								<span>经营状态：<small  class="lineb " >{{index $v "OpStateName"}}</small></span>
-								<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
-								<span>所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
+									<div>
+										<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
+										{{if index $v "EntType"}}
+											{{if eq $v.EntType "9600"}}
+												<span class="margin-l-15">经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+											{{else if eq $v.EntType "5810"}}
+												<span class="margin-l-15">负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+											{{else}}
+												<span class="margin-l-15">法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+											{{end}}
+										{{end}}
+										<br>
+										<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
+										<span class="margin-l-15">所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
+									</div>
+									{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
+									{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
+									{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
+								</div>
 							</div>
-							{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
-							{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
-							{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
 						</div>
 					</div>
 				{{end}}
@@ -137,7 +149,7 @@
 				<!--页码信息结束-->
 			
 			{{else}}
-				<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div>
+				<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/findnull.png" class="b-findnull"><h4><strong class="text-muted">没有找到{{if index .T.querymap "query"}}和“<font class="text-primary">{{index .T.querymap "query"}}</font>”{{end}}相关内容，换个关键词试试</strong></h4></div></div>
 			{{end}}
 		</div>
 		<!--列表详细信息结束-->	

core/src/web/templates/service/detail.html

@@ -604,6 +604,6 @@ function comment(){
 <script src="/js/jquery.cxselect.js" type="text/javascript"> </script>
 <SCRIPT src="/js/lib.js" type="text/javascript"></SCRIPT>
 <SCRIPT src="/js/163css.js" type="text/javascript"></SCRIPT>
-<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"","bdStyle":"0","bdSize":"16"},"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>
+<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"","bdStyle":"0","bdSize":"16","onAfterClick":function(){$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"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>
 </body>
 </html>

core/src/web/templates/service/list.html

@@ -248,7 +248,7 @@
 					{{if eq "demand" $.T.querymap.c_searchtype}}
 						<!--抱歉！没有找到您所需要的需求。-->
 					{{else}}
-						<img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">
+						<img src="/images/404"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">
 						抱歉！没有找到您所需要的服务信息。您也可以直接发布需求，等服务商家与您联系。<br><br>
 						<button style="width:260px" class="btn btn-primary" onclick="window.location.href='/market/demand/add.html'"><b>发 需 求</b></button>
 					{{end}}

core/src/web/templates/service/viewsingledemand.html

@@ -196,7 +196,7 @@
     </div>
 	{{include "/service/bid.html"}}
 	<script charset="utf-8" src="/js/paging.js"></script>
-	<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"http://test.qimingxing.info/upload/2015/10/27/2015102708191301041479.jpg","bdStyle":"0","bdSize":"16"},"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>
+	<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"http://test.qimingxing.info/upload/2015/10/27/2015102708191301041479.jpg","bdStyle":"0","bdSize":"16","onAfterClick":function(){alert(1);$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"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>
 	<script>
 		loginBackType = -1;
 		setNavbarActive(0,2);

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

@@ -14,6 +14,16 @@
 <script src="/wxswordfish/main.js"></script>
 </head>
 <body>
+<div class="credit-tip visible">
+	<div class="tip">
+		<div>您添加了1个信息栏目（招标公告），确认后系统将每月扣除1000积分，您目前的积分余额是1500积分，扣除后将剩余500积分。</div>
+		<div class="tip-button">
+		<span id="credit_yes">提交</span>
+		<span id="credit_no">取消</span>
+		</div>
+		<div style="clear:both"></div>
+	</div>
+</div>
 	<ul class="operation">
 		<li class="parent-node">
 			<img src="/wxswordfish/images/zhaobiao.png">

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

@@ -41,15 +41,6 @@
 	</div>
 </div>
 
-<div class="dialog creditTip-dialog">
-	<div class="tip">
-		<div>您添加了1个信息栏目（招标公告），确认后系统将每月扣除1000积分，您目前的积分余额是1500积分，扣除后将剩余500积分。</div>
-		<div class="tip-button">
-		<span id="credit_yes">提交</span>
-		<span id="credit_no">取消</span>
-		</div>
-	</div>
-</div>
 
 <!--意见反馈-->
 <div class="dialog feedback-dialog">
@@ -91,7 +82,7 @@ $(function(){
 	//弹出框消失
 	$(".dialog").click(function(e){
 		var et=$(e.target)
-		if(et.hasClass("dialog")&&!et.hasClass("creditTip-dialog")){
+		if(et.hasClass("dialog")){
 			$(this).hide();
 			$("html,body").removeClass("overflow-hidden");
 		}

core/src/web/templates/yellowpage/enterpriseinfo_copy.html → core/src/web/templates/yellowpage/e.html

@@ -5,8 +5,8 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{.T.res.EntName}},{{.T.res.EntName}}地址,{{.T.res.EntName}}怎么样"/>
 <meta name="Description" content="{{.T.res.OpScope}}"/>
-<link href="/css/qfw-enterprise.css" rel="stylesheet">
-<script src="/js/qfw-geocoder.js"></script>
+<link href="/css/enterprise.css" rel="stylesheet">
+<script src="/js/geocoder.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217"></script>  
 <script src="/js/jquery.cxselect.js"></script>
 {{if .T.res.relation}}
@@ -387,6 +387,6 @@ var $entid = {{.T.res._id}};
 var ptlat=113.69884285509,  ptlng=34.791342526551;
 var $res = {{.T.res}};
 </script>
-<script src="/js/qfw-frontenterprise.js"></script>
+<script src="/js/frontenterprise.js"></script>
 
 </html>

core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -5,388 +5,13 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{.T.res.EntName}},{{.T.res.EntName}}地址,{{.T.res.EntName}}怎么样"/>
 <meta name="Description" content="{{.T.res.OpScope}}"/>
-<link href="/css/enterprise.css" rel="stylesheet">
+<link href="/css/entcommunity.css" rel="stylesheet">
 <script src="/js/geocoder.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217"></script>  
 <script src="/js/jquery.cxselect.js"></script>
-{{if .T.res.relation}}
-<script src="/js/d3.v3.min.js"></script>
-<script src="/js/geometry.js"></script>
-<script src="/js/qfwtable.js"></script>
-{{end}}
-<script>
-var entType="企业"
-</script>
+<script src="/js/entportrait.js"></script>
 </head>
 <body>
-<div class="hidden-xs">{{include "/common/head.html"}}</div>
-<div id="entinfobg">	
-<div class="a-content">
-	<!--标题-->
-	<div id="titleactionimgs" class="row qfw-row">
-		<div>
-		<h3>
-		{{if .T.res.EntName }}
-			{{.T.res.EntName}}
-			{{if .T.res.s_qq}}
-				<script type="text/javascript">
-				    var online = new Array();
-				</script>
-				<script type= "text/javascript" src="http://webpresence.qq.com/getonline?Type=1&{{.T.res.s_qq}}:"></script>
-				<script type="text/javascript">
-					var imgSrc = "";
-			        if(online[0] == 1) {
-						imgSrc = "/images/qq_online.gif";
-			        }else{
-						imgSrc = "/images/qq_offline.gif";
-					}
-					document.write('<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin={{.T.res.s_qq}}&site=qq&menu=yes"><img src="'+imgSrc+'" alt="点击这里给我发消息" title="点击这里给我发消息" border="0" /></a>');
-				</script>
-			{{end}}
-			{{if .T.res.s_microwebsite}}<span class="microwebsite visible-xs-inline"><i class="glyphicon weiguanwang"></i><a href="/ent/wsite/preview/{{.T.res.entid}}">微官网</a></span>{{end}}
-		{{end}}
-		</h3>
-		<!--企业认证图标--> 
-		<!--企业认证图标--> 
-		{{if .T.res.EntName }}
-			{{if .T.res.s_action}}
-				{{$identaction:=.T.res.s_action}}		
-				{{if eq $identaction "01"}}
-				<script>entType="企业"</script>
-					<span class="glyphicon qyrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证企业　</span> 
-						{{ if .T.res.i_comauthenttype }}
-								{{ if eq .T.res.i_comauthenttype 2}}
-									<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="color:#fff;margin-right:5px;">名片认证</small></span>					
-								{{else if eq .T.res.i_comauthenttype 1}}
-									<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="color:#fff;margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-								{{else if eq .T.res.i_comauthenttype 3}}
-									<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="color:#fff;margin-right:5px;">年报邮箱认证</small></span>
-								{{end}}
-						{{else}}
-								<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="color:#fff;margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-						{{end}}
-				{{else if eq $identaction "02"}}
-				<script>entType="商家"</script>
-					<span class="glyphicon grrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证个人</span>
-				{{else if eq $identaction "03"}}
-				<script>entType="机构"</script>
-					<span class="glyphicon jgrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证机构</span>
-				{{end}}
-			{{end}}
-		{{end}}
-		</div>
-	</div>
-	
-	<!--企业名片-->
-	{{if .T.res.s_persion}}	
-	<div class="row qfw-row qfw-p-margintop">
-		<div class="col-lg-12 border" id="our">
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon lianxiwomen icon_gray icon_large"></span>
-				<b><script>document.write(entType)</script>名片</b></h4>
-				<hr>
-				<!--企业名片详细信息-->				
-				{{if .T.res.s_persion }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxiren icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 5px;">联系人：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_persion}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_mobile }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidianhua icon_gray"></span></div> 
-						<div class="two">联系电话：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_mobile}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_enturl }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon wangzhi icon_gray"></span></div> 
-						<div class="two"><script>document.write(entType)</script>网站：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_enturl}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_qq }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon qq icon_gray"></span></div> 
-						<div class="two">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Q&nbsp;Q：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_qq}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_weixin }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon weixinhao icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 5px;">微信号：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_weixin}}</span>
-						{{if .T.res.s_weixinbarcode}}
-						&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="text-primary " onClick="viewBarCode({{.T.res.s_weixinbarcode}});">扫一扫</a>
-						{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address  }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidizhi icon_gray"></span></div> 
-						<div class="two">联系地址：</div> 
-						<div class="three">
-							<span class="span999" id="city_china">
-								<select  class="province cxselect select" id="provincesel" name="province" data-first-title="全国"></select>								
-								<select class="city cxselect select" id="citysel" name="city" data-first-title="选择市"></select>
-								<select class="area cxselect select" id="areasel" name="area" data-first-title="选择县"></select>
-							</span>
-							
-							<input id="location"  type="hidden">
-							<input id="cityname"  type="hidden">
-							{{if .T.res.s_address}}
-							<span class="glyphicon biaojidizhi icon_default text-primary" ></span> 	
-							<a href = "javascript:void(0)" onclick = "document.getElementById('mapshowdiv').style.display='block';document.getElementById('closeshowmap').style.display='block';document.getElementById('fade').style.display='block';">查看详细地图</a>
-							{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_synopsis}}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one" style="vertical-align: top;"><span class="glyphicon falvshengming icon_gray"></span> </div> 
-						<div class="two" style="vertical-align: top;"><script>document.write(entType)</script>介绍：</div> 
-						<div class="three">{{.T.res.s_synopsis}}</div>
-					</div> 
-				</div>
-				{{end}}
-				
-				
-			</div>
-		</div>
-	</div>	
-	<!--显示地图信息-->
-	<div id="mapshowdiv" class="white_content"></div>
-	<a href = "javascript:void(0)" onclick = "document.getElementById('mapshowdiv').style.display='none';document.getElementById('closeshowmap').style.display='none';document.getElementById('fade').style.display='none';"><div id="closeshowmap" class="closeshowmap">X</div></a>
-	<div id="fade" class="black_overlay"></div> 	
-	{{end}}	
-	
-	<!--产品服务-->	
-	<div class="row qfw-row qfw-p-margintop" id="service">
-		<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon fuwu icon_gray icon_large"></span>
-				<b>产品服务</b></h4>
-				<hr>
-				<div class="service_list" id="service_list">
-					<table style="width:100%;" class="text-muted mt"><tbody></tbody></table>
-					<div class="text-muted mt">该公司暂未发布服务信息</div>
-				</div>
-				<div class="op1 text-center" id="loadMore" onClick="loadMore()" >加载更多</div>
-			</div>
-		</div>
-	</div>
-	<!--公示信息-->
-	<div class="row qfw-row qfw-p-margintop" id="gs">
-		<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon gongshixinxi icon_gray icon_large"></span>
-				<b>公示信息</b>&nbsp{{if .T.res.gs }}<font id="qggs" style="font-size:12px;"><small>(来源：<a href="http://gsxt.saic.gov.cn/"  rel="nofollow" style="text-decoration: underline;color: #0099FF;">全国企业信用信息公示系统</a>)</small></font>{{end}}</h4>
-				<hr>
-				{{if .T.res.gs }}
-				{{if .T.res.RegNo }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zhucehao icon_gray"></span></div> 
-							<div class="two">注册号：<span class="span999">{{.T.res.RegNo}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.EntTypeName }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon qiyeleixing icon_gray"></span></div> 
-							<div class="two">类型： <span class="span999">{{.T.res.EntTypeName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.LeRep }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon faren icon_gray"></span></div> 
-							<div class="two">{{.T.res.EntTypeLabel}}：<span class="span999">{{.T.res.LeRep}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.RegCap }}
-					{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810")}}
-					 <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zican icon_gray"></span></div> 
-							<div class="two">注册资本：<span class="span999"><script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script> 万元</span></div> 
-						</div> 
-					</div>
-				    {{end}}
-				{{end}}
-				{{if .T.res.EstDate }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-							<div class="two">成立日期：<span class="span999">{{.T.res.EstDate}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.Dom }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zhusuo icon_gray"></span></div> 
-							<div class="two">住所： <span class="span999">{{.T.res.Dom}} </span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.OpStateName }}
-				 	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon dengjizhuangtai icon_gray"></span></div> 
-							<div class="two">登记状态：<span class="span999">{{.T.res.OpStateName}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.OpFrom }}
-					<div class="tablediv"> 
-					    <div class="rowcontent"> 
-					        <div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-					        <div class="two">营业期限：<span class="span999">自{{.T.res.OpFrom}}
-							{{if .T.res.OpTo }}至{{.T.res.OpTo }}{{end}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.res.OpScope }}
-				   <div class="tablediv"> 
-					    <div class="rowcontent"> 
-					        <div class="one"><span class="glyphicon jingyingfanwei icon_gray"></span></div> 
-					        <div class="two">经营范围：<span class="span999">{{.T.res.OpScope}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.res.RegOrgName }}
-					<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon dengjijiguan icon_gray"></span></div> 
-							<div class="two">登记机关：<span class="span999">{{.T.res.RegOrgName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.IssBLicDate }}
-					<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-							<div class="two">核准日期：<span class="span999">{{.T.res.IssBLicDate}} </span> </div> 
-						</div> 
-					</div>
-			 	{{end}}				
-				{{end}}
-			</div>
-		</div>
-	</div>	
-	<!--关系网-->
-	<div class="row qfw-row qfw-p-margintop" id="gx">
-			<div class="col-lg-12 border padding-r-0" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon guanxiwang icon_gray icon_large"></span>
-				<b>关系网</b></h4>
-				<hr>
-				<div id="gxw_bs">
-				</div>
-				
-				<div id="infovis">			
-					 <div class="controlls  hidden-sm hidden-xs">
-						<div class="item" >
-							<div id="op_fullscreen" class="ico_box" title_pos="left"><div class="ico_fullscreen"></div></div>
-						</div>
-					</div>
-					
-				</div>
-			</div>
-		</div>
-	
-	</div>
-
-</div>
-</div>
-
-
-
-<!--弹出窗口显示上传的图片-->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
-   aria-labelledby="myModalLabel" aria-hidden="true">
-   <div class="modal-dialog mimg">
-        <div class="modal-content" style="width:400px;">
-         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" style="margin-top: -10px;"
-               aria-hidden="true">×
-            </button>
-         </div>
-         <div class="modal-body" id="viewImgs" onclick="hideImgs()" style="cursor:pointer;text-align: center;" >
-            
-         </div>
-      </div><!-- /.modal-content -->
-   </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
-<!--右侧导航菜单-->
-{{include "/common/rightnavbtn.html"}}
-<!--右侧导航菜单-->
-{{include "/common/bottom.html"}}
+{{include "/common/enthead.html"}}
 </body>
-<script type="text/javascript">
-
-setNavbarActive(2);
-
-var entsel="",btempwords,chf1,czb;
-
-//企业信息ID
- var id = {{.T.res._id}}
-//公式信息的变量
-var $gs = {{.T.res.gs}};
-//关系网上的变量
-var  $relationlen = {{len .T.res.relation.links}};
-
-//服务模板
-var template_content = "<tr><td><div class='row service_row'> "
-+"<div class='col-sm-1'><div style='width:120px; height:120px; background-color:#eee;'><img class='hidden-xs' src='${s_images}' style='width:120px;height:120px'></div></div>"
-+" <div class='col-sm-9'>"
-+"<div class='linebser service_des'><div class='servicename text-primary'><a class='text-primary' target='_blank' onclick='clickservicename(\"${_id}\",\"${s_isshow}\")'>${s_name}</a></div><div class='text-muted'>${s_introduction}</div></div>"
-+"</div></td><tr>"
-//关系网数据
-data= {{.T.res.relation}};
-//注册号
-var regno="{{.T.res.RegNo}}";
-
-var legcerno = "{{.T.res.LegCerNO}}";
-var lerep="{{.T.res.LeRep}}";
-//联系地址
-var province = {{.T.res.i_province}};
-var city = {{.T.res.i_city}};
-var area = {{.T.res.i_area}};
-var as1="{{.T.res.s_address}}";
-var $chiancity= false,$listent=false;
-{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address  }}
-	$chiancity= true;
-{{end}}
-
-var $resdata = {{.T.res.data}};
-var $entid = {{.T.res._id}};
-//定义默认的郑州经纬度
-var ptlat=113.69884285509,  ptlng=34.791342526551;
-var $res = {{.T.res}};
-</script>
-<script src="/js/frontenterprise.js"></script>
-
 </html>

core/src/web/templates/yellowpage/error.html

@@ -9,10 +9,10 @@
 	</div>
 	<div class="row" style="margin:50px 0;">
 		<div class="col-lg-6 col-md-6 col-sm-6 " style="text-align:right">
-		 <img src="/images/u20.png" />
+		 <img src="/images/findnull.png" class="b-findnull"/>
 		</div>
-		<div class="col-lg-6 col-md-6 col-sm-6 " style="padding-top: 120px;">
-			<div style="text-indent:20px;"><h4><span  class="bootstrap-glyphicon glyphicon glyphicon-question-sign text-primary"></span >&nbsp;<strong class="text-muted">抱歉！企明星网站暂未收录该企业信息。</strong></h4></div>
+		<div class="col-lg-6 col-md-6 col-sm-6 " style="padding-top: 70px;">
+			<div style="text-indent:20px;"><h4><strong class="text-muted">抱歉！企明星网站暂未收录该企业信息。</strong></h4></div>
 		</div>
 	</div>
 	</div>

credit/src/config.json

@@ -1,83 +1,95 @@
 {
-	"redisServers": "credit=192.168.3.14:3379",
-	"redisSize":100,
-	"redisIdle":50,
-	"redisTimeout":180,
+    "redisServers": "credit=192.168.3.14:3379",
+    "redisSize": 100,
+    "redisIdle": 50,
+    "redisTimeout": 180,
     "mongodbServers": "192.168.3.18:27080",
     "mongodbPoolSize": 5,
     "mongodbName": "qfw",
-	"rpcPort":"8765",
-	"weixinrpc":"127.0.0.1:82",
-	"num":{
-		"a1":10,
-		"a2":10,
-		"a3":10,
-		"a4":10,
-		"a5":10,
-		"a6":10,
-		"a7":10,
-		"a8":10,
-		"b1":10,
-		"b1_1":10,
-		"b1_n":7,
-		"b2":10,
-		"b2_1":20,
-		"b2_n":3,
-		"b3":10,
-		"b3_1":20,
-		"b3_n":3,
-		"b4":10,
-		"b4_1":20,
-		"b4_n":3,
-		"c1":10,
-		"c2":10,
-		"c3":10,
-		"A1":-1000,
-		"A2":-1000
-	},
-	"message":{
-		"swordfish_dueTitle":"剑鱼服务提醒",
-		"swordfish_due":"您的剑鱼服务%d天后到期，请及时续费。",
-		"swordfish_closeTitle":"剑鱼服务暂停提醒",
-		"swordfish_close":"您的剑鱼服务已经到期,已经暂停，请及时续费。",
-		"swordfish_payTitle":"剑鱼服务订单提醒",
-		"swordfish_pay":"您已成功续订剑鱼，扣除积%d，剩余积分%d，剑鱼时长延期到%s",
-		"give":"转赠提醒",
-		"give_pay":"转赠扣除提醒",
-		"recharge":"充值成功提醒",
-		"txt_a1":"注册",
-		"txt_a2":"认证",
-		"txt_a3":"创建名片",
-		"txt_a4":"绑定邮箱",
-		"txt_a5":"绑定手机",
-		"txt_a6":"收藏名片",
-		"txt_a7":"收藏服务",
-		"txt_a8":"使用剑鱼",
-
-		"txt_b1":"签到",
-		"txt_b2":"发服务",
-		"txt_b3":"发需求",
-		"txt_b4":"分享服务",
-		"txt_c1":"交易",
-		"txt_c2":"评价",
-		"txt_c3":"推广用户",
-		
-		"txt_d1":"微信充值",
-		"txt_e1":"二维码转入",
-		"txt_A1":"剑鱼招标",
-		"txt_A2":"剑鱼中标",
-		"txt_B1":"转赠"
-	},
-	"smtp": {
+    "rpcPort": "8765",
+    "weixinrpc": "127.0.0.1:82",
+    "num": {
+        "a1": 50,
+        "a2": 100,
+        "a3": 50,
+        "a4": 50,
+        "a5": 50,
+        "a6": 50,
+        "a7": 50,
+        "a8": 50,
+        "a9": 50,
+        "a10": 50,
+        "a11": 50,
+        "a12": 50,
+        "a13": 50,
+        "a14": 100,
+        "a15": 80,
+        "b1": 10,
+        "b1_1": 10,
+        "b1_n": 7,
+        "b2": 10,
+        "b2_n": 5,
+        "b3": 20,
+        "b3_n": 3,
+        "b4": 20,
+        "b4_n": 3,
+        "b5": 20,
+        "b5_n": 2,
+        "c1": 100,
+        "c2": 80,
+        "c3": 150,
+        "A1": -1000,
+        "A2": -1000
+    },
+    "message": {
+        "swordfish_dueTitle": "剑鱼服务提醒",
+        "swordfish_due": "您的剑鱼服务%d天后到期，请及时续费。",
+        "swordfish_closeTitle": "剑鱼服务暂停提醒",
+        "swordfish_close": "您的剑鱼服务已经到期,已经暂停，请及时续费。",
+        "swordfish_payTitle": "剑鱼服务订单提醒",
+        "swordfish_pay": "您已成功续订剑鱼，扣除积%d，剩余积分%d，剑鱼时长延期到%s",
+        "give": "转赠提醒",
+        "give_pay": "转赠扣除提醒",
+        "recharge": "充值成功提醒",
+        "txt_a1": "注册",
+        "txt_a2": "认证",
+        "txt_a3": "创建名片",
+        "txt_a4": "绑定邮箱",
+        "txt_a5": "绑定手机",
+        "txt_a6": "收藏名片",
+        "txt_a7": "收藏服务",
+        "txt_a8": "使用剑鱼",
+        "txt_a9": "使用企业查询",
+        "txt_a10": "发服务",
+        "txt_a11": "发需求",
+        "txt_a12": "查看关系网",
+        "txt_a13": "分享服务",
+        "txt_a14": "完成交易",
+        "txt_a15": "完成交易评价",
+        "txt_b1": "签到",
+        "txt_b2": "企业查询",
+        "txt_b3": "发服务",
+        "txt_b4": "发需求",
+        "txt_b5": "分享服务/需求",
+        "txt_c1": "交易",
+        "txt_c2": "评价",
+        "txt_c3": "邀请用户",
+        "txt_d1": "微信充值",
+        "txt_e1": "二维码转入",
+        "txt_A1": "剑鱼招标",
+        "txt_A2": "剑鱼中标",
+        "txt_B1": "转赠"
+    },
+    "smtp": {
         "addr": "smtp.exmail.qq.com",
         "port": 465,
         "user": "qyfw@topnet.net.cn",
         "pwd": "qy123456",
         "fromuser": "企明星",
-		"touser":"renzheng@topnet.net.cn,zhanghongbo@topnet.net.cn"
+        "touser": "zhangjinkun@topnet.net.cn"
     },
-	"saveLogDuration":1,
-	"checkGiveDuration":30,
-	"swordfish_tipBeforeDays":"3,1",
-	"swordfish_subHour":18
+    "saveLogDuration": 1,
+    "checkGiveDuration": 30,
+    "swordfish_tipBeforeDays": "3,1",
+    "swordfish_subHour": 18
 }

credit/src/main.go

@@ -142,11 +142,12 @@ func TimerSwordFish() {
 			util.Try(func() {
 				session := mongodb.GetMgoConn()
 				defer mongodb.DestoryMongoConn(session)
+				coll := session.DB("qfw").C(creditlog.TB)
 				for code, typeName := range map[string]string{
 					"A1": "tender",
 					"A2": "bid",
 				} {
-					query := session.DB("qfw").C(creditlog.TB).Find(&map[string]interface{}{
+					query := coll.Find(&map[string]interface{}{
 						"s_code": code,
 						"l_enddate": map[string]interface{}{
 							"$gte": next64 - 600,
@@ -159,12 +160,17 @@ func TimerSwordFish() {
 						sub64 := (endDate - next64) / (24 * 3600)
 						if sub64 == 0 {
 							//自动扣费
-							doSubCredit(tmp["s_userid"].(string), tmp["s_uid"].(string), typeName, code, &next)
+							errs := coll.UpdateId(tmp["_id"], &map[string]interface{}{"$set": map[string]interface{}{
+								"i_valid": 0,
+							}})
+							if errs == nil {
+								doSubCredit(tmp["s_uid"].(string), tmp["s_umid"].(string), typeName, code, &next)
+							}
 						} else {
 							//提示
 							for _, v := range swordfish_tipBeforeDays {
 								if int64(v) == sub64 {
-									SendMsgWebAndWx(swordfish_dueTitle, fmt.Sprintf(swordfish_due, v), tmp["s_userid"].(string), tmp["s_uid"].(string))
+									SendMsgWebAndWx(swordfish_dueTitle, fmt.Sprintf(swordfish_due, v), tmp["s_uid"].(string), tmp["s_umid"].(string))
 								}
 							}
 						}
@@ -182,41 +188,48 @@ func TimerSwordFish() {
 }
 
 //自动扣费
-func doSubCredit(userId, uid, typeName, code string, next *time.Time) {
-	user := mongodb.FindById("user", uid, `{"i_credit":1,"o_msgset."`+typeName+`.i_status":1,"_id":0}`)
+func doSubCredit(userId, umid, typeName, code string, next *time.Time) {
+	//是否生效和是否启用
+	user := mongodb.FindById("user", userId, `{"i_credit":1,"o_msgset."`+typeName+`.i_status":1,"o_msgset."`+typeName+`.i_switchstatus":1,"_id":0}`)
 	if *user != nil {
 		util.Try(func() {
-			i_status := util.IntAllDef((*user)["o_msgset"].(map[string]interface{})[typeName].(map[string]interface{})["i_status"], -1)
-			if i_status == 1 { //如果是1
-				i_credit := util.IntAllDef((*user)["i_credit"], 0)
-				bsub := false
-				codeNum := util.IntAll(SysConfig[code])
-				restNum := i_credit + codeNum
-				if i_credit > 0 && restNum > -1 {
-					bsub = true
-				}
-				if bsub { //扣分操作
-					newDate := next.AddDate(0, 1, 0)
-					creditDoc := map[string]interface{}{
-						"s_uid":     uid,
-						"s_userid":  userId,
-						"s_code":    code,
-						"i_type":    0,
-						"l_date":    next.Unix(),
-						"l_enddate": newDate.Unix(),
-						"i_score":   codeNum,
-					}
-					if creditlog.Save(creditDoc) {
-						//发送微信通知扣积分成功
-						SendMsgWebAndWx(swordfish_payTitle, fmt.Sprintf(swordfish_pay, -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, uid)
-					}
-				} else { //暂停操作
-					//更新操作
-					if mongodb.Update("user", `{"_id":"`+userId+`"}`, `{"$set":{"o_msgset.`+typeName+`.i_status":0}}`, false, false) {
-						//暂停通知,因积分不够
-						SendMsgWebAndWx(swordfish_closeTitle, swordfish_close, userId, uid)
+			obj_type := (*user)["o_msgset"].(map[string]interface{})[typeName].(map[string]interface{})
+			if obj_type != nil {
+				if util.IntAll(obj_type["i_status"]) == 1 && util.IntAll(obj_type["i_switchstatus"]) == 1 {
+					i_credit := util.IntAllDef((*user)["i_credit"], 0)
+					bsub := false
+					codeNum := util.IntAll(SysConfig[code])
+					restNum := i_credit + codeNum
+					if i_credit > 0 && restNum > -1 {
+						bsub = true
 					}
+					if bsub { //扣分操作
+						newDate := next.AddDate(0, 1, 0)
+						creditDoc := map[string]interface{}{
+							"s_uid":     userId,
+							"s_umid":    umid,
+							"s_code":    code,
+							"i_type":    0, //是扣
+							"l_date":    next.Unix(),
+							"l_enddate": newDate.Unix(),
+							"i_score":   codeNum,
+							"i_valid":   1,
+							"s_type":    typeName,
+						}
 
+						if creditlog.Save(creditDoc) {
+							//发送微信通知扣积分成功
+							SendMsgWebAndWx(swordfish_payTitle, fmt.Sprintf(swordfish_pay, -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, umid)
+						}
+
+					} else { //暂停操作
+						//更新操作
+						if mongodb.Update("user", `{"_id":"`+userId+`"}`, `{"$set":{"o_msgset.`+typeName+`.i_status":0}}`, false, false) {
+							//暂停通知,因积分不够
+							SendMsgWebAndWx(swordfish_closeTitle, swordfish_close, userId, umid)
+						}
+
+					}
 				}
 			}
 		}, func(e interface{}) {
@@ -227,7 +240,7 @@ func doSubCredit(userId, uid, typeName, code string, next *time.Time) {
 }
 
 //发送微信和站内信通知
-func SendMsgWebAndWx(title, content, userId, uid string) {
+func SendMsgWebAndWx(title, content, userId, umid string) {
 	m := &msg.Msg{
 		Msgtype:   1,
 		Title:     title,
@@ -235,6 +248,6 @@ func SendMsgWebAndWx(title, content, userId, uid string) {
 		ReceiveId: userId,
 	}
 	go m.SaveMsg()
-	go creditrpc.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: uid, Title: title, Detail: "管理员", Remark: content})
+	go creditrpc.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: umid, Title: title, Detail: "管理员", Remark: content})
 
 }

credit/src/qfw/creditlog/creditlog.go

@@ -41,11 +41,24 @@ func Save(doc map[string]interface{}) bool {
 		Failed("保存到日志记录失败，" + string(v))
 	} else {
 		//更新积分 i_credit到人
-		b = mongodb.Update("user", `{"_id":"`+doc["s_uid"].(string)+`"}`, &map[string]interface{}{
-			"$inc": map[string]int{
-				"i_credit": doc["i_score"].(int),
-			},
-		}, false, false)
+		if doc["s_code"].(string) == "A1" {
+			b = mongodb.Update("user", `{"_id":"`+doc["s_uid"].(string)+`"}`, &map[string]interface{}{
+				"$inc": map[string]int{
+					"i_credit": doc["i_score"].(int),
+				},
+				"$set": map[string]interface{}{
+					"o_msgset." + doc["s_type"].(string) + ".l_enddate": doc["l_enddate"],
+					"o_msgset." + doc["s_type"].(string) + ".i_status":  1,
+				},
+			}, false, false)
+		} else {
+			b = mongodb.Update("user", `{"_id":"`+doc["s_uid"].(string)+`"}`, &map[string]interface{}{
+				"$inc": map[string]int{
+					"i_credit": doc["i_score"].(int),
+				},
+			}, false, false)
+		}
+
 		if !b {
 			v, _ := json.Marshal(doc)
 			Failed("更新mongodb中积分失败，" + string(v))
@@ -76,7 +89,7 @@ func SaveLog() {
 					coll := sess.DB("qfw").C("user")
 					var err error
 					for _, v := range tmp {
-						err = coll.UpdateId(bson.ObjectIdHex(v["uid"].(string)), &map[string]interface{}{
+						err = coll.UpdateId(bson.ObjectIdHex(v["s_uid"].(string)), &map[string]interface{}{
 							"$inc": map[string]int{
 								"i_credit": v["i_score"].(int),
 							},

credit/src/qfw/creditrpc/creditrpc.go

@@ -50,10 +50,15 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 			"l_date": time.Now().Unix(),
 		}
 		switch first {
-		case "a", "d", "e": //立即生效
+		case "a": //立即生效
 			creditDoc["i_score"] = Score[param.Code]
 			if creditlog.Save(creditDoc) {
-				*replay = 1
+				*replay = creditDoc["i_score"].(int)
+			}
+		case "d", "e":
+			creditDoc["i_score"] = util.If(param.Num > 0, param.Num, Score[param.Code]).(int)
+			if creditlog.Save(creditDoc) {
+				*replay = creditDoc["i_score"].(int)
 			}
 		case "b":
 			key := param.Code + "_" + param.Uid
@@ -81,6 +86,7 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 							redis.Put(consts.RedisDB, key, newobj, GetSubSecond(int(newobj[2]-thist)))
 							redis.Put(consts.RedisDB, daykey, true, GetSubSecond(1))
 							creditlog.AddLog(creditDoc)
+							*replay = creditDoc["i_score"].(int)
 						} else {
 							//不是连续签到
 							bcon = false
@@ -98,20 +104,22 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 						redis.Put(consts.RedisDB, key, newobj, GetSubSecond(int(newobj[2])))
 						redis.Put(consts.RedisDB, daykey, true, GetSubSecond(1))
 						creditlog.AddLog(creditDoc)
+						*replay = creditDoc["i_score"].(int)
 					}
 				}
 			} else {
 				obj := redis.Get(consts.RedisDB, key)
 				if obj != nil {
-					newobj := obj.([]int)
+					newobj := util.InterfaceArrTointArr(obj.([]interface{}))
 					if newobj[0] == 0 {
-						newobj[1] += 1
+						newobj[1] = newobj[1] + 1
 						if newobj[1] == Score[param.Code+"_n"] {
 							newobj[0] = 1
 						}
 						redis.Put(consts.RedisDB, key, newobj, GetSubSecond(1))
 						creditDoc["i_score"] = Score[param.Code]
 						creditlog.AddLog(creditDoc)
+						*replay = creditDoc["i_score"].(int)
 					}
 				} else {
 					times := Score[param.Code+"_n"]
@@ -123,16 +131,60 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 					creditDoc["i_score"] = Score[param.Code]
 					redis.Put(consts.RedisDB, key, newobj, GetSubSecond(1))
 					creditlog.AddLog(creditDoc)
+					*replay = creditDoc["i_score"].(int)
 				}
 			}
 			lock.Unlock()
 			//
+		case "c":
+			lock := GetMutex(param.Uid)
+			lock.Lock()
+			if param.Code == "c1" { //交易
+				objid := param.OtherParam["objid"]
+				if objid != nil {
+					key := param.Code + "_" + param.Uid + "_" + objid.(string)
+					if redis.Get(consts.RedisDB, key) == nil {
+						creditDoc["i_score"] = Score[param.Code]
+						creditDoc["s_objid"] = objid.(string)
+						newDoc := map[string]interface{}{
+							"s_uid":      objid.(string),
+							"s_code":     param.Code,
+							"i_type":     1,
+							"s_sourceid": param.Uid,
+							"l_date":     time.Now().Unix(),
+							"i_score":    Score[param.Code],
+						}
+						creditlog.AddLog(creditDoc)
+						creditlog.AddLog(newDoc)
+						redis.Put(consts.RedisDB, key, true, GetSubSecond(1))
+						*replay = creditDoc["i_score"].(int)
+					}
+				}
+			} else if param.Code == "c2" { //评价
+				objid := param.OtherParam["serviceid"] //服务商id
+				if objid != nil {
+					key := param.Code + "_" + param.Uid + "_" + objid.(string)
+					if redis.Get(consts.RedisDB, key) == nil {
+						creditDoc["i_score"] = Score[param.Code]
+						creditDoc["o_param"] = param.OtherParam
+						creditlog.AddLog(creditDoc)
+						redis.Put(consts.RedisDB, key, true, GetSubSecond(1))
+						*replay = creditDoc["i_score"].(int)
+					}
+				}
+			} else {
+				creditDoc["i_score"] = Score[param.Code]
+				creditDoc["o_param"] = param.OtherParam
+				creditlog.AddLog(creditDoc)
+				*replay = creditDoc["i_score"].(int)
+			}
+			lock.Unlock()
 		default: //定时任务
 			sc := util.If(param.Num > 0, param.Num, Score[param.Code]).(int)
 			if sc > 0 {
 				creditDoc["i_score"] = sc
 				creditlog.AddLog(creditDoc)
-				*replay = 1
+				*replay = creditDoc["i_score"].(int)
 			}
 		}
 	}
@@ -146,24 +198,32 @@ func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 	lock.Lock()
 	if len(param.Code) > 1 && Message[("txt_"+param.Code)] != "" {
 		first := param.Code[:1]
+		now := time.Now()
 		creditDoc := map[string]interface{}{
 			"s_uid":   param.Uid,
+			"s_umid":  param.Umid,
 			"s_code":  param.Code,
 			"i_type":  0,
-			"l_date":  time.Now().Unix(),
+			"l_date":  now.Unix(),
 			"i_score": param.Num,
 		}
 		if param.OtherParam != nil && param.OtherParam["i_way"] != nil {
 			creditDoc["i_way"] = param.OtherParam["i_way"]
 		}
 		switch first {
+		case "A":
+			creditDoc["l_enddate"] = now.AddDate(0, 1, 0).Unix()
+			creditDoc["i_valid"] = 1
+			if param.OtherParam != nil {
+				creditDoc["s_type"] = param.OtherParam["s_type"]
+			}
 		case "B":
 			creditDoc["i_givestatus"] = 0
 		}
 		if creditlog.Save(creditDoc) {
 			*replay = 1
 			//发送微信通知扣积分成功
-			go SendWeixin(param.Num, param.Uid, "")
+			go SendWeixin(param.Num, param.Umid, "")
 		}
 	}
 	lock.Unlock()

push/src/qfw/push/bid/bidpushjob.go

@@ -194,6 +194,7 @@ func sendWeixin(k *push.MemberInterest, TITLE, str, nowtime, wxstr string, now t
 		"s_content":     str,
 		"s_type":        "bid",
 		"a_publishtime": publishTimes,
+		"i_size":        len(publishTimes),
 	}
 	wid := mongodb.Save("wxpush", &wxpush)
 	wxstr = "\n点击下方“详情”查看详细信息。\n以上中标信息，是剑鱼根据关键字“" + strings.Join(k.Interest, ";") + "”奋力查找并推送，如不合您心意，请猛戳企明星菜单“会员服务—剑鱼”进行修改。"

push/src/qfw/push/tender/tenderpushjob.go

@@ -191,6 +191,7 @@ func sendWeixin(k *push.MemberInterest, TITLE, str, nowtime, wxstr string, now t
 		"s_content":     str,
 		"s_type":        "tender",
 		"a_publishtime": publishTimes,
+		"i_size":        len(publishTimes),
 	}
 	wid := mongodb.Save("wxpush", &wxpush)
 	wxDate := ""

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"
+        }
+
 }