merger

core/src/qfw/coreutil/weixinrpc.go

@@ -36,24 +36,6 @@ func SendManagerNotifyMsg(p *qrpc.NotifyMsg) {
 
 }
 
-//微信远程调用，实现模板发送图文消息
-func SendImgTextMsg(p *qrpc.ImgTextMsg) {
-	util.Try(func() {
-		client, err := rpc.DialHTTP("tcp", rpcserver)
-		defer client.Close()
-		if err != nil {
-			log.Println(err.Error())
-			return
-		}
-		var repl qrpc.RpcResult
-		err = client.Call("WeiXinRpc.SendImgTextMsg", p, &repl)
-		if err != nil {
-			log.Println(err.Error())
-		}
-	}, func(e interface{}) {})
-
-}
-
 //微信远程调用，实现模板发送消息
 func SendIdentifyTplMsg(p *qrpc.NotifyMsg) {
 	util.Try(func() {

core/src/qfw/coreutil/weixinrpc_test.go

@@ -30,13 +30,18 @@ func TestWeixinRpc(t *testing.T) {
 	//ff, _ := ioutil.ReadFile("../../test.png") //我还是喜欢用这个快速读文件
 	log.Println(itm)
 	//UploadMedia(&qrpc.File{Openid: "oJULtw8sMXxZX7b-DvqpxIdl47zg", Data: ff})
-	SendImgTextMsg(itm)
+	//SendImgTextMsg(itm)
 	s := &qrpc.NotifyMsg{
-		Openid: "oJULtw8sMXxZX7b-DvqpxIdl47zg",
+		Openid: "o8-2pwHj1s_tv3nnRxrH9cD2ngkk",
+		Title:  "识别验证码",
+		Detail: "企明星",
+		Result: "您有一个待识别的验证码，点击下方“详情”查看",
+		Url:    "http://www.qmx.top/images/logo.png",
 	}
-	log.Println(s)
+	//log.Println(s)
 	//SendIdentifyTplMsg(s)
 	//PostImage(&qrpc.NotifyMsg{Openid: "oJULtw8sMXxZX7b-DvqpxIdl47zg"})
+	SendManagerNotifyMsg(s)
 }
 
 type MsgStruct struct {
@@ -130,3 +135,13 @@ func Test_credit(t *testing.T) {
 	client.Call("CreditRpc.InCreadit", &data, &reply)
 	log.Println("reply:", reply)
 }
+func Test_dddda(t *testing.T) {
+	var s []map[string]interface{}
+	s = append(s, map[string]interface{}{"bbb": 1, "aaa": 2})
+	ss := new([]map[string]interface{})
+	ss = &s
+	for _, v := range *ss {
+		delete(v, "aaa")
+	}
+	log.Println(s)
+}

core/src/qfw/manage/auditing.go

@@ -85,19 +85,41 @@ func (s *SystemManage) Countlist() {
 	comparebefore := s.GetString("comparebefore")
 	compareafter := s.GetString("compareafter")
 	comparetype := s.GetString("comparetype")
-	//第一条图标数据
-	t1, _ := time.ParseInLocation("2006-01-02 15:04:05", timebefore+" 00:00:00", time.Local)
-	t2, _ := time.ParseInLocation("2006-01-02 15:04:05", timeafter+" 23:59:59", time.Local)
-	condition := M{"intime": M{"$gte": t1.Unix(), "$lte": t2.Unix()}}
-	fields := M{comparetype: 1, "intime": 1}
-	timers := *Find("tj", condition, `{"intime": 1}`, fields, false, -1, -1)
-	//第二条图标数据
-	c1, _ := time.ParseInLocation("2006-01-02 15:04:05", comparebefore+" 00:00:00", time.Local)
-	c2, _ := time.ParseInLocation("2006-01-02 15:04:05", compareafter+" 23:59:59", time.Local)
-	condition = M{"intime": M{"$gte": c1.Unix(), "$lte": c2.Unix()}}
-	fields = M{comparetype: 1, "intime": 1}
-	cors := *Find("tj", condition, `{"intime": 1}`, fields, false, -1, -1)
-	s.ServeJson(M{"t": timers, "c": cors})
+	checked := s.GetString("checked")
+
+	if comparetype != "nfish" {
+		//第一条图标数据
+		t1, _ := time.ParseInLocation("2006-01-02 15:04:05", timebefore+" 00:00:00", time.Local)
+		t2, _ := time.ParseInLocation("2006-01-02 15:04:05", timeafter+" 23:59:59", time.Local)
+		condition := M{"intime": M{"$gte": t1.Unix(), "$lte": t2.Unix()}}
+		fields := M{comparetype: 1, "intime": 1}
+		timers := *Find("tj", condition, `{"intime": 1}`, fields, false, -1, -1)
+		//第二条图标数据
+		cors := make([]map[string]interface{}, 0)
+		if checked == "1" {
+			c1, _ := time.ParseInLocation("2006-01-02 15:04:05", comparebefore+" 00:00:00", time.Local)
+			c2, _ := time.ParseInLocation("2006-01-02 15:04:05", compareafter+" 23:59:59", time.Local)
+			condition = M{"intime": M{"$gte": c1.Unix(), "$lte": c2.Unix()}}
+			fields = M{comparetype: 1, "intime": 1}
+			cors = *Find("tj", condition, `{"intime": 1}`, fields, false, -1, -1)
+		}
+		s.ServeJson(M{"t": timers, "c": cors})
+	} else {
+		t1, _ := time.ParseInLocation("2006-01-02 15:04:05", timebefore+" 00:00:00", time.Local)
+		t2, _ := time.ParseInLocation("2006-01-02 15:04:05", timeafter+" 00:00:00", time.Local)
+		condition := M{"l_date": M{"$gte": t1.Unix(), "$lte": t2.Unix()}}
+		timers := *Find("web_viewcount", condition, `{"l_date": 1}`, `{"l_date":1,"i_viewcount":1}`, false, -1, -1)
+		ns := make([]map[string]interface{}, 0)
+		for _, v := range timers {
+			var tmp = make(map[string]interface{})
+			tmp["_id"] = v["_id"]
+			tmp["intime"] = v["l_date"]
+			tmp["nfish"] = v["i_viewcount"]
+			ns = append(ns, tmp)
+		}
+		log.Println(ns)
+		s.ServeJson(M{"t": ns, "c": "[]"})
+	}
 }
 
 func (s *SystemManage) Count() {

core/src/qfw/member/membermanager.go

@@ -1401,6 +1401,9 @@ func getSmsCount(value string) int {
 //我关注的企业
 func (m *Member) MyFollowEnts() error {
 	r := Find("follow_enterprise", `{"s_userid":"`+m.GetSession("userId").(string)+`"}`, `{"l_createdate":-1}`, `{"_id":1,"s_entid":1}`, false, -1, -1)
+	pcVisit, _ := m.GetSession("pcVisit").(bool)
+	regex, _ := regexp.Compile("(Android|Mobile)")
+	ismobile := len(regex.FindAllString(m.Header("User-Agent"), -1)) > 0 && !pcVisit
 	if r != nil && len(*r) > 0 {
 		var entIds string
 		for k, v := range *r {
@@ -1477,5 +1480,9 @@ func (m *Member) MyFollowEnts() error {
 		}
 		m.T["ents"] = ents
 	}
+
+	if ismobile {
+		return m.Render("/member/incmobile/myfollow.html", &m.T)
+	}
 	return m.Render("/member/myfollow.html", &m.T)
 }

core/src/qfw/member/service.go

@@ -20,6 +20,8 @@ import (
 	"time"
 )
 
+type K map[string]interface{}
+
 type Service struct {
 	*xweb.Action
 	save   xweb.Mapper `xweb:"/member/service/save"`        //增加服务
@@ -166,8 +168,9 @@ func (yp *Service) Save() error {
 	}
 	if tempFlag {
 		//删除缓存信息
-		redis.Del("enterprise", "enterpriseInfo_"+enterpriseid)
-		redis.DelByCodePattern("enterprise", "service-"+enterpriseid+"-*")
+		if len(serviceid) == 0 {
+			redis.Del("enterprise", "enterpriseInfo_"+enterpriseid)
+		}
 		//将数据存到elastic中
 		flag2 := elastic.UpdateNewDoc("service", "service", doc)
 		//Insertservicenames(enterpriseid)
@@ -308,7 +311,6 @@ func (u *Service) Del() error {
 		flag := mongodb.Del("service", query)
 		if flag {
 			//再删除elasticsearch中的数据
-			redis.DelByCodePattern("enterprise", "service-"+entid.(string)+"-*")
 			flag2 := elastic.DelById(index, itype, id)
 			if flag2 {
 				u.ServeJson(&map[string]interface{}{
@@ -363,7 +365,6 @@ func (u *Service) Remove() error {
 			sid := strings.Split(fmt.Sprintf("%s", obj["_id"]), `"`)[1]
 			flag := mongodb.Update("service", `{"_id":"`+sid+`"}`, bson.M{"$set": bson.M{"i_status": 1}}, false, false)
 			if flag {
-				redis.DelByCodePattern("enterprise", "service-"+entid.(string)+"-*")
 				//修改elasticsearch中的数据
 				isUpdate := elastic.UpdateNewDoc(index, itype, mongodb.FindById("service", sid, nil))
 

core/src/qfw/member/yellowpage.go

@@ -5,6 +5,7 @@
 package member
 
 import (
+	"fmt"
 	"github.com/go-xweb/xweb"
 	"gopkg.in/mgo.v2/bson"
 	"log"
@@ -15,24 +16,40 @@ import (
 	"qfw/util/elastic"
 	. "qfw/util/fsw"
 	"qfw/util/mongodb"
+	mongodbutil "qfw/util/mongodbutil"
 	"qfw/util/redis"
 	yps "qfw/yellowpage"
+	"strings"
 	"time"
 )
 
-type K map[string]interface{}
 type Yellowpage struct {
 	*xweb.Action
 	editEnterprise xweb.Mapper `xweb:"/member/enterprise/edit"`              //编辑
 	showEnterprise xweb.Mapper `xweb:"/member/enterprise/show"`              //显示企黄页信息
-	save           xweb.Mapper `xweb:"/member/yellowpage/save"`              //保存企业黄页信息
-	upLoadEntImg   xweb.Mapper `xweb:"POST /member/yellowpage/upLoadEntImg"` //上传企业相关图片
+	save           xweb.Mapper `xweb:"/member/enterprise/save"`              //保存企业黄页信息
+	upLoadEntImg   xweb.Mapper `xweb:"POST /member/enterprise/upLoadEntImg"` //上传企业相关图片
 	follow         xweb.Mapper `xweb:"POST /member/enterprise/follow"`       //关注企业
+	wxFollow       xweb.Mapper `xweb:"POST /wx/member/enterprise/follow"`    //手机关注企业
 	isFollowed     xweb.Mapper `xweb:"POST /member/enterprise/isFollowed"`   //查询关注状态
+	entCount       xweb.Mapper `xweb:"POST /member/enterprise/entcount"`     //查询关注企业数量
+
 }
 
 const ESTYPE string = "enterprise"
 
+func (u *Yellowpage) EntCount() {
+	sessionId := u.GetSession("userId")
+	if sessionId == "" {
+		u.ServeJson("0")
+	} else {
+		log.Println(sessionId)
+		c := *mongodb.Find("follow_enterprise", bson.M{"s_userid": sessionId}, nil, nil, false, -1, -1)
+		u.ServeJson(len(c))
+	}
+
+}
+
 //我的黄页
 func (yp *Yellowpage) ShowEnterprise() error {
 	//判断用户是否审核通过
@@ -194,6 +211,34 @@ func (yp *Yellowpage) UpLoadEntImg() error {
 	}
 }
 
+//手机关注企业
+func (yp *Yellowpage) WxFollow() error {
+	entName := yp.GetString("entName")
+	userId := yp.GetSession("userId").(string)
+	status := "N"
+	if len(userId) > 0 {
+		e := mongodbutil.FindOne("enterprise", coreconfig.SysConfig.EntMongodbAlias, coreconfig.SysConfig.EntMongodbName, `{"EntName":"`+entName+`"}`)
+		if (*e)["_id"] != nil {
+			entId := strings.Split(fmt.Sprintf("%s", (*e)["_id"]), `"`)[1]
+			if mongodb.Count("follow_enterprise", `{"s_userid":"`+userId+`"}`) >= coreconfig.SysConfig.FollowEnterprise {
+				status = "M"
+			} else if mongodb.Count("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) == 0 {
+				userInfo := yp.GetSession("userInfo").(*map[string]interface{})
+				if len(mongodb.Save("follow_enterprise", bson.M{
+					"s_userid":     userId,
+					"s_entid":      entId,
+					"s_m_openid":   (*userInfo)["s_m_openid"],
+					"l_createdate": time.Now().Unix(),
+				})) > 0 {
+					status = "Y"
+				}
+			}
+		}
+	}
+	yp.ServeJson(bson.M{"status": status})
+	return nil
+}
+
 //关注企业
 func (yp *Yellowpage) Follow() error {
 	entId := yp.GetString("entId")

core/src/qfw/mobile/wxmenu.go

@@ -420,7 +420,7 @@ func (m *Mobile) WxpushListInfo(_id string) error {
 func (m *Mobile) WxpushAjaxReq() error {
 	index, _ := m.GetInteger("index")
 	mongodb.Update("wxpush", `{"_id":"`+m.GetString("_id")+`"}`, map[string]interface{}{
-		"$push": map[string]interface{}{"a_visitedindex": index},
+		"$addToSet": map[string]interface{}{"a_visitedindex": index},
 	}, false, false)
 	return nil
 }

core/src/qfw/search/wxsearchservice.go

@@ -6,6 +6,7 @@ import (
 	"github.com/go-xweb/xweb"
 	"github.com/p/mahonia"
 	"html/template"
+	"log"
 	"qfw/coreutil"
 	"qfw/mobile"
 	. "qfw/util"
@@ -50,7 +51,7 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 		} else {
 			data = wxsearhWebContentent(querymap, n, reqType)
 		}
-		rs := FormatData(data)
+		rs := FormatData(data, n.Action)
 		querymap["entcard"] = n.GetString("mingpian")
 		if n.GetString("currentPage") != "" {
 			n.SetHeader("Pragma", "No-cache")
@@ -63,13 +64,13 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 		//反转生成map
 		querymap := map[string]string{}
 		data := wxsearhWebContentent(querymap, n, reqType)
-		rs := FormatData(data)
+		rs := FormatData(data, n.Action)
 		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs, "querymap": querymap})
 	}
 	return nil
 }
 
-func FormatData(data *[]map[string]interface{}) string {
+func FormatData(data *[]map[string]interface{}, action *xweb.Action) string {
 	entinfos := make([]map[string]string, 0)
 	if data == nil {
 		return ""
@@ -88,6 +89,17 @@ func FormatData(data *[]map[string]interface{}) string {
 			"OpLocDistrict": fmt.Sprint(v["OpLocDistrictName"]),
 			"EstDate":       estDate,
 			"OpStateName":   fmt.Sprint(v["OpStateName"]),
+			"status":        "n",
+		}
+		//是否关注
+		entId := tmp["_id"]
+		userId := action.GetSession("userId").(string)
+		if userId != "" {
+			log.Println(userId)
+			if Count("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) > 0 {
+				log.Println("进入")
+				tmp["status"] = "y"
+			}
 		}
 		entinfos = append(entinfos, tmp)
 	}

core/src/qfw/swordfish/swordfish.go

@@ -21,6 +21,7 @@ type SwordFish struct {
 	wxsearch       xweb.Mapper `xweb:"/member/wxswordfish/search"`       //剑鱼微信查询
 	wxsearchlist   xweb.Mapper `xweb:"/member/wxswordfish/searchlist"`   //剑鱼微信查询结果展示
 	transfer       xweb.Mapper `xweb:"/member/wxswordfish/transfer"`     //剑鱼微信查询结果跳转到我的订阅
+	newSordfish    xweb.Mapper `xweb:"/front/newSwordfish"`              //剑鱼新首页
 
 }
 

core/src/qfw/swordfish/swordfishmanage.go

@@ -16,6 +16,11 @@ import (
 	"time"
 )
 
+//剑鱼新首页
+func (s *SwordFish) NewSordfish() error {
+	return s.Render("/swordfish/newindex.html")
+}
+
 //剑鱼查询结果也跳转到我的订阅
 func (s *SwordFish) Transfer() error {
 	s.DisableHttpCache()

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-05-17 10:13:54"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-05-17 10:13:54"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-05-23 17:46:27"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-05-23 17:46:27"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/css/mobile/incmobile.css

@@ -94,7 +94,7 @@ ul{
 }
 .inclist caption div.left{  
 	float:left;
-	width:75%;
+	width:70%;
 	font-size:16px;
 	font-weight:600;
 	color:#1A1A1A !important;
@@ -654,7 +654,6 @@ span#camera {
 	bottom:20px;
 	width: 100%;
 	text-align:center;
-	height: 40px;
 }
 .footer .container div{
 	display:inline-block;	
@@ -669,4 +668,132 @@ span#camera {
 }
 .footer .container .inc p{
 	font-size:10px;
+}
+/*著作权*/
+.cp_ct,.cp_pt,.cp_wk{
+	margin:20px 0px 0px 15px;
+	font-weight:bold;
+}
+.cp_title{
+	font-size:16px;
+	margin: 20px 0px 10px 15px;
+    font-weight: 600;
+}
+.cp_first{
+	margin: 2px 0px 3px 15px;
+}
+.cp_first  span{
+	color:#999;
+}
+.cp_ctcont,.cp_wkcont,.cp_ptcont{
+	padding: 0px 0px 10px;
+	border-bottom: 1px solid rgb(229, 230, 233);
+}
+.combody #lmore_wk,.combody #lmore_ct,.combody #lmore_pt{
+	width:100%;
+	margin:10px 0px;
+}
+.combody #lmore_wk span,.combody #lmore_ct span,.combody #lmore_pt span{
+	border: 1px solid rgb(22, 160, 134) !important;
+	color: rgb(22, 160, 134) !important;
+}
+.combody .copyright{
+	margin-bottom:20px;
+}
+.ent-layout-down .b-com-title > span {
+	background-color:#fff;
+	color:rgb(22, 160, 134);
+	font-size: 22px
+}
+.comnav .qmx-icon-book{
+	font-size:22px;
+	top: 2px;
+    left: 4px;
+}
+.combody .qmx-icon-save{
+	top: 2px;
+}
+.combody .qmx-icon-save{
+	top: 3px;
+}
+.combody .qmx-icon-xinxi{
+	top: 4px;
+}
+.qmx-icon-book,.qmx-icon-zuopin,.qmx-icon-save,.qmx-icon-xinxi{
+	font-weight:bold;
+}
+/*手机版添加关注企业*/
+.mf_title{
+	height:50px;
+	border-bottom:1px solid #ccc;
+	line-height:50px;
+	padding-left: 20px;
+}
+.weiguanzhu{
+	color: rgb(86, 196, 176);
+	font-size:16px;
+}
+.mf_one{
+	margin: 0px 10px;
+	font-size: 16px;
+	font-weight:600;
+}
+.mf_two{
+	font-family: '宋体 Regular', '宋体';
+	font-size: 12px;
+}
+.mf_content{
+	padding:20px 15px;
+}
+.mf_ent{
+	padding-bottom:15px;
+	font-weight: 600;
+	padding-top: 10px;
+	border-bottom: 1px solid #e5e6e9;
+}
+#mf_add span{
+	color:rgb(86, 196, 176);
+	border:1px solid rgb(86, 196, 176);
+}
+#mf_tishi{
+    margin-top: 30px;
+    color: #999;
+	font-size:12px;
+}
+#mf_add{
+	margin-top:20px;
+}
+.mf_qymc{    
+	width: 80%;
+  		height: 20px;
+	float:left;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+#mf_cancel span{
+	font-size: 20px;
+	color:#FF5A5F;
+}
+#mf_cancel{
+	float:right;
+  		margin-right: 10px;
+}
+.mf_one{
+	
+}
+.mf_save{
+	float:right;
+	color:rgb(86, 196, 176);
+	margin-right: 25px;
+	font-size: 16px;
+}
+#mf_entName{
+	height:100px;
+	width: 90%;
+	margin-top:30px;
+	padding:5px; 
+	border:1px solid #ccc;
+}
+.tipassembly{
+	width: 240px;
 }

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

@@ -1086,6 +1086,30 @@ span.highlight {
 	content: "\BE";
 }
 
+.qmx-icon-xinxi:before{
+	content: "\BF";
+}
+
+.qmx-icon-zuopin:before{
+	content: "\C0";
+}
+
+.qmx-icon-save:before{
+	content: "\C1";
+}
+
+.qmx-icon-book:before{
+	content: "\C2";
+}
+
+.qmx-icon-jingqingqidai:before{
+	content: "\C3";
+}
+
+.qmx-icon-jingqingqidai2:before{
+	content: "\C4";
+}
+
 .icon-small {
 	font-size: 12px;
 }

core/src/web/staticres/js/chart.js

@@ -82,6 +82,7 @@ function loadData(me){
 	data.comparebefore=$("#comparebefore").val()
 	data.compareafter=$("#compareafter").val()
 	data.comparetype=$("#comparetype").val();
+	data.checked=$("#comparecheck").prop('checked')?1:0;
 	$.ajax({
 		url:"/manage/countlist",
 		method:"post",

core/src/web/staticres/js/entcommunity.js

@@ -346,3 +346,32 @@ function initRelation(){
 		}
 	});
 }
+function follow(me,params){
+	me=$(me);
+	var id=me.attr("data-id");
+	if(id.indexOf("Hex")>-1){
+		id=id.replace("ObjectIdHex(\"","").replace("\")","");
+	}
+	console.log(id);
+	var icon=me.find("i");
+	var text=me.find("span");
+
+	$.get("/member/enterprise/isFollowed?entId="+id,function(r){
+		if (r.status=="n"){
+			$.get("/member/enterprise/follow?entId="+id+"&flag=false",function(rs){
+				TipAssembly.show("已关注");
+				me.find("i").attr("class","glyphicon yiguanzhu");
+				me.find("span").text("已关注");
+				
+			});
+		}else{
+			$.get("/member/enterprise/follow?entId="+id+"&flag=true",function(rs){
+				
+				TipAssembly.show("已取消<br>关注");
+				me.find("i").attr("class","glyphicon weiguanzhu");
+				me.find("span").text("关注");
+			})	;
+		}
+	})
+	  event.stopPropagation();
+}

core/src/web/staticres/js/entportrait.js

@@ -85,7 +85,7 @@ $(function(){
 				if(data.flag == true){
 					$.ajax({
 					  	type: "POST",
-					  	url: "/member/yellowpage/upLoadEntImg",
+					  	url: "/member/enterprise/upLoadEntImg",
 					  	data: "field=s_avatar&url="+data.url,
 					 	dataType: "text",
 					  	success: function(result){
@@ -159,7 +159,7 @@ $(function(){
 				alert("网址格式不正确！");
 				return;
 			}
-			$.post("/member/yellowpage/save",formNode.serialize(),function(r){
+			$.post("/member/enterprise/save",formNode.serialize(),function(r){
 				if(r.status == "personError"){
 					alert("请输入联系人！");
 				}else if(r.status == "y"){

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

@@ -710,7 +710,7 @@ var TipAssembly = {
 		if(typeof(css) != "undefined"){
 			$("#tipAssembly").css(css);
 		}
-		$("#tipAssembly").css({"margin-top":-($("#tipAssembly").height()/2),"margin-left":-($("#tipAssembly").width()/2)});
+		$("#tipAssembly").css({"margin-top":-($("#tipAssembly").outerHeight()/2),"margin-left":-($("#tipAssembly").outerWidth()/2)});
 	},
 	hide: function(){
 		$("#tipAssembly").remove();

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

@@ -12,7 +12,7 @@
 		<div class="text-center hidden-xs"><img src="{{Msg "seo" "cdn"}}/images/bottom_logo.png"/></div>
 		<div class="qfw-bottom-text text-center">
 			<a href="/front/web_A_help.html">关于我们</a><span>|</span><a href="/front/web_L_help.html">联系我们</a><span>|</span>&nbsp;&nbsp;<span style="color:white">法律声明&nbsp;&nbsp;&nbsp;&nbsp;</span><span>|</span><a href="/front/web_H_help.html">帮助中心</a><span>|</span><a href="/front/web_O_help.html">意见反馈</a>
-			<div style="line-height:25px">©2015-2016&nbsp;拓普丰联&nbsp;版权所有<span>&nbsp;|&nbsp;</span><a target="_blank" href="http://www.miibeian.gov.cn/publish/query/indexFirst.action">京ICP备14030217号-2</a></div>
+			<div style="line-height:25px">©2015-2016&nbsp;拓普丰联&nbsp;版权所有<span>&nbsp;|&nbsp;</span><a href="http://www.miibeian.gov.cn/state/outPortal/loginPortal.action" target="_blank">豫ICP备15016539号-1</a></div>
 		</div>
 	</div>
 </div>

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

@@ -42,7 +42,7 @@ function afterAutheFirstLogin(result){
 			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/enterprise/edit");
 		}
 	}
-	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
+	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/service/add");
 	$("#fristAutheLoginModal").modal('show');
 }
 //

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

@@ -24,7 +24,7 @@
 				color:#ff5a5f;
 			}
 			.counttab{
-				width:310px;
+				width:420px;
 				height:34px;
 				margin:30px 0px 30px 18px;
 				background-color:#F8F8F8;
@@ -162,7 +162,8 @@
 					<div class="counttab">
 						<a href="javascript:void(0);"  onclick="loadData(this)" id="n_total" class="counttabbtn" style="border-right:1px solid #E4E4E4;">新增人数</a>
 						<a href="javascript:void(0);"  onclick="loadData(this)" id="total" class="counttabbtn" style="border-right:1px solid #E4E4E4;">累计人数</a>
-						<a href="javascript:void(0);"  onclick="loadData(this)" id="sfish" class="counttabbtn">剑鱼用户</a>
+						<a href="javascript:void(0);"  onclick="loadData(this)" id="sfish" class="counttabbtn" style="    border-right: 1px solid #E4E4E4;">剑鱼用户</a>
+						<a href="javascript:void(0);"  onclick="loadData(this)" id="nfish" class="counttabbtn">剑鱼用户(活跃)</a>
 					</div>
 				</div>
 				<div class="count_chart">
@@ -187,7 +188,7 @@
 							   </div>
 								  </div>
 								<div class="col-sm-1">
-										<input type="checkbox" type="form-control" id="comparecheck" onclick=onCompareClick(this) />是否对比
+										<input type="checkbox" type="form-control" id="comparecheck" name="comparecheck" onclick=onCompareClick(this) />是否对比
 								</div> 		
 						</div>
 						<div class="col-sm-3 text-center">

core/src/web/templates/member/credit/mcreditindex.html

@@ -2,29 +2,20 @@
 <html>
 	<title>我的积分</title>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
 	{{include "/common/inc.html"}}
 	<style>
 		body{
 			    color: #464645;
 		}
 		.g-index-top{
-			border:1px solid #F5DC99;
-			background:#FAF5DF;
-		}
-		.m-photo div.outer{	
-			border-radius:29px;
-			width:58px;
-			height:58px;
-			margin: 20px auto;
-			-webkit-box-shadow:0 0 2px #F5DC99;  
-			-moz-box-shadow:0 0 2px #F5DC99;  
-			box-shadow:0 0 2px #F5DC99;  
-			text-align:center;
 			background:#FFF;
 		}
-		.m-photo img.inner{
-			border-radius: 27px;
-    		margin: 2px;  
+		.m-photo img.outer{	
+			border-radius:35px;
+			width:70px;
+			height:70px;
+			margin:20px 0 15px 0 ;
 		}
 		.m-index-user {
 			text-align:center;
@@ -32,14 +23,16 @@
 		.m-index-user div.nickname{
 				max-width:400px;
 				margin:0px auto;
-				font-size:20px;
+				font-size:16px;
+				font-weight:600;
 		}
 		.m-index-user button.bookin{
-			width:90px;
-			height:30px;
-			margin:15px 0;
-			font-weight:200px;
-			font-size:13px;
+			    width: 85px;
+			    height: 28px;
+			    margin: 15px 0;
+			    font-size: 13px;
+			    line-height: 15px;
+}
 		}
 		.m-detailinfo{
 			margin-bottom:15px;
@@ -50,15 +43,18 @@
 			margin-right:25px;
 		}
 		div.title{
-			border-bottom:1px solid #B2B2B2;
+			border-bottom:1px solid #F8F8F8;
 			height:40px;
 			line-height:42px;
-			padding-left:20px;
+			padding-left:10px;
 			font-size:13px;
 			color:#000;
-			background:#F6F7F8;
+			background:#FFF;
 			
 		}
+		.m-rules{
+			padding-left: 15px;
+		}
 		.m-rules div.title:hover{
 			background:#F6F9F4;
 		}
@@ -116,6 +112,7 @@
 		}
 		.bookinfo div.content{
 			padding:20px 0;
+			padding-top:60px;
 			background:#FFF;
 			text-align:center;
 		}
@@ -139,6 +136,80 @@
 		a.mycredit{
 			color:#FF5A5F !important;
 		}
+		.g-split{
+			height:10px;
+			background:#F8F8F8;
+		}
+		.m-rules div.title i.u-prefix{
+			color:#FF5A5F;
+			margin-right:5px;
+		}
+		div.title b.u-back{
+			padding-left:10px;
+			color:#FF5A5F;
+		}
+		div.title b.u-back small{
+			font-weight:normal;
+			color:#F8F8F8;
+		}
+		div.title b.u-back small a{
+			color:#B3B3B3;
+		}
+		.mycredit .content{
+			padding:15px;
+			padding-right:0px;
+			padding-top: 0px;
+			background:#FFF;	
+		}
+		.mycredit .content li{
+			border-bottom:1px solid #E7E8EB;
+			width:100%;
+			height:70px;
+		}
+		.mycredit .content li span.one{
+			display:inline-block;
+			float:left;
+			width:88px;
+			margin-top:10px;
+			color:#B3B3B3;
+		}
+		.mycredit .content li span.two{
+			display:inline-block;
+			float:left;
+			text-align:left;
+			margin-top:10px;
+		}
+		.mycredit .content li span.two div:first-child{
+			color:#FF5A5F;
+			font-weight:bold;
+		}
+		.mycredit .content li span.three{
+			display: inline-block;
+			width: 70px;
+			float: right;
+		}
+		.mycredit .content li span.three div{
+			border: 1px solid #FFBABC;
+			border-radius: 28px;
+			display: inline-block;
+			float: left;
+			margin-top: 6px;
+			padding-top: 6px;
+			width: 55px;
+			height: 55px;
+			text-align: center;
+			color: #FFBABC;
+		}
+		.mycredit .content li:first-child  div{
+			margin-top: 0px;
+		}
+		.loadmore {
+		    width: 250px;
+		    height: 35px;
+		    margin: 20px 0 20px 0;
+		    display: inline-block;
+		    color: #16A086;
+		}
 	</style>
 </head>
 <body>
@@ -146,78 +217,71 @@
 	<div class="g-index-top col-xs-12 padding0" >
 		<div class="m-index-user  col-xs-12 padding0" >
 			<div class="m-photo">
-				<div class="outer">
-					{{session "headImg"}}
-					{{if session "headImg"}}
-						<img width=54 height=54 src="{{Msg "seo" "cdn"}}{{session "headImg"}}" class="inner"/>
+					{{$s_avatar := printf "%v" (index (session "userInfo") "s_avatar")}}
+					
+					{{if $s_avatar}}
+						<img src="{{Msg "seo" "cdn"}}{{$s_avatar}}" class="outer"/>
 					{{else}}
-						<img width=54 height=54 src="{{Msg "seo" "cdn"}}/images/swordfish/headimg.png" class="inner"/>
+						<img  src="{{Msg "seo" "cdn"}}/images/swordfish/headimg.png" class="outer" />
 					{{end}}
-				</div>
 			</div>
 			<div class="nickname">
-				{{session "nickName"}}
-			</div>
-			<div>
-					<button class="btn  btn-default bookin"  id="indexbookinbtn" target="bookinfo" style="display:none;">查看签到</button>
-					<button class="btn btn-primary bookin"  id="indexbookinbtn1" target="bookinfo" style="display:none;">签到</button>
-
-				
-			</div>
-			<div class="m-detailinfo col-xs-12">
-				<div class="col-xs-6 text-right" style="padding-right:22px;"><span class="text-primary" style="margin-top:-3px;"><i class="glyphicon jinbi" ></i><span class="gold">{{$.T.user.i_credit}}</span></span>&nbsp;积分</div>
-				<div class="col-xs-6">
-				<span class="split">|</span>
-					{{$identWay := session "identWay"}}
+				<span>{{session "nickName"}}</span>
+				<div style="font-size:14px;margin-top:5px;font-weight:normal;">
+			
+					{{if session "identType"}}
+					<span style="    margin-left: 10px;margin-right:5px;">{{$ent := session "userInfo" }}{{printf "%v" (index $ent "s_enterprisename")}}</span>
+					{{end}}
+						{{$identWay := session "identWay"}}
 						{{if session "identType"}}
 							{{$identType := session "identType"}}
 							{{if eq 1 $identType}}
 								{{if eq 1 $identWay}}
-								<span  style="float:left;margin:0px 7px 0 0;font-size:17px;">
+								<span  style="">
 									<i class="glyphicon qyrz f-floatf text-primary"></i>
 								</span>
-								<div style="float:left;">
-									已认证企业
-								</div>
 								{{end}}
 							{{else if eq 2 $identType}}
 								{{if eq 1 $identWay}}
-								<span  style="float:left;margin:0px 7px 0 0;font-size:17px;">
+								<span  style="">
 									<i class="glyphicon grrz f-floatf text-primary"></i>
 								</span>
-								<div style="float:left;margin-left:-9px;">
-									已认证个人
-								</div>
 								{{end}}
 							{{else if eq 3 $identType}}
 								{{if eq 1 $identWay}}
-								<span  style="float:left;margin:0px 7px 0 0;font-size:17px;">
+								<span  style="">
 									<i class="glyphicon jgrz f-floatf text-primary"></i>
 								</span>
-								<div style="float:left;">
-									已认证机构
-								</div>
 								{{end}}
 							{{end}}
 						{{else}}
-						<span  style="float:left;margin:0px 7px 0 0;font-size:17px;">
+						<span  style="">
 							<i class="glyphicon grrz"></i>
 						</span>
-						<div style="float:left;">
-								未认证
-						</div>
 						{{end}}
-				</div>
+				</div>	
 			</div>
-		</div>
+			<div>
+					<button class="btn  btn-default bookin"  id="indexbookinbtn" target="bookinfo" style="display:none;">查看签到</button>
+					<button class="btn btn-primary bookin"  id="indexbookinbtn1" target="bookinfo" style="display:none;">签到</button>
+			</div>
+	</div>
 	</div>
+	<div class="g-split col-xs-12 padding0"></div>
 	<div class="g-index-bottom" style="clear:both;">
+		<div class="m-rules" target="mycredit" onclick="loadData();">
+			   <div class="title"><i class="u-prefix glyphicon qmx-icon-jifen"></i> 我的积分  <b class="u-back">{{$.T.user.i_credit}}<small><a >(点击查看详细)</a></small></b><span class="glyphicon xiayibu"></span></div>
+		</div>
 		<div class="m-rules" target="creditrules">
-			<div class="title"><img src="{{Msg "seo" "cdn"}}/images/lb.png" />积分规则<span class="glyphicon xiayibu"></span>
-			</div>
+				<div class="title"><i class="u-prefix  glyphicon qmx-icon-jifen"></i> 积分规则<span class="glyphicon xiayibu"></span></div>
+		</div>
+		<div class="m-rules" target="">
+			<div class="title"><i class="u-prefix glyphicon yiguanzhu"></i> 我关注的企业<span class="glyphicon xiayibu"></span></div>
 		</div>
 	</div>
-			<div style="position: absolute;width:100%;z-index:4410;background:#FFF;" class="creditrules">
+	
+	
+	<div style="position: absolute;top:0px;width:100%;z-index:4410;background:#FFF;" class="creditrules">
 		<div class="title">
 			积分规则
 			<button class="btn btn-link text-primary f-floatr f-close" >确定</button>
@@ -263,7 +327,8 @@
 			<p class="para">备注：会员积分可能有延迟，若超过24小时未加上，请于企明星客服联系。</p>
 		</div>
 	</div>
-	<div style="position: absolute;width:100%;z-index:4411;background:#FFF;" class="bookinfo">
+
+	<div style="position: absolute;top:0px;bottom:0px;width:100%;z-index:4411;background:#FFF;" class="bookinfo">
 		<div class="title">
 			签到
 			<button class="btn btn-link text-primary f-floatr f-close" >确定</button>
@@ -294,6 +359,18 @@
 			</div>
 		</div>
 	</div>
+	<div style="position: absolute;top:0px;bottom:0px;width:100%;z-index:4410;background:#FFF;display:none;" class="mycredit">
+		<div class="title">
+			积分明细
+			<button class="btn btn-link text-primary f-floatr f-close" >确定</button>
+		</div>
+		<div class="content">
+			<ul id="countRecord">
+			
+			</ul>
+			<center><a class="loadmore btn btn-link inline-shows" onclick="loadData(1);">加载更多</a></center>
+		</div>
+	</div>
 			
 	<script>
 		$(function(){
@@ -372,6 +449,55 @@
 				}
 			});
 		}
+		var count=0;
+		function loadData(ismore){
+			var current=1
+			if($("#countRecord").children().length!=0){
+				current=$("#countRecord").children().length/10+1;
+			}
+			if(!ismore&&current>1||$("#countRecord").children().length%10!=0 ){
+				$(".loadmore").text("没有更多了...").attr("onclick","").css("color","#B3B3B3");
+
+				return true
+			}
+			$.ajax({
+				url:"/member/credit/creditList",
+				method:"post",
+				data:{
+					"pageSize":10,
+					"currentPage":current
+				},
+				success:function(r){
+					var template="<li><span class=\"one\"><div>$date</div><div>$time</div></span><span class=\"two\"><div>$change</div><div>操作积分-$opera</div></span><span class=\"three\" ><div>剩余</br>$score</div></span></li>";
+					var list=r.list;
+					if (current==1){
+						count=r.count;
+					}
+					var format="yyyy/MM/dd hh:mm:ss";
+					for(var i=0;i<list.length;i++){
+						var  d=new Date(list[i]["l_date"]).Format(format).split(" ");
+						var change=list[i]["i_score"];
+						var score=list[i]["i_scorenow"];	
+						if(change>0){
+							change="+"+change;
+						}else{
+							change="<span style='color:#24C0D7;'>"+change+"</span>"
+						}
+						var opera=list[i]["s_operation"];
+						var li=template.replace("$date",d[0])
+																					.replace("$time",d[1])
+																					.replace("$change",change)
+																					.replace("$opera",opera)
+																					.replace("$score",score);
+						$("#countRecord").append(li);
+						
+					}
+					if (count == $("#countRecord").children().length){
+							$(".loadmore").text("没有更多了...").attr("onclick","").css("color","#B3B3B3");
+						}
+				}
+			});
+		}
 		function hide(n){
 				n=$(n.target);
 				n.parent().parent().hide();

core/src/web/templates/member/credit/mycredit.html

@@ -2,6 +2,7 @@
 <head>
 <title>我的积分</title>
 {{include "/common/inc.html"}}
+<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
 <script charset="utf-8" src="/js/paging.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/validform-min.js"></script>
 <style>
@@ -171,7 +172,7 @@ a.mycredit{
 								<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('{{if session "identWay"}}{{if eq (session "identWay") 1}}/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}#service{{else}}/member/accountset/index{{end}}{{else}}/member/accountset/index{{end}}')">发服务</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('{{if session "identWay"}}{{if eq (session "identWay") 1}}/member/service/add{{else}}/member/accountset/index{{end}}{{else}}/member/accountset/index{{end}}')">发服务</span></td>
 								{{end}}
 							</tr>
 							<tr class="rowtwo">
@@ -273,7 +274,7 @@ a.mycredit{
 								<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('{{if session "identWay"}}{{if eq (session "identWay") 1}}/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}#service{{else}}/member/accountset/index{{end}}{{else}}/member/accountset/index{{end}}')">发服务</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('{{if session "identWay"}}{{if eq (session "identWay") 1}}/member/service/add{{else}}/member/accountset/index{{end}}{{else}}/member/accountset/index{{end}}')">发服务</span></td>
 								{{end}}
 							</tr>
 							<tr class="rowtwo">

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

@@ -1,337 +0,0 @@
-<html>
-<head>
-<title>{{.T.entinfo.EntName}}_保存企业名片</title>
-<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
-{{include "/common/inc.html"}}
-<meta name="Keywords" content="{{.T.res.EntName}} {{.T.res.OpLoc}}{{.T.res.EntName}} {{.T.res.EntName}}产品 {{.T.res.EntName}}服务 {{.T.res.EntName}}注册资本 企业查询 信息查询 信用查询 企业服务 信用公示"/>
-<meta name="Description" content="{{.T.res.OpScope}}"/>
-<link href="{{Msg "seo" "cdn"}}/css/enterprise.css" rel="stylesheet">
-<script src="{{Msg "seo" "cdn"}}/js/upload.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/qfwtable.js"></script>
-<script charset="utf-8" src="{{Msg "seo" "cdn"}}/js/kindeditor/kindeditor-all.js"></script>
-<script charset="utf-8" src="{{Msg "seo" "cdn"}}/js/kindeditor/kinditem.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/validform-min.js"></script>
-<script>
-var entType="企业"
-</script>
-</head>
-<body>
-{{include "/common/centerhead.html"}}
-<div id="entinfobg">	
-<div class="a-content">
-	<!--标题-->
-	<div id="titleactionimgs" class="row qfw-row">
-		<div>
-		<h3>
-		{{if .T.entinfo.EntName }}
-			{{.T.entinfo.EntName}}
-		{{end}}
-		</h3>
-		<!--企业认证图标--> 
-		{{if .T.entinfo.EntName }}
-			{{if .T.entinfo.s_action}}
-				{{$identaction:=.T.entinfo.s_action}}		
-				{{if eq $identaction "01"}}
-					<script>entType="企业"</script>
-					<span class="glyphicon qyrz   margin-l-10 jhtb"></span> <span style="color:#fff;">已认证企业　</span> 
-						{{ if .T.entinfo.i_comauthenttype }}
-								{{ if eq .T.entinfo.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.entinfo.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.entinfo.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 style="color:#fff;">已认证个人</span> 
-				{{else if eq $identaction "03"}}
-					<script>entType="机构"</script>
-					<span class="glyphicon jgrz   margin-l-10 jhtb"></span> <span style="color:#fff;">已认证机构</span>
-				{{end}}
-			{{end}}
-		{{end}}
-		</div>
-	</div>
-	
-	<form id="entform" name="entform"  method="post" class="validForm">
-	<input id="id" name="id" type="hidden" value="{{.T.entid}}">
-	<input id="EntName" name="EntName" type="hidden" value="{{.T.entinfo.EntName}}" > 	
-	<!--企业名片-->	
-	<div class="row qfw-row qfw-p-margintop">
-		<div class="col-lg-12 border" id="our">
-			<div class="qfw-entinfo-padding41" id="editent">
-				<h4><span class="glyphicon lianxiwomen icon_gray icon_large"></span>
-				<b><b><script>document.write(entType)</script>名片</b></b>
-				<button id="editOur" class="btn btn-primary" onClick="btnSaveForm();"  >保存</button> 
-				</h4>
-				<hr>
-				<!--企业名片详细信息-->
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxiren icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 4.5px;">联系人&nbsp;：</div> 
-						<div class="three">
-						<input type="text" id="s_persion" name="s_persion" class="form-control"  value="{{.T.entinfo.s_persion}}"  datatype="*" maxlength="30" nullmsg="请输入联系人　" errormsg="请输入联系人　"></div>
-					<div class="four" > <span class="Validform_checktip">请输入联系人</span></div>
-					</div> 
-				</div>
-				
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidianhua icon_gray"></span></div> 
-						<div class="two">联系方式&nbsp;&nbsp;：</div> 
-						<div class="three"><input type="text" name="s_mobile" class="form-control" id="Tel" value="{{.T.entinfo.s_mobile}}"  maxlength="21" ignore="ignore" datatype="m" nullmsg="请输入手机号码" errormsg="手机号码格式错误" ></div> 
-						<div class="four" > <span class="Validform_checktip"></span></div>
-					</div> 
-				</div>
-				
-				<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>网站&nbsp;&nbsp;：</div> 
-						<div class="three"><input type="text" name="s_enturl" class="form-control" id="s_enturl" value="{{.T.entinfo.s_enturl}}" ignore="ignore" datatype="url" nullmsg="请输入企业网站" errormsg="企业网站格式错误"></div> 
-						<div class="four" > <span class="Validform_checktip"></span></div>
-					</div> 
-				</div>
-				
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon tupian icon_gray"></span></div> 
-						<div class="two"><script>document.write(entType)</script>LOGO：</div> 
-						<div class="three" id="logoArea">
-							{{if .T.entinfo.s_avatar}}
-							<img class='ent-LOGO cursor-pointer' src='{{.T.entinfo.s_avatar}}' onerror="$(this).next().removeClass('hide');$(this).remove();" onclick="document.getElementById('upload').click();uploadType=0;">
-							{{end}}
-							<div{{if .T.entinfo.s_avatar}} class="hide"{{end}}>
-								<img src="/images/services/default.png" style="width: 90px; height: 90px;cursor: pointer;" onclick="document.getElementById('upload').click();uploadType=0;">
-								<div id="tips" style="cursor: pointer;text-align: center; width: 90px; position: absolute; color: #fff; top: 64px; background-color: #cccccc;"  onclick="document.getElementById('upload').click();uploadType=0;">上传logo</div>
-								<span class="margin-l-10" style="position: relative;top: 33px;">上传一张不超过10M的图片，支持jpg、png、bmp格式。建议尺寸260*260像素</span>
-							</div>
-						</div> 
-						<div class="four"></div>
-						<div id="uploadLogo" class="hide"></div>
-					</div> 
-				</div>
-				
-				<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&nbsp;&nbsp;&nbsp;：</div> 
-						<div class="three"><input type="text" name="s_qq" class="form-control" id="s_qq" value="{{.T.entinfo.s_qq}}" maxlength="30"></div> 
-						<div class="four" > <span class="Validform_checktip"></span></div>
-					</div> 
-				</div>
-				
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon weixinhao icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 4.5px;">微信号&nbsp;：</div> 
-						<div class="three" id="mblocation"><input type="text" name="s_weixin" class="form-control" id="s_weixin" value="{{.T.entinfo.s_weixin}}" maxlength="20">
-							<a href="#" class="text-primary "  onClick="document.getElementById('upload').click();uploadType=1;">上传二维码</a>
-							<img class="imgs barcode" style="margin-left:10px;width:35px;height:35px;{{if not .T.entinfo.s_qrcode}}display:none;{{end}}" src="{{Msg "seo" "cdn"}}{{.T.entinfo.s_qrcode}}" onerror="$(this).hide();">
-						</div> 
-					</div> 
-				</div>
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidizhi icon_gray"></span></div> 
-						<div class="two">联系地址&nbsp;&nbsp;：</div>
-						<div class="three">
-							<span id="city_china">
-							<select  class="province cxselect select-control" name="province" data-first-title="全国"></select>
-							<select class="city cxselect select-control" disabled="disabled" name="city" data-first-title="选择市"></select>
-							<select class="area cxselect select-control" disabled="disabled" name="area" data-first-title="选择县"></select>
-						    <input type="text" id="s_address"  name="s_address" class="form-control"  placeholder="街道 门牌号 大厦名称 房间号" value="{{.T.entinfo.s_address}}"   maxlength="50" style="  display: inline; width:30%;  height: 34px;" >
-							</span>
-						</div> 
-					</div> 
-				</div>
-				
-				<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>介绍&nbsp;&nbsp;：</div> 
-						<div class="three">
-							<textarea class="form-control" rows="3" id="s_synopsis" name="s_synopsis">{{.T.entinfo.s_synopsis}}</textarea>
-					
-							<script>
-							 $(function(){
-								var kindEditInit=function(){
-							     editor = KindEditor.create('textarea[name="s_synopsis"]', {
-								 id:"ke_editor",
-								 allowFileManager : false,
-								 filterMode:false,
-								 width : '63%',
-								 height:'400px',
-								 items:items_simp,
-								 allowImageRemoteImageRemote:false,
-								 uploadJson : '/filemanage/upload?resize=800',
-								 afterCreate:function() {
-									    this.sync()
-								    },
-								 beforesubmit:function(){
-										this.sync()
-									},
-								 afterBlur: function(){
-										this.sync()
-									}
-								 });		
-								 }
-								 kindEditInit()
-								
-							});
-							</script>
-						
-						</div> 
-					</div> 
-				</div>
-			</div>
-		</div>
-	</div>	
-	</form>
-	
-
-	
-	
-</div>
-</div>	
-{{include "/common/bottom.html"}}
-</body>
-
-<script>
-var uploadType = 0;
-//
-var option={
-	btnname:"",
-	action:"/filemanage/upload",
-	btnClass:"",
-	afterError:function(data,e){
-		if(uploadType == 1){
-			alert("上传二维码失败，请重新上传。");
-		}else{
-			alert("上传LOGO失败，请重新上传。");
-		}
-	},
-	afterUpload:function(data){ //此处可以重写，上传后的处理
-		if(data.flag == true){
-			var field = "s_avatar";
-			if(uploadType == 1){
-				field = "s_qrcode";
-			}
-			$.ajax({
-			  	type: "POST",
-			  	url: "/member/yellowpage/upLoadEntImg",
-			  	data: "field="+field+"&url="+data.url,
-			 	dataType: "text",
-			  	success: function(result){
-					if (result == "y"){
-						if(uploadType == 1){
-							$(".barcode").attr("src",data.url).show();
-						}else{
-							$("#logoArea").html('<img class="ent-LOGO cursor-pointer" src="'+data.url+'" onclick="document.getElementById(\'upload\').click();uploadType=0;">');
-						}
-					}else{
-						if(uploadType == 1){
-							alert("上传二维码失败，请重新上传。");
-						}else{
-							alert("上传LOGO失败，请重新上传。");
-						}
-					}
-				},
-				error: function(){
-					if(uploadType == 1){
-						alert("上传二维码失败，请重新上传。");
-					}else{
-						alert("上传LOGO失败，请重新上传。");
-					}
-				}
-			});
-		}else{
-			alert(data.msg)
-		}
- 	}
-};
-try{
-	$("#uploadLogo").upload(option);
-}catch(e){}
-     //
-function uploadProcess(url,field){
-	
-}
-$("#s_persion").blur(function(){
-	var str = $("#s_persion").val();
-	if (str == ""){
-    $("#s_persion").parent().next().children().css("display","inline");
-    $("#s_persion").parent().next().css("display","inline");
-	}else{
-    $("#s_persion").parent().next().css("display","none");
-	}
-  });
-$("#s_enturl").blur(function(){
-	var str = $("#s_enturl").val();
-	if (str == ""){
-    $("#s_enturl").parent().next().css("display","inline");
-    $("#s_enturl").parent().next().css("display","none");
-	}else if ($("#s_enturl").val().length>0&& $("#s_enturl").val().indexOf(".")==-1){
-    $("#s_enturl").parent().next().css("display","inline");
-    $("#s_enturl").parent().next().children().css("display","inline").html("公司网站格式错误");
-	}else{
-    $("#s_enturl").parent().next().css("display","none");
-	}
-  });
-/**
-$("#Tel").blur(function(){	
-	var str = $("#Tel").val();
-	var telReg = !!str.match(/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/);
-	if (str == ""){
-    $("#Tel").parent().next().css("display","inline");
-    $("#Tel").parent().next().children().css("display","none");
-	}else if(telReg == false){
-    $("#Tel").parent().next().css("display","inline");
-    $("#Tel").parent().next().children().css("display","inline").html("手机号码格式错误");
-	}else{
-    $("#Tel").parent().next().css("display","none");
-	}
-  });
-**/
-//
-function btnSaveForm(){
-		//表单验证
-	var validForm = bindValidForm({
-		url: "/member/yellowpage/dosave/enterprise",
-		ajaxPost:true,
-		callback:function(data){
-		if(data == null || data == "" || typeof(data.info) == "undefined"){
-			window.location.href = "/";
-			return;
-		}
-   		alert(data.info);		
-		window.location.href="/member/yellowpage/show/enterprise/"+ $entid;	
-		}
-	});
-	};
-	//
-	var $chiancity=false, $listent = false,$gs=true;
-	var as1=entsel=btempwords=czb=chf1="";
-	var $relationlen=0;
-	var $entid={{.T.entid}}
-	var phone=dphone=serentinfoid=serviceid="";
-	//联系地址
-	var province = {{.T.entinfo.i_province}};
-	var city = {{.T.entinfo.i_city}};
-	var area = {{.T.entinfo.i_area}};
-	//服务模板
-	var template_content = "<tr><td><div class='row service_row'> "
-	+"<div class='col-sm-1'><img class='hidden-xs' src='${s_images}' style='width:120px;height:120px'></div>"
-	+" <div class='col-sm-10'>"
-	+"<div class='linebser service_des'><div class='servicename text-primary'>${s_name}</div><div class='text-muted'>${s_introduction}</div><div class='text-muted'>${i_isopen}</div></div>"
-	+"</div><div class='col-sm-1 servicename'> </div>"
-	+"</div></td><tr>"
-</script>
-<script src="/js/enterprise.js"></script>
-</html>

core/src/web/templates/member/incmobile/copyright.html

@@ -1,43 +1,12 @@
-<style >
-.cp_ct,.cp_pt,.cp_wk{
-	margin:20px 0px 0px 15px;
-}
-.cp_title{
-	font-size:16px;
-	margin: 20px 0px 10px 15px;
-    font-weight: 600;
-}
-.cp_first{
-	margin: 2px 0px 3px 15px;
-}
-.cp_first  span{
-	color:#999;
-}
-.cp_ctcont,.cp_wkcont,.cp_ptcont{
-	padding: 0px 0px 10px;
-	border-bottom: 1px solid rgb(229, 230, 233);
-}
-#lmore_wk,#lmore_ct,#lmore_pt{
-	width:100%;
-	margin:10px 0px;
-}
-#lmore_wk span,#lmore_ct span,#lmore_pt span{
-	border: 1px solid rgb(22, 160, 134) !important;
-	color: rgb(22, 160, 134) !important;
-}
-.copyright{
-	margin-bottom:20px;
-}
-</style>
 <div class="comnav">
-	<center><span class="glyphicon qiyegaikuang"></span>&nbsp;&nbsp;著作权</center>
+	<center><span class="glyphicon qmx-icon-book"></span>&nbsp;&nbsp;著作权</center>
 	<span class="header"  data="c_copyright" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
 <div class="combody copyright">
 	{{if .T.copyright.SoftWareCopyRight}}
 	<div class="ent-layout-down" id="computerSoftCopyRightList">
 		<div class="b-com-title cp_ct">
-			<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>计算机软件著作权信息<front class="badge hidden">0</front>
+			<span><span class="glyphicon qmx-icon-save"></span></span>计算机软件著作权信息<front class="badge hidden">0</front>
 		</div>
 	</div>
 	<div class="text-center hidden" onClick="loadmore('ct')" id="lmore_ct">
@@ -47,7 +16,7 @@
 	{{if .T.copyright.WorkCopyRight}}
 	<div class="ent-layout-down" id="workCopyRightList">
 		<div class="b-com-title cp_wk">
-			<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>作品著作权信息<front class="badge hidden">0</front>
+			<span><span class="glyphicon qmx-icon-zuopin"></span></span>作品著作权信息<front class="badge hidden">0</front>
 		</div>
 	</div>
 	<div class="text-center hidden" onClick="loadmore('wk')" id="lmore_wk">
@@ -57,7 +26,7 @@
 	{{if .T.copyright.Patent}}
 	<div class="ent-layout-down" id="Patent">
 		<div class="b-com-title cp_pt">
-			<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>专利信息<front class="badge hidden">0</front>
+			<span><span class="glyphicon qmx-icon-xinxi"></span></span>专利信息<front class="badge hidden">0</front>
 		</div>
 	</div>
 	<div class="text-center hidden" onClick="loadmore('pt')" id="lmore_pt">

core/src/web/templates/member/incmobile/detailindex.html

@@ -4,8 +4,7 @@
 	<meta http-equiv="content-type" content="text/html; 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="yes" />
-	<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet" />
-	<link href="{{Msg "seo" "cdn"}}/css/qfw.css" rel="stylesheet" />
+{{include "/common/inc.html"}}
 	<link href="{{Msg "seo" "cdn"}}/css/entcommunity.css" rel="stylesheet" />
  	<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet" />
 	<style>
@@ -70,10 +69,13 @@
 		.staffinfo-level-2{
 			margin-top:5px;
 		}
+		li {
+			width: 100%;
+		}
 	</style>
  </head>
  <body>
-<div class="modal-backdrop fade in" style="display:none;"></div>
+
 	<div id="header">
 	
 		<div class="col-xs-12 index-header" style="text-align:center;">
@@ -104,12 +106,13 @@
 			</div>
 		</div>
 		<div class="col-xs-12 index-middle">
-			<div class="col-xs-6" style="border-right: 1px solid #16A086;" data-id="c_card" onclick="childrenshow(this);"><span class="glyphicon qiyemingpian"></span>&nbsp;企业名片</div>
+			<div class="col-xs-4" style="border-right: 1px solid #16A086;" data-id="c_card" onclick="childrenshow(this);"><span class="glyphicon qiyemingpian"></span>&nbsp;企业名片</div>
 			{{if .T.res.s_microwebsite}}
-			<div class="col-xs-6" onclick="wgw();"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</a></div>
+			<div class="col-xs-4" onclick="wgw();" style="border-right: 1px solid #16A086;"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</div>
 			{{else}}
-			<div class="col-xs-6 disabled"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</a></div>
+			<div class="col-xs-4 disabled" style="border-right: 1px solid #16A086;"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</div>
 			{{end}}
+			<div class="col-xs-4 disabled"  id="gz" onclick="follow(this);" data-id='{{.T.res._id}}'><i class="glyphicon weiguanzhu"></i>&nbsp;<span>关注<span></div>
 		</div>
 		<div class="col-xs-12 index-navtable">
 			<div class="col-xs-4 content" data-id="c_baseinfo" onclick="childrenshow(this);">
@@ -138,7 +141,7 @@
 			</div>
 			<div class="col-xs-4 content" data-id="c_copyright" onclick="childrenshow(this);">
 				<div style="height:50%;padding-top:30%;">
-					<span class="glyphicon biangengxinxi" ></span>
+					<span class="glyphicon qmx-icon-book" ></span>
 				</div>
 				<div style="height:50%;">
 					著作权(<span class="count">0</span>)
@@ -215,6 +218,15 @@
 			mCommunity().initmemer();
 			DishonestyPaging();
 			setDisabled();
+			$.get("/member/enterprise/isFollowed?entId="+entId,function(r){
+				if (r.status=="n"){
+					$("#gz").find("i").attr("class","glyphicon weiguanzhu");
+					$("#gz").find("span").text("关注");
+				}else{
+					$("#gz").find("i").attr("class","glyphicon yiguanzhu");
+					$("#gz").find("span").text("已关注");
+				}
+			});
 	})
 	$(window).resize(function(){
 	 		resize();

core/src/web/templates/member/incmobile/index.html

@@ -4,7 +4,9 @@
 		<meta http-equiv="content-type" content="text/html; 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="yes" />
-		<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
+		
+		
+		{{include "/common/inc.html"}}
 		<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet">
 		<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script>
@@ -74,6 +76,9 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 			    text-align: center;
 				overflow: hidden;
 		}
+		a.normal{
+			color:#FFF;
+		}
 	</style>
 	</head>
 <body class="index-bodybg">
@@ -92,8 +97,7 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 							<input type="hidden" name="cityNo" id="" value="1">
 							<input type="hidden" name="c_hfl" id="c_hfl" value=''>
 							<input type="hidden" name="c_zb" id="c_zb" value=''>
-							<span class="glyphicon glyphicon-camera input-after" id="camera"></span>
-							<span class="input-group-addon"><span onclick="$('#search').submit();" class="glyphicon glyphicon-search"></span></span>
+							<span class="input-group-addon"><span onclick="$('#search').submit();" class="glyphicon sousuo"></span></span>
              		</div>
 						<div id="immediately" class="immediately">
 						</div>
@@ -101,61 +105,23 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 			</div>
 		</div>
 		<footer class="footer">
-	      <div class="container">
-						<img src="{{Msg "seo" "cdn"}}/images/mobile/mobilebottom.png" width=110 />	
+			<div style="margin-bottom:20px;margin: 0px auto;margin-bottom: 40px; height: 35px;line-height: 35px;border: 1px solid #FFF;width: 170px;border-radius: 30px;">
+				<a href="/member/myFollowEnts" class="normal"><i class="glyphicon yiguanzhu">&nbsp;&nbsp;</i>我关注的企业(<span id="entcount"></span>)</a>
+			</div>
+	      <div class="container">	
+				<img src="{{Msg "seo" "cdn"}}/images/mobile/mobilebottom.png" width=110 />	
 	      </div>
 		</footer>
 <script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/qfw.js"></script>
 <script>
-$("#camera").click(function(){
-	wx.chooseImage({
-	    count: 1, // 默认9
-	    sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
-	    sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-	    success: function (res) {
-	      var localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
-			uploadImage(localIds[0]);
-	 	}
-	});
-})
-function uploadImage(localId){
-	wx.uploadImage({
-	    localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
-	    isShowProgressTips: 1, // 默认为1，显示进度提示
-	    success: function (res) {
-	        getmpname(res.serverId); // 返回图片的服务器端ID
-	 	}
-	});
-} 
-//获取企业名称
-function getmpname(serverId){
-	$.ajax({ 
-        type: 'post', 
-        url: '/wx/search/enterprise/mingpian', 
-		data:{serverId:serverId},
-        cache: false, 
-        error: function(){return false;}, 
-        success:function(obj){
-			if(obj["on"]=="y"){
-				if(obj["names"]==""){
-					alert("未匹配到企业名称");
-				}else{
-					if (obj["names"].length>0){
-						$("#query").val(obj["names"][0]);
-						$("#i_mingpian").val("1");
-						$("#mingpian").val(obj["names"].join(","));
-						$("#search").submit();	
-					}else{
-						alert("没有成功识别!");
-					}		 	
-				}
-			}else{
-				alert("名片识别请求过多！请稍后再试，或者进入查询界面输入文字查询。");
-			}
-        } 
-    }); 
-}
+$(function(){
+	$.get("http://127.0.0.1/member/enterprise/entcount",function(a){
+		alert(a)
+		$("#entcount").text(a);
+	})
+});
+
 	function changeSearchBorder(){
 		var width=$("#query").css("width");
 		width=width.substr(0,width.indexOf("p"))+"px";

core/src/web/templates/member/incmobile/list.html

@@ -5,7 +5,7 @@
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
-	<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
+	{{include "/common/inc.html"}}
  	<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet">
 	<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  </head>
@@ -22,8 +22,7 @@
 			<input type="hidden" name="mingpian" id="mingpian" value="" />
 			<input type="hidden" name="c_hfl" id="c_hfl" value='{{.T.querymap.c_hfl}}'>
 			<input type="hidden" name="c_zb" id="c_zb" value='{{.T.querymap.c_zb}}'>
-			<a class="searchbtn1" id="camera"><b class="glyphicon glyphicon-camera"></b></a>
-			<a class="searchbtn" onclick="$('#queryform').submit();"><b class="glyphicon glyphicon-search"></b></a>
+			<a class="searchbtn" onclick="$('#queryform').submit();"><b class="glyphicon sousuo"></b></a>
 			<a href="javascript:" class="searchlink">高级搜索</a>
 				<div id="immediately" class="immediately">
 				</div>
@@ -119,7 +118,7 @@
 		var data={{.T.data}}
 		var entcard={{.T.querymap.entcard}};
 		var strVar = "";
-		strVar += "<li class=\"col-xs-12\"><table align=\"center\"><caption><div class=\"left\"><a href=\"/enterprise/$Id.html\">$EntName</a><\/div><b class=\"$status\" style='float:right;margin-right:10px;'>$OpStateName<\/b><\/caption><tr><td class=\"left\">注册号：<span>$RegNo<\/span><\/td><td align='right'>法定代表人：<span>$LeRep<\/span><\/td><\/tr><tr><td class=\"left\">成立时间：<span>$EstDate<\/span><\/td><td align='right'>所在地：<span>$OpLocDistrict<\/span><\/td><\/tr><tr><td colspan=\"2\"><hr class=\"list\"><\/td><\/tr><\/table><\/li>";
+		strVar += "<li class=\"col-xs-12\"><table align=\"center\"><caption><div class=\"left\"><a href=\"/enterprise/$Id.html\">$EntName</a><b class=\"$status\" style='display:inline-block;'>$OpStateName<\/b><\/div><div style='float:right;margin-right:10px;' data-id='$Id' onclick='follow(this)'><i class='glyphicon $gz' style=\"font-size:11px;\">&nbsp;<\/i><span>$gzt</span><\/div><\/caption><tr><td class=\"left\">注册号：<span>$RegNo<\/span><\/td><td align='right'>法定代表人：<span>$LeRep<\/span><\/td><\/tr><tr><td class=\"left\">成立时间：<span>$EstDate<\/span><\/td><td align='right'>所在地：<span>$OpLocDistrict<\/span><\/td><\/tr><tr><td colspan=\"2\"><hr class=\"list\"><\/td><\/tr><\/table><\/li>";
 		
 		function loadData(){
 			   var li="";
@@ -146,12 +145,18 @@
 											 .replace("$OpLocDistrict",data[i]["OpLocDistrict"])
 											 .replace("$EstDate",data[i]["EstDate"])
 											 .replace("$Id",data[i]["_id"])
+											 .replace("$Id",data[i]["_id"])
 											 .replace("$OpStateName",data[i]["OpStateName"].substr(0,2));
 					if (data[i].OpStateName!="存续"&&data[i].OpStateName.indexOf("在营")==-1){
 						 tmp=tmp.replace("$status","ent-status-r");
 					}else{
 						tmp=tmp.replace("$status","ent-status-g");
 					}
+					if(data[i]["status"]=="y"){
+						tmp=tmp.replace("$gz","yiguanzhu").replace("$gzt","已关注");	
+					}else{
+						tmp=tmp.replace("$gz","weiguanzhu").replace("$gzt","关注");
+					}
 					li=li+tmp;
 				}
 				if(i==data.length){
@@ -284,7 +289,31 @@
 				}
 			});
 		}
-		
+		function follow(me){
+			me=$(me);
+			var id=me.attr("data-id");
+			var icon=me.find("i");
+			var text=me.find("span");
+
+			$.get("/member/enterprise/isFollowed?entId="+id,function(r){
+				if (r.status=="n"){
+					$.get("/member/enterprise/follow?entId="+id+"&flag=false",function(rs){
+						TipAssembly.show("已关注");
+						me.find("i").attr("class","glyphicon yiguanzhu");
+						me.find("span").text("已关注");
+						
+					});
+				}else{
+					$.get("/member/enterprise/follow?entId="+id+"&flag=true",function(rs){
+						
+						TipAssembly.show("已取消<br>关注");
+						me.find("i").attr("class","glyphicon weiguanzhu");
+						me.find("span").text("关注");
+					})	;
+				}
+			})
+			  event.stopPropagation();
+		}
 		</script>
 
  </body>

core/src/web/templates/member/incmobile/myfollow.html

@@ -0,0 +1,165 @@
+<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="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
+{{include "/common/inc.html"}}
+ 	<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet" />
+	<style>
+		body{
+			background:#FFF;
+			overflow:hidden;
+			width:100%;
+		}
+	</style>
+ </head>
+<body>
+<div class="mf_man">
+<div class="mf_title">
+<span class="glyphicon weiguanzhu"></span><span class="mf_one">我关注的企业</span><span class="mf_two">可关注10个企业</span>
+</div>
+<div class="mf_content">
+{{if .T.ents}}
+	{{range $k,$v:=.T.ents}}
+		<div class="mf_ent">
+		<div class="mf_qymc">
+			<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></div>
+		<div id="mf_cancel"><span class="glyphicon shibai"></span></div>
+		<div style="clear:both;"></div>
+		</div>
+	{{end}}
+		<div class="maskLayer" id="maskLayer"></div>
+		<div class="tipTriangle" id="tipTriangle">
+			<span class="triangle-up"></span>
+			<div class="text-center">
+				<b>确定取消关注？</b>
+				<div class="b-disabled margin-t-5" style="margin-bottom: 5px;"></div>
+				<button class="btn btn-primary" id="sure">确定</button>
+				<button class="btn btn-default" onclick="TipAssembly.triangleHide();">取消</button>
+			</div>
+		</div>
+{{end}}
+</div>
+<div class="text-center" id="mf_add">
+	<span class="btn btn-default">+ 添加你关注的企业名称</span>
+</div>
+
+<div class="text-center" onClick="" id="mf_tishi">
+	<span class="glyphicon tishi"></span> <span>为给你更好的使用体验目前仅支持关注10家企业</span>
+</div>
+</div>
+<div class="mf_addcontent  hidden">
+	<div class="mf_title">
+	<span class="mf_one">关注企业</span>
+	<span class="mf_save"> 确定 </span>
+	</div>
+	<div class="text-center">
+	<textarea id="mf_entName" name="mf_entName" placeholder="企业名称"></textarea>
+	</div>
+</div>
+<body>
+
+
+<script type="text/javascript">
+var currentNode = null;
+var mfflag = ""
+$("[id='mf_cancel']").click(function(){
+	TipAssembly.hide();
+	$("#tipTriangle>div>div").html($.trim($(this).prev().children("a:first").text()));
+	currentNode = $(this);
+	TipAssembly.triangleShow(currentNode,"right","200px",30,-175);
+});
+$("#sure").click(function(){
+	TipAssembly.triangleHide();
+	var dataObj = {};
+	dataObj["flag"] = true;
+	var entObj = currentNode.prev().children("a:first");
+	dataObj["entId"] = entObj.attr("href").split("/")[2].replace(".html","");
+	$.post("/member/enterprise/follow",dataObj,function(r){
+		if(r.status == "y"){
+			currentNode.children("span").removeClass("yiguanzhu").addClass("weiguanzhu");
+			TipAssembly.show("已取消关注");
+			currentNode.parents("div .mf_ent").remove();
+		}else if(r.status == "n"){
+			TipAssembly.show("取消关注失败！");
+		}else{
+			TipAssembly.show("取消关注失败！");
+		}
+	});
+});
+$("#mf_add").click(function(){
+	var flength = $(".mf_ent").length;
+	if (flength > 9){
+		TipAssembly.show("已经关注超过10家企业！");
+		return;
+	}
+	$(".mf_man").addClass("hidden");
+	$(".mf_addcontent").removeClass("hidden");
+});
+$(".mf_save").click(function(){
+	var entName = $("#mf_entName").val();
+	if(entName.length > 0){
+		$.post("/wx/member/enterprise/follow",{entName:entName},function(data){
+			mfflag = data.status;
+			if(data.status == "M"){
+				TipAssembly.show("您已经关注超过10家企业！");
+			}else if(data.status == "Y"){
+				TipAssembly.show("关注成功！");
+			}else if(data.status == "N"){
+				TipAssembly.show("关注失败！");
+			}
+		});
+	}else{
+		TipAssembly.show("请输入你要关注的企业全称！")
+	}
+});
+
+//提示框
+var TipAssembly = {
+	timeout: null,
+	show: function(text,css){
+		if(this.timeout != null){
+			clearTimeout(this.timeout);
+			this.hide();
+			this.timeout = null;
+		}
+		var thisClass = this;
+		this.timeout = setTimeout(function(){
+			thisClass.hide();
+			thisClass.timeout = null;
+			if (mfflag == "Y"){
+				window.location.href="/member/myFollowEnts";
+			}
+		},3000);
+		$("body").append('<div class="tipAssembly" id="tipAssembly">'+text+'</div>');
+		if(typeof(css) != "undefined"){
+			$("#tipAssembly").css(css);
+		}
+		$("#tipAssembly").css({"left":($(window).width()-240)/2});
+	},
+	hide: function(){
+		$("#tipAssembly").remove();
+	},
+	triangleShow: function(obj,direction,width,top,left){
+		$("#maskLayer").unbind("click").click(function(e){
+			$(this).hide();
+			$("#tipTriangle").hide();
+		});
+		$("#tipTriangle>span").addClass("triangle-"+direction);
+		$("#tipTriangle").css({width:width,top: obj.offset().top+top,left: obj.offset().left+left}).show();
+		$("#maskLayer,#tipTriangle").show();
+	},
+	triangleHide: function(){
+		$("#maskLayer,#tipTriangle").hide();
+	}
+}
+</script>
+</html>

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

@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>我发布的需求</title>
+<title>我关注的企业</title>
 {{include "/common/inc.html"}}
 <link href="{{Msg "seo" "cdn"}}/css/membercenter.css" rel="stylesheet">
 <style type="text/css">

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

@@ -1,8 +0,0 @@
-<ul class="fixBtn">
-{{if .T.entinfo.s_persion }}
-<li class="fixBtnBlur"><a href="#our" id="aour" title="联系我们" imgs="{{Msg "seo" "cdn"}}/images/u181.png">联系我们</a></li><div class="clearfix"></div>
-<li class="fixBtnBlur"><a href="#service" id="aservice" title="产品服务" imgs="{{Msg "seo" "cdn"}}/images/u197.png">产品服务</a></li><div class="clearfix"></div>
-{{end}}
-<li class="fixBtnBlur"><a href="#gs" id="ags" title="公示信息" imgs="{{Msg "seo" "cdn"}}/images/u195.png">公示信息</a></li><div class="clearfix"></div>
-<li class="fixBtnBlur"><a href="#top" id="atop" title="回顶部" imgs="{{Msg "seo" "cdn"}}/images/u193.png">回顶部</a></a></li><div class="clearfix"></div>
-</ul>

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

@@ -1,616 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width,initial-scale=1.0">
-<meta name="renderer" content="webkit">
-<title>服务管理</title>
-{{include "/common/inc.html"}}
-<link href="{{Msg "seo" "cdn"}}/css/validform.css" rel="stylesheet">
- <script src="{{Msg "seo" "cdn"}}/js/validform-min.js"></script>
-<style type="text/css">
-.smcontent {
-	height:118px;
-	border:#ddd solid 1px;
-	margin:15px 15px 10px 15px;
-}
-
-.smcontent:hover{
-	background-color:rgb(239, 243, 248);
-}
-
-.collapse ul li {
-	width:25%;
-	height:80px;
-	line-height:80px;
-}
-.imgs {
-	width:80px;
-	height:100px;
-	margin:0;
-	padding:0;
-}
-.delbtn{
-	position:absolute;
-	margin:0 0 0 -10px;
-    padding:0 0 0 0;
-	background-color:#00ffff;
-	cursor:pointer;
-}
-
-.pp{
-	position:absolute;
-	margin:-70px 0 0 0;
-    padding:0 0 0 20px;
-}
-
-#table1{
-	_border-collapse:collapse;
-	text-align:center;
-	cellspacing:10px;
-}
-#table1 td{
-	width:80px;
-	height:80px;
-}
-</style>
-</head>
-<body>
-<div class="container-fluid">
-<!-- 头部 -->
-<div class="qfw-header row">
-	<nav style="height:80px;" class="hidden-xs hidden-sm navbar navbar-default header-bottom">
-	  <div class="container-fluid" style="padding: 0px !important;">
-		<div class="hidden-sm  col-md-4 img-responsive" style="padding:0;">
-			<img alt="" class="hidden-sm img-responsive" src="http://placehold.it/480x80&text=companyname">
-        </div>
-        <div  style="height:80px;padding:0px;" class="col-md-8">
-	       	<div class="collapse navbar-collapse" style="padding: 0px !important;">
-		      <ul  style="height:80px;" class="nav navbar-nav qfw-navbar">
-		        <li><a href="#" class="qfw-navbar-active">企业信息</a></li>
-	            <li><a href="#">服务列表</a></li>
-				<li><a href="#">公示信息</a></li>
-	            <li><a href="#">信用档案</a></li>
-		      </ul>
-		    </div>
-        </div>
-        <!--<div  style="height:80px;padding:0px;" class="col-md-4 pull-right">
-        	<div  style="height:80px;" class="input-group">
-		        <button style="margin-top:15px;" class="btn btn-success" data-toggle="modal" data-target="#addModal" data-user="">增加服务</button>
-		    </div>
-        </div>--> 
-	  </div>
-	</nav>
-	<nav class="hidden-md hidden-lg navbar">
-      <ul class="nav navbar-nav qfw-navbar">
-        <li><a href="#" class="qfw-navbar-active">企业信息</a></li>
-           <li><a href="#">服务列表</a></li>
-		   <li><a href="#">公示信息</a></li>
-           <li><a href="#">信用档案</a></li>
-       <!--<li><button type="button" class="btn btn-success"><a data-toggle="modal" data-target="#addModal" data-user="">增加服务</a></button></li>-->
-	</ul>
-	</nav>
-</div>
- <!-- 中间 -->
- <div class="row">
-  <div class="col-md-1"></div>
-  <div class="col-md-10 col-sm-12 col-xs-12">
-   {{ if session "userName"}}
-   <div  style="height:60px;" class="text-right">
-       <button style="margin-top:15px;" class="btn btn-success" data-toggle="modal" data-target="#addModal" data-user="">增加服务</button>
-   </div>
-   {{end}}
-  <!---->
-  <script>
-  var template = "<div class='smcontent'><div style='float:left;margin:15px 15px 15px 15px;width:8%;'>"+
-  "<img class='hidden-xs img-responsive' style='width:80px;height:80px;' src='${s_images}' /></div>"+
-  "<div style='margin-top:18px;float:left;width:60%;'><p style='margin:6px 0 7px 0;'>"+
-  "<a href='/member/serviceinfo/${_id}'><font style='font-size:18px;'>${s_name}</font></a><span class='updel' style='float:right;margin-right:30px;'>"+
-  "<a data-toggle='modal' data-target='#updateModal' value='${_id}' onclick='findservice(this)'><font style='font-size:14px;'>编辑</font>"+
-  "</a>&nbsp;&nbsp;&nbsp;&nbsp;<a value='${_id}' onclick='delservice(this)'>"+
-  "<font style='font-size:14px;'>删除</font></a></span></p><p style='margin:0px;'>${s_introduction}<span style='float:right;margin-right:200px;'><span class='glyphicon glyphicon-yen'></span>${f_price}</span></p>"+
-  "<p><span class='glyphicon glyphicon-star'></span><span class='glyphicon glyphicon-star'></span><span class='glyphicon glyphicon-star'></span>"+
-  "<span class='glyphicon glyphicon-star'></span><span class='glyphicon glyphicon-star'></span>"+
-  "</p></div><div style='height:100%;float:left;border-left:dotted #CCC 1px;'>"+
-  "<p style='padding:15px 5px 0 20px;'>服务评价：</p><p style='padding:5px 5px 0 20px;'><span>会员级别：</span>${f_vipprice}</p>"+
-  "<P style='padding:5px 5px 0 20px;'><span>浏览数量：</span>${i_hits}</P></div></div>"	
-</script>
-<div id="audit"></div>
-<!---->
-  </div>
- </div>
- <div class="col-md-1"></div>
-</div>
-<!-- 底部 -->
-{{include "/common/bottom.html"}}
-<!-- addModal -->
-<div class="modal fade" id="addModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header" style="padding-bottom: 0px;padding-top: 0px;">
-        <a href="#" class="close" data-dismiss="modal">x</a>
-		<h4>增加服务信息</h4>
-      </div>
-       <div class="modal-body">
-				<form class="form-horizontal addform" method="POST" name="addservice">
-				<input name="userName" type="hidden" value='{{session "userName"}}'/>
-                    <div style="margin:5px 0 10px 10px;padding-left:10px;">
-                         <span style="margin-right:10px;">服务名称</span>
-						 <input type="hidden" value="" name="enterpriseid" id="enterpriseid1"/>
-                         <input style="width:60%;height:30px;" type="text" name="servicename" datatype="s" />
-                         <span class="Validform_checktip"></span>
-                    </div>
-                    <div style="margin:5px 0 10px 10px;padding-left:10px;">
-                     <span style="margin-right:10px;">服务分类</span>
-                            <select name="servicetype1" id="servicetype1" style="width:30%;height:30px;" onChange="showsecond()">
-                              <option selected="selected">一级类目</option>
-                              <option value="01">金融服务</option>
-							  <option value="02">企业登记</option>
-							  <option value="03">企业推广·广告·设计</option>
-							  <option value="04">企业日常服务</option>
-							  <option value="05">管理·咨询·培训</option>
-							  <option value="06">运输·存储</option>
-							  <option value="07">商务·商旅·办公服务</option>
-							  <option value="08">招商·资源·涉外</option>
-							  <option value="09">机械·建筑服务</option>
-							  <option value="10">其他服务</option>
-                            </select>
-                            <select name="servicetype2" id="servicetype2" style="width:25%;height:30px;" datatype="*">
-                              <option selected="selected" value="">二级类目</option>
-                            </select><span class="Validform_checktip"></span>
-                    </div>
-                    <div style="margin:5px 0 10px 10px;padding-left:10px;">
-                    <span style="margin-right:10px;">服务价钱</span>
-                    <input style="width:20%;height:30px;"  type="text" value="" name="serviceprice" datatype="n" errormsg="格式错误！" />&nbsp;元
-                            <span class="Validform_checktip"></span>
-                    </div>
-            
-                    <div style="margin:5px 0 10px 10px;padding-left:10px;">
-                    <span style="float:left;margin-right:10px;">服务描述</span>
-                    <textarea style="width:60%;height:110px;resize:none;margin-left:4px;" class="gray" value="" name="msg" altercss="gray" tip="请在这里输入服务描述。">请在这里输入服务描述。</textarea>
-                    </div>
-                    <div style="margin-left:60px;height:120px;">
-                    
-                     <div id="pic" style="width:420px;height:100px;">
-					 <table id="table1"><tr id="tr1"></tr></table>
-					</div>
-					<input type="hidden" value="" name="imgurl" id="imgurl"/> 
-					 <div class="row text-left"  id="mm"></div>
-                     
-                    </div>
-                    <div class="form-group text-right" style="padding-right:20px;">
-                          <button id="submit1" class="btn btn-primary ">提交</button>
-                          <button type="reset" class="btn btn-warning ">重置</button>
-                    </div>
-                  </div>
-                 </form>
-			</div>
-    </div>
-  </div>
-</div>
-<!-- updateModal -->
-<div class="modal fade" id="updateModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header" style="padding-bottom: 0px;padding-top: 0px;">
-        <a href="#" class="close" data-dismiss="modal">x</a>
-		<h4>修改服务信息</h4>
-      </div>
-       <div class="modal-body">
-				<form class="form-horizontal updateform" name="updateservice" method="post">
-				<input name="id" id="updateid" type="hidden" value=""/>
-                    <div style="margin:5px 0 10px 10px;padding-left:10px;">
-                         <span style="margin-right:10px;">服务名称</span>
-						<input type="hidden" value="" name="enterpriseid" id="enterpriseid2"/>
-                         <input style="width:60%;height:30px;" type="text" value="" id="updateservicename" name="servicename" datatype="s" />
-                         <span class="Validform_checktip"></span>
-                    </div>
-                    <div style="margin:5px 0 10px 10px;padding-left:10px;">
-                     <span style="margin-right:10px;">服务分类</span>
-                            <select name="servicetype11" id="servicetype11" style="width:20%;height:30px;" onChange="showsecond2()">
-                              <option selected="selected">一级类目</option>
-                              <option value="01">金融服务</option>
-							  <option value="02">企业登记</option>
-							  <option value="03">企业推广·广告·设计</option>
-							  <option value="04">企业日常服务</option>
-							  <option value="05">管理·咨询·培训</option>
-							  <option value="06">运输·存储</option>
-							  <option value="07">商务·商旅·办公服务</option>
-							  <option value="08">招商·资源·涉外</option>
-							  <option value="09">机械·建筑服务</option>
-							  <option value="10">其他服务</option>
-                            </select>
-                            <select name="servicetype22" id="servicetype22" value="" style="width:20%;height:30px;" datatype="*">
-                            </select></select><span class="Validform_checktip"></span>
-                    </div>
-                    <div style="margin:5px 0 10px 10px;padding-left:10px;">
-                    <span style="margin-right:10px;">服务价钱</span>
-                    <input style="width:20%;height:30px;"  type="text" value="" id="updateprice" name="serviceprice" datatype="n" errormsg="格式错误！" />&nbsp;元
-                            <span class="Validform_checktip"></span>
-                    </div>
-            
-                    <div style="margin:5px 0 10px 10px;padding-left:10px;">
-                    <span style="float:left;margin-right:10px;">服务描述</span>
-                    <textarea style="width:60%;height:110px;resize:none;margin-left:4px;" id="updatemsg" class="gray" value="" name="msg" altercss="gray"></textarea>
-                    </div>
-                    <div style="margin-left:60px;height:120px;">
-                    
-                     <div id="pic1" style="width:420px;height:100px;">
-					 <table id="table2"><tr id="tr2"></tr></table>
-					<input type="hidden" value="" name="imgurl1" id="imgurl1"/> 
-					 <div class="row text-left"  id="mm2"></div>
-                    </div>
-                    <div class="form-group text-right" style="padding-right:20px;">
-                           <button id="submit2" class="btn btn-primary ">提交</button>
-                           <button type="reset" class="btn btn-warning ">重置</button>
-                    </div>
-                  </div>
-                 </form>
-			</div>
-    </div>
-  </div>
-</div>
-
-<script src="/js/qfwtable.js"></script>
-<script src="/js/upload.js"></script>
-<script type="text/javascript">
-$(function (){
-	var obj = $(".navbar-nav li a.qfw-navbar-active");
-	$(".navbar-nav li a").mouseover(function (){
-		obj.removeClass("qfw-navbar-active");
-		$(this).addClass("qfw-navbar-active");
-	}).mouseout(function (){
-		$(this).removeClass("qfw-navbar-active");
-		obj.addClass("qfw-navbar-active");
-	});
-/*
-$(".updateform").Validform({
-	tiptype:3
-    });
-	
-$(".addform").Validform({
-	tiptype:3
-	});*/			
-});
-
-function toinfo(obj){
-	var id = $(obj).attr("value");
-//	alert(id);
-	$.ajax({
-		type:'post',
-		url:'/member/serviceinfo/index',
-		data:{"id":id},
-		success:function(data){
-			window.location.href='/member/serviceinfo/index'
-		}
-	});	
-}
-
-function showsecond(){
-	var servicetype1 = $("#servicetype1").val();
-//	alert(servicetype1)
-	var selects = document.getElementById("servicetype2");
-	selects.options.length=0;
-	$.ajax({
-		type:'post',
-		url:'/member/service/findsecondtype',
-		data:{"servicetype1":servicetype1},
-		dataType:'json',
-		cache:false,
-		success:function(data){
-			var list = data.types
-			for(var i=0;i<list.length;i++){
-                selects.options.add(new Option(list[i].s_name,list[i].s_code+list[i].s_name))
-			}
-		}
-	})
-}
-
-function showsecond2(){
-	var servicetype11 = $("#servicetype11").val();
-//	alert(servicetype11)
-	var selects = document.getElementById("servicetype22");
-	selects.options.length=0;
-	$.ajax({
-		type:'post',
-		url:'/member/service/findsecondtype',
-		data:{"servicetype11":servicetype11},
-		dataType:'json',
-		cache:false,
-		success:function(data){
-			var list = data.types
-			for(var i=0;i<list.length;i++){
-                selects.options.add(new Option(list[i].s_name,list[i].s_code+list[i].s_name))
-			}
-		}
-	})
-}
-
-$(function(){
-    $("#submit1").click(function(){
-		var formParam = $(".addform").serialize();//序列化表格内容为字符串    
-	    $.ajax({    
-	        type:'post',        
-	        url:'/member/service/addservice',    
-	        data:formParam,    
-	        cache:false,    
-	        dataType:'json',    
-	        success:function(data){
-	            alert(data.msg)
-	        }    
-	    });
-	})          
-}) 
-
-$(function(){
-    $("#submit2").click(function(){
-		var tds = document.getElementById("tr2").cells;
-		var urls = "";
-		for(var i=0;i<tds.length;i++){
-		 //   alert(tds[i].getElementsByTagName("img")[0].getAttribute("src"));
-			urls += tds[i].getElementsByTagName("img")[0].getAttribute("src")+",";
-		}
-		$("#imgurl1").attr("value",urls);
-		var formParam = $(".updateform").serialize();//序列化表格内容为字符串    
-	    $.ajax({    
-	        type:'post',        
-	        url:'/member/service/updateservice',    
-	        data:formParam,    
-	        cache:false,    
-	        dataType:'json',    
-	        success:function(data){
-	            alert(data.msg)
-	        }    
-	    });
-	})          
-})
-
-function delservice(obj){
-	var id = $(obj).attr("value");
-	//alert(id);
-	var r = confirm("确定删除此数据吗?");
-    	if(r==true){
-		$.ajax({    
-        type:'post',        
-        url:'/member/service/delete',    
-        data:{"id":id},    
-        cache:true,    
-        dataType:'json',    
-        success:function(data){
-            alert(data.msg)
-			history.go(0);
-        }    
-    });
-	}	
-}
-function findservice(obj){
-	document.getElementById("servicetype22").options.length=0;
-	var id = $(obj).attr("value");
-//	alert(id);
-		$.ajax({    
-        type:'post',        
-        url:'/member/service/find',    
-        data:{"id":id},    
-        cache:false,    
-        dataType:'json',    
-        success:function(data){
-            $("#updateid").attr("value",id);
-			$("#updateservicename").attr("value",data.data.s_name);
-			document.getElementById("servicetype22").options.add(new Option(data.data.s_type,data.data.s_code+data.data.s_type))
-			$("#updateprice").attr("value",data.data.f_price);
-			document.getElementById("updatemsg").innerHTML=data.data.s_introduction;
-			var imgurl = data.data.s_images;
-			var imgurls = imgurl.split(",");
-			var table = document.getElementById("table2");
-			var tr = document.getElementById("tr2");
-			for(var i=0;i<imgurls.length-1;i++){
-				var td = tr.insertCell(-1);
-				var img = document.createElement("img");
-				img.className="imgs";
-			    img.src=imgurls[i];
-			    td.appendChild(img);
-				if(i==0){
-					var pp = document.createElement("p");
-					pp.className="pp";
-					pp.innerHTML="<img title='默认展示图' src='/images/pass.png' />"
-					td.appendChild(pp);
-					var btn = document.createElement("span");
-					btn.innerHTML = "X";
-					btn.className = "delbtn";
-					td.appendChild(btn);
-					alert("此图将设为默认展示图");
-					btn.onclick=function(){
-					var td = this.parentNode.parentNode;
-					var urlss = urls.split(",");
-					urlss.splice(td.cellIndex,1);
-					tr.deleteCell(td.cellIndex);
-					urls = urlss.join(",");
-					$("#imgurl").attr("value",urls);
-					--x;
-					var td1 = tr.cells[0];
-					var pp = document.createElement("p");
-					pp.className="pp";
-					pp.innerHTML="<img title='默认展示图' src='{{Msg "seo" "cdn"}}/images/pass.png' />"
-					td1.appendChild(pp);
-				  }
-				}else{
-					var btn = document.createElement("span");
-				    btn.innerHTML = "X";
-				    btn.className = "delbtn";
-				    td.appendChild(btn);
-				    btn.onclick=function(){
-					var td = this.parentNode;
-					var index = td.cellIndex;
-					var urlss = urls.split(",");
-					urlss.splice(td.cellIndex,1);				
-					tr.deleteCell(td.cellIndex);
-	//				alert(urlss);
-	//				alert(urlss.length);
-					urls = urlss.join(",");
-					$("#imgurl").attr("value",urls);
-					--x;
-					if(index == 0){
-						var td1 = tr.cells[0];
-					var pp = document.createElement("p");
-					pp.className="pp";
-					pp.innerHTML="<img title='默认展示图' src='{{Msg "seo" "cdn"}}/images/pass.png' />"
-					td1.appendChild(pp);
-					}
-				  }
-				}
-			}
-        }    
-    });
-}
- 
-var urls=""; 
-var x = 0;
-$(function(){	
-	var option={
-		btnname:"图片上传",//按钮名
-		btnClass:"btn btn-success",
-		btnCss:{"width":"100px"},
-	    name:"upload",
-		action:"/filemanage/upload?resize=80",
-		afterError:function(data,e){
-	//			$("img").attr("src",data.url).appendTo("#pic")
-	           alert("图片上传失败")
-			},
-		afterUpload:function(data){ //此处可以重写，上传后的处理
-		      if(x>4){
-				alert("图片数量已达到上限!");
-				return;
-			}
-			  var table = document.getElementById("table1");
-			  var tr = document.getElementById("tr1");
-			  var td = tr.insertCell(-1);
-			  var img = document.createElement('img');
-			  img.className="imgs";
-			  img.src=data.s_url;
-			  td.appendChild(img);
-			  
-			  if(x==0){
-				var pp = document.createElement("p");
-				pp.className="pp";
-				pp.innerHTML="<img title='默认展示图' src='{{Msg "seo" "cdn"}}/images/pass.png' />"
-				td.appendChild(pp);
-				var btn = document.createElement("span");
-				btn.innerHTML = "X";
-				btn.className = "delbtn";
-				td.appendChild(btn);
-				alert("此图将设为默认展示图");
-				btn.onclick=function(){
-				var td = this.parentNode.parentNode;
-				var urlss = urls.split(",");
-				urlss.splice(td.cellIndex,1);
-				tr.deleteCell(td.cellIndex);
-				urls = urlss.join(",");
-				$("#imgurl").attr("value",urls);
-				--x;
-				var td1 = tr.cells[0];
-				var pp = document.createElement("p");
-				pp.className="pp";
-				pp.innerHTML="<img title='默认展示图' src='{{Msg "seo" "cdn"}}/images/pass.png' />"
-				td1.appendChild(pp);
-			  }
-			}else{
-				
-				var btn = document.createElement("span");
-			  btn.innerHTML = "X";
-			  btn.className = "delbtn";
-			  td.appendChild(btn);
-			  btn.onclick=function(){
-				var td = this.parentNode;
-				var index = td.cellIndex;
-				var urlss = urls.split(",");
-				urlss.splice(td.cellIndex,1);				
-				tr.deleteCell(td.cellIndex);
-//				alert(urlss);
-//				alert(urlss.length);
-				urls = urlss.join(",");
-				$("#imgurl").attr("value",urls);
-				--x;
-				if(index == 0){
-					var td1 = tr.cells[0];
-				var pp = document.createElement("p");
-				pp.className="pp";
-				pp.innerHTML="<img title='默认展示图' src='{{Msg "seo" "cdn"}}/images/pass.png' />"
-				td1.appendChild(pp);
-				}
-			  }
-			}
-			++x;
-			urls +=data.s_url+",";
-			$("#imgurl").attr("value",urls);
-				
-			  
-			
-		 }
-	};
-	$("#mm").upload(option);	
-
-	var option1={
-		btnname:"图片上传",//按钮名
-		btnClass:"btn btn-success",
-		btnCss:{"width":"100px"},
-		action:"/filemanage/upload?resize=80",
-		afterError:function(data,e){
-	//			$("img").attr("src",data.url).appendTo("#pic1")
-	          alert("图片上传出错!");
-			},
-		afterUpload:function(data){ //此处可以重写，上传后的处理
-			var z = document.getElementById("tr2").cells.length;
-			if(z>4){
-				alert("图片数量已达到上限!");
-				return;
-			}
-			var table = document.getElementById("table2");
-			var tr = document.getElementById("tr2");
-			var td = tr.insertCell(-1);
-		    var img = document.createElement('img');
-		    img.className="imgs";
-		    img.src=data.s_url;
-		    td.appendChild(img);
-			var btn = document.createElement("span");
-			  btn.innerHTML = "X";
-			  btn.className = "delbtn";
-			  td.appendChild(btn);
-			  btn.onclick=function(){
-				var td = this.parentNode;
-				var index = td.cellIndex;
-				tr.deleteCell(td.cellIndex);
-				if(index == 0){
-					var td1 = tr.cells[0];
-				var pp = document.createElement("p");
-				pp.className="pp";
-				pp.innerHTML="<img title='默认展示图' src='{{Msg "seo" "cdn"}}/images/pass.png' />"
-				td1.appendChild(pp);
-				}
-			  }
-		 }
-	};
-	$("#mm2").upload(option1);
-	
-	 
- var tt=$("#audit").datatable({
-   perPage:5
-  ,showHeader:true
-  ,showPagination:true
-  ,rowCallback:function(rowHtml,rowData){
-	return template.replace(/\$\{(.*?)\}/g,function(a,b,c){
-		
-		if(b=="s_images"&&rowData[b]!=undefined){
-			rowData[b]=rowData[b].substring(0,47);
-		}
-		return rowData[b];
-		});
-  }
-  , url: '/member/service/allservice'
-});	
-	
-	
-})
-
-</script>
-</body>
-</html>

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

@@ -1,571 +0,0 @@
-<html>
-<head>
-<title>{{.T.entinfo.EntName}}_企业信息_企明星</title>
-<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
-{{include "/common/inc.html"}}
-<meta name="Keywords" content="{{.T.res.EntName}},{{.T.res.EntName}}地址,{{.T.res.EntName}}怎么样"/>
-<meta name="Description" content="{{.T.entinfo.OpScope}}"/>
-<link href="{{Msg "seo" "cdn"}}/css/enterprise.css" rel="stylesheet">
-<script src="{{Msg "seo" "cdn"}}/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="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/upload.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/qfwtable.js"></script>
-<script charset="utf-8" src="{{Msg "seo" "cdn"}}/js/kindeditor/kindeditor-all.js"></script>
-<script charset="utf-8" src="{{Msg "seo" "cdn"}}/js/kindeditor/kinditem.js"></script>
-</head>
-<script>
-var entType="企业"
-</script>
-<style type="text/css">
-#share a.bds_weixin{ background:url({{Msg "seo" "cdn"}}/images/wx.png) no-repeat; width:40; height:40;}
-#share a.bds_tsina{ background:url({{Msg "seo" "cdn"}}/images/xl.png) no-repeat;  width:40; height:40;}
-#share a.bds_tqq{ background:url({{Msg "seo" "cdn"}}/images/kj.png) no-repeat;  width:40; height:40;}
-#share a.bds_qzone{ background:url({{Msg "seo" "cdn"}}/images/wb.png) no-repeat;  width:40; height:40;}
-#share a.bds_douban{ background:url({{Msg "seo" "cdn"}}/images/db.png) no-repeat;  width:40; height:40;}
-#share a.bds_more{ background:url(); margin-top:13px;}
-.ftnt:hover{ text-decoration: none;}
-.firstimg{ width:100%;}
-.bdsharebuttonbox{float: left;margin: 0px 0px 0px 0px; display:block;}
-</style>
-<body>
-{{$s_role := printf "%v" (index (session "userInfo") "s_role")}}
-{{include "/common/centerhead.html"}}
-<div id="entinfobg">	
-<div class="a-content">
-	<!--标题-->
-	<div id="titleactionimgs" class="row qfw-row">
-		<div>
-		<h3>
-		{{if .T.entinfo.EntName }}
-			{{.T.entinfo.EntName}}
-		{{end}}
-		</h3>
-		<!--企业认证图标--> 
-		{{if .T.entinfo.EntName }}
-			{{if .T.entinfo.s_action}}
-				{{$identaction:=.T.entinfo.s_action}}
-				<!--企业-->
-				{{if eq $identaction "01"}}
-					<script>entType="企业"</script>
-					<span class="glyphicon qyrz   margin-l-10 jhtb"></span> <span style="color:#fff;">已认证企业　</span> 
-						{{ if .T.entinfo.i_comauthenttype }}
-								{{ if eq .T.entinfo.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.entinfo.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.entinfo.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 style="color:#fff;">已认证个人</span> 
-				{{else if eq $identaction "03"}}
-					<script>entType="机构"</script>
-					<span class="glyphicon jgrz   margin-l-10 jhtb"></span> <span style="color:#fff;">已认证机构</span> 
-				{{else}}
-					<span class="glyphicon qyrz   margin-l-10 jhtb"></span> <span style="color:#fff;">企业认证</span>
-				{{end}}
-			{{end}}
-		{{end}}
-		</div>
-	</div>
-
-	<!--企业名片-->	
-	<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>
-				<a id="editOur" class="btn btn-primary" href="/member/yellowpage/edit/enterprise/{{.T.entid}}">编辑</a> 
-				</h4>
-				<hr>
-				<!--企业名片详细信息-->
-				
-				{{if .T.entinfo.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: 4.5px;">联系人&nbsp;：</div> 
-						<div class="three"><span class="span999">{{.T.entinfo.s_persion}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.entinfo.s_mobile }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidianhua icon_gray"></span></div> 
-						<div class="two">联系电话&nbsp;&nbsp;：</div> 
-						<div class="three"><span class="span999">{{.T.entinfo.s_mobile}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.entinfo.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>网站&nbsp;&nbsp;：</div> 
-						<div class="three"><span class="span999">{{.T.entinfo.s_enturl}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.entinfo.s_avatar }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon tupian icon_gray"></span></div> 
-						<div class="two"><script>document.write(entType)</script>LOGO：</div> 
-						<div class="three"><img src="{{.T.entinfo.s_avatar}}" class="ent-LOGO" onerror="$(this).parents('.tablediv').remove();$(this).remove();"></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.entinfo.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&nbsp;&nbsp;&nbsp;：</div> 
-						<div class="three"><span class="span999">{{.T.entinfo.s_qq}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.entinfo.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: 4.5px;">微信号&nbsp;：</div> 
-						<div class="three"><span class="span999">{{.T.entinfo.s_weixin}}</span> 
-						{{if .T.entinfo.s_qrcode}}
-						&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="text-primary " onClick="viewBarCode({{.T.entinfo.s_qrcode}});">扫一扫</a>
-						{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if or .T.entinfo.i_province .T.entinfo.i_city .T.entinfo.i_area .T.entinfo.s_address  }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidizhi icon_gray"></span></div> 
-						<div class="two">联系地址&nbsp;&nbsp;：</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.entinfo.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.entinfo.s_synopsis}}
-					{{$lensyn:=len .T.entinfo.s_synopsis }}
-					{{if gt $lensyn 5}}
-					<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>介绍&nbsp;&nbsp;：</div> 
-							<div class="three">{{.T.entinfo.s_synopsis}}</div>
-						</div> 
-					</div>
-					{{end}}
-				{{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> 
-	
-	<!--产品服务-->	
-	
-	<div class="row qfw-row qfw-p-margintop">
-		<div class="col-lg-12 border" id="service">
-			<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">
-					<div class="text-muted mt"></div>
-					<table style="width:100%;" class="text-muted mt"><tbody></tbody></table>
-				</div>
-				<div class="service_list">
-					<button id="addService"  class="btn btn-success" onclick="addService();">+添加</button>
-				</div>	
-				<div class="op1 text-center" id="loadMore" onClick="loadMore()" >加载更多</div>
-			</div>
-		</div>
-	</div>
-
-	<!--公示信息-->
-	<div class="row qfw-row qfw-p-margintop">
-		<div class="col-lg-12 border" id="gs">
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon gongshixinxi icon_gray icon_large"></span>
-				<b>公示信息</b>&nbsp{{if .T.entinfo.gs }}<font id="qggs" style="font-size:12px;"><small>(来源：<a href="http://gsxt.saic.gov.cn/" style="text-decoration: underline;color: #0099FF;">全国企业信用信息公示系统</a>)</small></font>{{end}}</h4>{{if .T.entinfo.s_microwebsite }}<font class="visible-sm visible-xs "><small><a class="wgw" style="text-decoration: none;color: #0099FF; margin-left:20px;">微官网</a></small></font>{{end}}
-				<hr>
-				{{if .T.entinfo.gs }}
-				{{if .T.entinfo.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.entinfo.RegNo}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.entinfo.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.entinfo.EntTypeName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.entinfo.LeRep }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon faren icon_gray"></span></div> 
-							<div class="two">{{.T.entinfo.EntTypeLabel}}：<span class="span999">{{.T.entinfo.LeRep}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.entinfo.RegCap }}
-					{{if ne .T.entinfo.EntType "9600" }}
-					 <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.entinfo.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.entinfo.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.entinfo.EstDate}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.entinfo.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.entinfo.Dom}} </span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.entinfo.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.entinfo.OpStateName}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.entinfo.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.entinfo.OpFrom}}
-							{{if .T.entinfo.OpTo }}至{{.T.entinfo.OpTo }}{{end}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.entinfo.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.entinfo.OpScope}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.entinfo.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.entinfo.RegOrgName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.entinfo.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.entinfo.IssBLicDate}} </span> </div> 
-						</div> 
-					</div>
-			 	{{end}}				
-				{{end}}
-			</div>
-		</div>
-	</div>
-	
-</div>
-</div>
-<!--右侧导航菜单-->
-{{include "/common/bottom.html"}}
-
-
-<!--弹出窗口显示上传的图片-->
-<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 -->
-
-<!-- addModal -->
-<div class="modal fade" id="addModal">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header" style="padding-bottom: 0px;padding-top: 0px;">
-        <a href="#" onClick="closepanel();" class="close">x</a>
-		<h4 id="edittitle">添加产品服务信息</h4>
-      </div>
-       <div class="modal-body" id="mblocation">
-			<div id ="serviceForm">
-				<form class="form-horizontal addform" method="POST" id="serdialogform" name="addservice">
-					<input name="username" type="hidden" value='{{session "userName"}}'/>
-					<input  name="enterpriseid" type="hidden" value="{{.T.entid}}">
-					<input class="sid" name="serviceid" type="hidden" >
-						<div class="row qfw-row-marginbottom" >
-							<div class="col-sm-3" align="right" style="font-size:12px;">产品服务名称</div>
-							<div class="col-sm-8"><input style="height:40px;" type="text" class="form-control sn"  name="servicename" datatype="s" /></div>
-						</div>
-						<div class="row qfw-row-marginbottom" >
-							<div class="col-sm-3" align="right" style="font-size:12px;">产品服务所在地</div>
-							<div class="col-sm-8">
-								<div id="servicecity_china">
-									<select  class="province cxselect select-control" name="province" data-first-title="全国"></select>
-									<select class="city cxselect select-control" disabled="disabled" name="city" data-first-title="选择市"></select>
-									<select class="area cxselect select-control" disabled="disabled" name="area" data-first-title="选择县"></select>
-								</div>
-							</div>
-						</div>
-						<div class="row qfw-row-marginbottom" >
-							<div class="col-sm-3" align="right" style="font-size:12px;">产品服务类型</div>
-							<div class="col-sm-8">
-								<select class="qmx-price firstservicetype" id="firstservicetype" name="s_firstservicetype" style="width:48%;">
-								   <option value="00" selected="selected">一级类目</option>                      
-									{{range $k, $v := .T.serviceClassify}}
-										<option value="{{$v.code}}">{{$v.name}}</option>
-									{{end}}
-								</select>
-								<select class="qmx-price secondservicetype" id="secondservicetype" name="s_secondservicetype" style="width:50%;">
-								  <option value="11" >二级栏目</option>
-								<script>
-									$(function(){
-										$("#firstservicetype").change(function(){
-											//当一级栏目发生改时移除二级栏目下的所有内容
-											$("#secondservicetype option").remove();
-											//为二级栏目加载内容
-											var $code = $("#firstservicetype").val();
-											{{range $k, $v := .T.serviceClassify}}
-												var tempcodes = {{$v.code}};
-												if($code == tempcodes){
-													{{range $k, $v := $v.children}}
-														{{range $k, $v := $v.children}}
-															var $valuet = {{$v.code}};
-															var $textt = {{$v.name}};
-															$("#secondservicetype").append("<option value='"+$valuet+"'>"+$textt+"</option>");
-														{{end}}
-												    {{end}}	
-												}
-												
-											{{end}}
-										});
-										
-									});
-								</script>
-								</select>
-							</div>
-						</div>
-						
-						<div class="row qfw-row-marginbottom" >
-							<div class="col-sm-3" align="right" style="font-size:12px;">价格</div>
-							<div class="col-sm-8"><input type="text" class="qmx-price price"  length=6 name="s_price" datatype="s" /> 元</div>
-						</div>	
-						
-						<div class="row qfw-row-marginbottom" >
-							<div class="col-sm-3" align="right" style="font-size:12px;">手机号</div>
-							<div class="col-sm-8"><input type="text" class="qmx-price phone"  name="s_phone" datatype="s" /></div>
-						</div>	
-						
-						<div class="row qfw-row-marginbottom" >
-							<div class="col-sm-3" align="right" style="font-size:12px;">描述</div>
-							<div class="col-sm-8">				
-								<textarea style="height:110px;resize:none;" class="form-control gray sd" id="s_introduvtion" name="s_introduvtion"></textarea>
-								<script>
-								 $(function(){
-									var kindEditInit=function(){
-								     editor = KindEditor.create('textarea[name="s_introduvtion"]', {
-									 id:"ke_editor",
-									 allowFileManager : false,
-									 filterMode:false,
-									 width : '100%',
-									 height:'20px',
-									 items:items_simp_base,
-									 allowImageRemoteImageRemote:false,
-									 uploadJson : '/filemanage/upload',
-									 afterCreate:function() {
-										    this.sync()
-									    },
-									 beforesubmit:function(){
-											this.sync()
-										},
-									 afterBlur: function(){
-											this.sync()
-										}
-									 });		
-									 }
-									 kindEditInit()
-									
-								});
-							</script>
-							</div>
-						</div>	
-					   <div class="row qfw-row-marginbottom">
-						<div class="col-sm-3" align="right" style="font-size:12px;"></div>
-						<div class="col-sm-8">
-							 <ul  class="pic" style="height:100px; width: 125%;display: none;">
-							 </ul>
-							 <input type="hidden" value=""  class="imgs" name="imgurl"/> 
-						</div>
-					  </div>
-					  <div class="row qfw-row-marginbottom">
-						<div class="col-sm-3" align="right" style="font-size:12px;"></div>
-						<div class="col-sm-8" style="height:10px;">
-							 <div class="row" >
-								<div class="col-lg-2 col-sm-2 " align="right" style=" width: 25%; height: 15%;"><div class="mupload"></div></div>
-								<div class="col-sm-6" style="height:35px;line-height:35px;"><span style="font-size:12px;">支持：jpg/gif/png格式</span></div>
-							</div> 
-						</div>
-					  </div>
-				  
-				<div class="row qfw-row-marginbottom msite-checkbox rowsolid-bottom" >
-					<div class="col-sm-3" align="right" style="font-size:12px;"></div>
-						<div class="col-sm-8">
-						<input type="checkbox" id="isshow_checked1" name="isshow" value="1" >是否在微官网显示 <input type="checkbox" class="isshow_checked" name="isshow" value="2">是否在微官网首位显示 <br>
-						<input type="checkbox" id="isshow_checked3" name="isshow" value="3" >是否发布到服务交易市场
-						</div>
-				</div>
-				
-				<div class="row" style="margin-bottom:10px;">
-					<div class=" text-right" style="padding-right:20px;">
-					  <a onclick="closepanel();" class="btn btn-default ">取消</a>
-					  <a onclick="btnAddServices(this)" class="btn btn-primary ">完成</a>
-					</div>
-				</div>
-				
-				</div>
-				</form>
-			</div>
-	   </div>
-    </div>
-  </div>
-</div>
-</body>
-
-<script type="text/javascript">
-
-	$(".bds_weixin").on("click",function(){
-	    clearWeixin();
-	});
-function clearWeixin(){
-	if($(".bd_weixin_popup_foot").length>0){
-		$(".bd_weixin_popup_foot").html("&nbsp;");
-		$(".bd_weixin_popup").css("z-index","99999");
-		return;
-	}else{
-		setTimeout(clearWeixin,30);
-	}
-}
-//
-var s_qrcode = {{.T.entinfo.s_qrcode}}
-  if (s_qrcode == ""){
-	$(".span999").next().css("display","none")
-}
-//手机号
-var phone={{session "phone"}}
-var entsel={{.T.opLocDistrict}},btempwords,chf1,czb;
-//企业信息ID
- var id = {{.T.entinfo._id}}
-//公式信息的变量
-var $gs = {{.T.entinfo.gs}};
-//关系网上的变量
-var  $relationlen = "";
-//服务模板
-var role = "{{$s_role}}"=="<nil>"?"":"{{$s_role}}";
-var isCanEdit = role==""||/^[1]$/.test(role)||/^[9]$/.test(role);
-if(!isCanEdit){
-	$("#editOur,#addService").remove();
-}
-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'><a class='text-primary' target='_blank' onclick='clickservicename(\"${_id}\",\"${s_isshow}\")'>${s_name}</a></div><div class='text-muted'>${s_introduction}</div></div>"
-+"</div><div style='text-align:right;' class='col-sm-2 servicename'>";
-if(isCanEdit){
-	template_content+="<a class='text-primary' data-id='${s_isEdit}' value='${_id}' onclick='findservice(\"${_id}\",this)'>编辑</a>   <a class='text-primary' value='${_id}' data-id='${s_isEdit}' onclick='delservice(this)'>删除</a> <a class='text-primary' id='${_id}' value='${_id}' data-id='${s_isEdit}' onclick='removeservice(this)'>下架</a></div>";
-}
-template_content+="</div></td><tr>"
-//关系网数据
-data= "";
-//注册号
-var regno="{{.T.entinfo.RegNo}}";
-var dphone=serentinfoid=serviceid="";
-var legcerno = "{{.T.entinfo.LegCerNO}}";
-var lerep="{{.T.entinfo.LeRep}}";
-//联系地址
-var province = {{.T.entinfo.i_province}};
-var city = {{.T.entinfo.i_city}};
-var area = {{.T.entinfo.i_area}};
-var as1="{{.T.entinfo.s_address}}"
-var $chiancity= false,$listent = false;
-{{if or .T.entinfo.i_province .T.entinfo.i_city .T.entinfo.i_area .T.entinfo.s_address  }}
-	$chiancity= true;
-{{end}}
-var $entid = {{.T.entid}}
-
-//定义默认的郑州经纬度
-var ptlat=113.69884285509,  ptlng=34.791342526551;
-//加载二级栏目类型
-function initSecondServiceType(firstsertype){
-	{{range $k, $v := .T.serviceClassify}}
-		var tempcodes = {{$v.code}};
-		if(firstsertype == tempcodes){
-			{{range $k, $v := $v.children}}
-				{{range $k, $v := $v.children}}
-					var $valuet = {{$v.code}};
-					var $textt = {{$v.name}};
-					$("#secondservicetype").append("<option value='"+$valuet+"'>"+$textt+"</option>");
-				{{end}}
-		    {{end}}	
-		}
-	{{end}}
-}
-</script>
-<script src="/js/enterprise.js"></script>
-
-
-</html>

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

@@ -79,7 +79,7 @@
 		</div>
 	</div>
 </div>
-<div class="notetips">
+<div class="notetips" style="display:none;">
 	<img src="{{Msg "seo" "cdn"}}/images/u28.png"/>竞标成功
 </div>
 <script src="/js/validform-min.js"></script>

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

@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>111{{.T.sinfo.s_name}}_{{Msg "seo" "qfw.market.title"}}</title>
+	<title>{{.T.sinfo.s_name}}_{{Msg "seo" "qfw.market.title"}}</title>
 	{{include "/common/inc.html"}}
 	<script src="{{Msg "seo" "cdn"}}/js/validform-min.js"></script>
 	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/My97DatePicker/WdatePicker.js"></script>

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

@@ -0,0 +1,328 @@
+<html>
+<head>
+<title>{{Msg "seo" "qfw.swordfish.title"}}</title>
+<meta name="Keywords" content="{{Msg "seo" "qfw.swordfish.key"}}"/>
+<meta name="Description" content="{{Msg "seo" "qfw.swordfish.description"}}"/>
+{{include "/common/inc.html"}}
+<link href="/css/swordfish.css" rel="stylesheet">
+<style>
+body{
+	background-color: #fff;
+	min-width:1024px;
+}
+.sf_search{
+	background: url('/images/swordfish/sf_02.png') center top no-repeat;
+	width:100%;
+	height:660px;
+	background-size: cover;
+	padding-top: 150px;
+}
+.sf_newscount{
+	background: url('/images/swordfish/sf_03.png') center top no-repeat;
+	width:100%;
+	height:500px;
+	background-size: cover;
+}
+.sf_GTwebsite{
+	background: url('/images/swordfish/sf_04.png') center top no-repeat;
+	width:100%;
+	height:500px;
+	background-size: cover;
+}
+.sf_Epwebsite{
+	background: url('/images/swordfish/sf_05.png') center top no-repeat;
+	width:100%;
+	height:500px;
+	background-size: cover;
+}
+.sf_type{
+	background: url('/images/swordfish/sf_06.png') center top no-repeat;
+	width:100%;
+	min-height:750px;
+	background-size: cover;
+}
+.sf_shm{
+    font-size: 16px;
+    line-height: 32px;
+	padding: 90px 0px 80px 10px;
+	width:100%; 
+	height:465px;
+}
+.sf_shmone{
+	float:left;
+	width:33%;
+}
+.sf_from span:first-child,.sf_lately span:first-child,.sf_today span:first-child{
+	font-size: 16px;
+    font-weight: bold;
+    color: #000;
+}
+.sf_ewm{
+	width:100%;
+	height:260px;
+	background-color:#f0f0f0;
+	padding-top:40px;
+	border:1px solid #E5E6E9;
+}
+.sf_firstewm{
+	width:100%;
+	height:260px;
+	padding-top:40px;
+}
+.sf_ewm img,.sf_firstewm img{
+	width:135px;
+	margin-bottom:20px;
+}
+.sf_ewm span,.sf_firstewm span{
+	font-size: 18px;
+    color: #000;
+}
+.sf_cp{
+	height:100px;
+	width:100%;
+	margin-bottom:100px;
+    line-height: 32px;
+    padding: 20px;
+    background-color: #f0f0f0;
+}
+.sf_cp span{
+	font-size:16px;
+	padding: 20px;
+	cursor:pointer;
+}
+.sf_ybh{
+	font-size: 14px !important;
+    color: #ccc;
+}
+.sf_geduan{
+	width:100%;
+	height:85px;
+	background-color:#fff;
+}
+.sf_collect{
+	color: #fff;
+	position: relative;
+	float:right;    
+	background-color: #24C0D7;
+    padding-top: 100px;
+	font-size: 32px;
+    width: 550px;
+    height: 300px;
+    margin-right: 10px;
+}
+.sf_collect span{
+	text-decoration: underline;
+	font-size: 36px;
+}
+.sf_GTcollect{
+	color: #fff;
+    position: relative;
+    float: left;
+    width: 551px;
+    height: 365px;
+    padding-top: 60px;
+    background-color: #316BAE;
+    margin-left: 10px;
+    font-size: 25px;
+}
+.sf_GTcollect span:first-child,.sf_Epcollect span:first-child{
+	text-decoration: underline;
+	font-size: 36px;
+}
+.sf_GTcollect span:nth-child(4),.sf_Epcollect span:nth-child(4){
+	font-size: 14px;
+    line-height: 24px;
+}
+.sf_Epcollect{
+	color: #fff;
+	position: relative;
+	float:right;    
+	width: 550px;
+    height: 309px;
+    background-color: #9A397C;
+    margin-right: 20px;
+    padding-top: 50px;
+	font-size: 32px;
+}
+.sf_jyzbdy{
+	font-size: 62px;
+    margin-bottom: 30px;
+	letter-spacing: 8px;
+}
+.sf_gxh{
+	font-size: 24px;
+    font-weight: bold;
+    margin-bottom: 40px;
+	letter-spacing: 5px;
+}
+.sf_gxh span{
+	color: #24C0D7;
+}
+.sf_form{
+	width: 30%;
+    margin-left: 31%;
+}
+.sf_form .sousuo{
+    top: 16px;
+    z-index: 99;
+    left: 12px;
+    color: #ccc;
+    font-size: 20px;
+    position: absolute;
+}
+.sf_form .sf_sousuo{
+	position: absolute;
+    display: inline-block;
+    width: 108px;
+    height: 50px;
+    background-color: #24C0D7;
+    color: #fff;
+    font-size: 20px;
+    text-align: center;
+    line-height: 50px;
+    right: -108px;
+	cursor: pointer;
+}
+.b-nav li:hover{
+	border-bottom: 3px solid #24C0D7;
+	/*cursor: pointer;*/
+}
+.b-nav li:first-child:hover{
+	border-bottom: 0px;
+}
+.b-nav-link a{
+	color:#000 !important;
+	font-weight: inherit !important;
+}
+.b-nav > ul {
+    height: 110px !important;
+    /*line-height: 110px !important;*/
+	max-width: 2250px !important;
+	padding-left: 40px;
+    padding-right: 30px;
+}
+.b-nav-main{
+	padding: 0px !important;
+    width: 80px !important;
+	background-color: #fff;
+	height: 110px;
+	line-height: 110px !important;
+}
+.b-loginStatus{
+	width:121px;
+	line-height: 110px !important;
+}
+.b-nav-logo{
+	padding-top:20px;
+}
+</style>
+</head>
+<body>
+<div style="display:none">{{include "/common/top.html"}}</div>
+<div class="b-head">
+	<div class="b-nav index-new-nva" style="border-top:0px;box-shadow: 0 0 10px #E5E6E9;">
+		<ul>
+			<li class="b-nav-logo"><img src="{{Msg "seo" "cdn"}}/images/swordfish/sf_01.png"></li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
+			<li class="pull-right b-nav-link b-nav-main"><a href="/front/entCommunity.html">社区</a></li>
+			<li class="pull-right b-nav-link b-nav-main" style="margin-right:0px;"><a href="/front/content_zhsk_list.html">知识库</a></li>
+			<li class="pull-right b-nav-link b-nav-main"><a  onclick="subsea()">招标搜索</a></li>
+		</ul>
+	</div>
+</div>
+
+<div class="sf_search text-center">
+	<div class="sf_jyzbdy">剑鱼招标订阅</div>
+	<div class="sf_gxh">是由<span>用户个性化定制</span>的全行业招标信息订阅推送服务</div>
+	<div class="sf_form">
+		<form method="post" action="/member/swordfish/searchinfolist"  name="searchsword" >
+			<div class="input-group col-xs-12">
+				<span  class="glyphicon sousuo"></span>
+	             <input type="text" id="searchname" name="searchname" class="form-control" style="height:50px;padding-left:40px;font-size: 16px;" placeholder="招标信息">
+				<input name="s_type" id="sea_type" value="1" style="display:none;"/>
+				<input name="s_name" id="sea_name" value="" style="display:none;"/>
+				<span class="sf_sousuo"  onclick="subsea()">搜索</span>
+	         		</div>
+		</form>
+	</div>
+	<div class="text-center sf_firstewm">
+	<img src="/images/u109.png"><br>
+	<span style="">微信扫一扫关注开始使用</span>
+	</div>
+</div>
+
+<div class="sf_geduan"></div>
+<div class="sf_newscount">
+	<div class="text-center sf_collect">剑鱼每天收集<br><span> 203400 </span>条信息</div>
+</div>
+<div class="sf_geduan"></div>
+<div class="sf_GTwebsite">
+	<div class="text-center sf_GTcollect">
+	这些信息来自<span> 170 </span>个政府招标网站<br><br>
+	<span>包括： <br>中国政府采购网 <br>中国建设招标网 <br>各省政府采购中心网站 <br>各省工程建设招标网站 <br>部分省级公共资源交易中心网站 <br>部分地市政府</span>
+	</div>
+</div>
+<div class="sf_geduan"></div>
+
+<div class="sf_Epwebsite">
+	<div class="sf_Epcollect text-center">
+	<span> 143 </span>个企业招标网站<br><br>
+	<span>包括： <br>51个央企、民企自有采购平台 <br>20个行业公共招标平台 <br>72个招标公司网站</span>
+	</div>
+</div>
+<div class="sf_geduan"></div>
+<div class="sf_type">
+</div>
+<div class="text-center sf_shm">
+	<div class="text-center sf_shmone">
+	<div><img src="/images/swordfish/clocks.png"></div>
+	<div class="sf_from">
+	<span>自上线以来</span><br>
+	<span>剑鱼为1000000位用户成功推送了1000000000条信息</span><br>
+	<span>其中有99999条是推送给了您</span>
+	</div>
+	</div>
+	<div class="text-center  sf_shmone">
+	<div><img src="/images/swordfish/calendar.png"></div>
+	<div class="sf_lately">
+	<span>最近三十天</span><br>
+	<span>剑鱼从2000个招标网站收录了2000000条信息</span><br>
+	<span>平均每天20000条</span>
+	</div>
+	</div>
+	<div class="text-center  sf_shmone">
+	<div><img src="/images/swordfish/sunlight.png"></div>
+	<div class="sf_today">
+	<span>今天</span><br>
+	<span>剑鱼成功为用户推送了20000条信息</span><br>
+	<span></span>
+	</div>
+	</div>
+	<div style="clear:both;"></div>
+</div>
+<div class="text-center sf_ewm">
+	<img src="/images/u109.png"><br>
+	<span style="">微信扫一扫关注开始使用</span>
+</div>
+<div class="sf_cp text-center">
+	<span onClick="window.open('/')">企明星</span>|<span onClick="window.open('/front/entCommunity.html')">企业社区</span>|<span onClick="window.open('/front/web_A_help.html')">关于我们</span>|<span onClick="window.open('/front/web_H_help.html')">帮助中心</span><br>
+	<span class="sf_ybh">©2015-2016 河南拓普 版权所有 | 豫ICP备15016539号-1</span>
+</div>
+<script type="text/javascript">
+
+function subsea(){
+	if(isLogined){
+			var searchname = $("#searchname").val();
+			searchname = searchname.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+");
+			document.getElementById("sea_name").value = searchname;
+			document.forms['searchsword'].submit();
+		}else{
+			loginModalShow();
+		}
+}
+$(".sf_login").click(function(){
+	loginModalShow();
+});
+</script>
+</body>
+</html>

push/src/config.json

@@ -61,3 +61,4 @@
     "weixin_bid": "\u003cdiv\u003e%s最新招标信息\u003c/div\u003e\u003cdiv\u003e%s\u003c/div\u003e",
     "wxRpcRemark": "请到网站个人中心查看详细."
 }
+

weixin/src/config.json

@@ -46,6 +46,8 @@
 	"msgserver":"test.qmx.top:7070",
 	"distinguishWork":{
 		"title":"识别验证码",
+		"detail":"企明星",
+		"result":"您有一个待识别的验证码，点击下方“详情”查看",
 		"description":"请识别图中验证码并回复",
 		"in":"欢迎您进入了识别验证码工作，输入“结束识别验证码”退出本次工作。",
 		"out":"您已退出本次工作，辛苦了，再见。",

weixin/src/qfw/weixin/distinguishwork.go

@@ -41,6 +41,7 @@ func processevent(p *util.Packet) {
 	event := int(p.Event)
 	switch event {
 	case util.SERVICE_DISTINGUISH:
+		log.Println("------从消息总线接收到了一个消息-----")
 		//写数据
 		if ret := make(map[string]interface{}); json.Unmarshal(p.GetBusinessData(), &ret) == nil {
 			flag, _ := ret["flag"].(bool)
@@ -175,17 +176,6 @@ func worked(o map[string]interface{}) (string, map[string]interface{}, error) {
 	}
 	workering[openId] = []string{msgId, from}
 	//发送验证码图片
-	var itm qrpc.ImgTextMsg
-	itm.ToUser = openId
-
-	var als qrpc.Articles
-	als.Title = wf.SysConfig.DistinguishWork["title"]
-	als.Description = wf.SysConfig.DistinguishWork["description"]
-	als.Url = wf.SysConfig.Qmxcdn + "/upload/spider/" + name
-	als.Picurl = wf.SysConfig.Qmxcdn + "/upload/spider/" + name
-
-	itm.News.Articles = append(itm.News.Articles, als)
-
 	var e error
 	qfwutil.Try(func() {
 		client, err := rpc.DialHTTP("tcp", wf.SysConfig.Rpcserver)
@@ -196,7 +186,13 @@ func worked(o map[string]interface{}) (string, map[string]interface{}, error) {
 			return
 		}
 		var repl qrpc.RpcResult
-		err = client.Call("WeiXinRpc.SendImgTextMsg", itm, &repl)
+		err = client.Call("WeiXinRpc.SendManagerNotifyMsg", &qrpc.NotifyMsg{
+			Openid: openId,
+			Title:  wf.SysConfig.DistinguishWork["title"],
+			Detail: wf.SysConfig.DistinguishWork["detail"],
+			Result: wf.SysConfig.DistinguishWork["result"],
+			Url:    wf.SysConfig.Qmxcdn + "/upload/spider/" + name,
+		}, &repl)
 		if err != nil {
 			log.Println(err.Error())
 			e = err
@@ -269,7 +265,6 @@ func createImg(msgId string, img []byte) (string, error) {
 		log.Println("创建验证码图片出错：", err)
 		return "", err
 	}
-	log.Println(img)
 	_, err = file.Write(img)
 	if err != nil {
 		log.Println("写入验证码图片出错：", err)

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -108,15 +108,15 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 			Url:         "http://mp.weixin.qq.com/s?__biz=MzA5MTk0MTk5Ng==&mid=406103124&idx=1&sn=c12f1cc34899f0c3b36492885567315a#rd",
 		}})
 	} else if !distinguishWork.IsWorking(openid) && r.Content == "开始识别验证码" { //进入人工识别验证码工作
-		distinguishWork.Start(openid)
 		w.ReplyText(wf.SysConfig.DistinguishWork["in"])
+		distinguishWork.Start(openid)
 	} else if distinguishWork.IsWorking(openid) { //人工识别验证码工作中。。。
 		if r.Content == "结束识别验证码" {
-			distinguishWork.End(openid)
 			w.ReplyText(wf.SysConfig.DistinguishWork["out"])
+			distinguishWork.End(openid)
 		} else if distinguishWork.IsWaitReply(openid) {
-			distinguishWork.Reply(openid, r.Content)
 			w.ReplyText(wf.SysConfig.DistinguishWork["reply"])
+			distinguishWork.Reply(openid, r.Content)
 		}
 	} else {
 		now := time.Now()