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

core/src/qfw/member/credit/creditdetail.go

@@ -4,24 +4,28 @@
 package credit
 
 import (
+	"github.com/dchest/captcha"
 	"github.com/go-xweb/xweb"
 	. "gopkg.in/mgo.v2/bson"
+	cu "qfw/coreutil"
 	"qfw/util"
 	cd "qfw/util/credit"
 	"qfw/util/mongodb"
 	"qfw/util/redis"
+	"regexp"
 	"strings"
 	"time"
 )
 
 type credit struct {
 	*xweb.Action
-	myCredit     xweb.Mapper `xweb:"/member/credit/myCredit"`     //我的积分
-	creditRule   xweb.Mapper `xweb:"/member/credit/creditRule"`   //积分规则
-	inCreditAjx  xweb.Mapper `xweb:"/member/credit/inCreditAjx"`  //ajx调用
-	sessionQdAjx xweb.Mapper `xweb:"/member/credit/sessionQdAjx"` //查看签到
-	bookInfo     xweb.Mapper `xweb:"/member/credit/bookinfo"`     //查看连续签到信息
-	creditList   xweb.Mapper `xweb:"/member/credit/creditList"`   //查询积分明细
+	myCredit       xweb.Mapper `xweb:"/member/credit/myCredit"`       //我的积分
+	creditRule     xweb.Mapper `xweb:"/member/credit/creditRule"`     //积分规则
+	inCreditAjx    xweb.Mapper `xweb:"/member/credit/inCreditAjx"`    //ajx调用
+	sessionQdAjx   xweb.Mapper `xweb:"/member/credit/sessionQdAjx"`   //查看签到
+	bookInfo       xweb.Mapper `xweb:"/member/credit/bookinfo"`       //查看连续签到信息
+	creditList     xweb.Mapper `xweb:"/member/credit/creditList"`     //查询积分明细
+	yaoqingByEmail xweb.Mapper `xweb:"/member/credit/yaoqingByEmail"` //邮箱邀请用户
 }
 
 func (c *credit) MyCredit() error {
@@ -181,3 +185,46 @@ func (c *credit) CreditList() error {
 func (c *credit) CreditRule() error {
 	return c.Render("/member/credit/creditrule.html")
 }
+
+//邮箱邀请用户
+func (c *credit) YaoqingByEmail() error {
+	userId := util.ObjToString(c.GetSession("userId"))
+	result := make(M)
+	var msg string
+	flag := false
+	if len(userId) > 0 {
+		if c.GetSession("CheckCodeId") == nil || !captcha.VerifyString(c.GetSession("CheckCodeId").(string), c.GetString("checkCodeId")) {
+			msg = "验证码错误！请重新输入验证码！"
+		} else {
+			s_email := c.GetString("s_email")
+			if isEmail(s_email) {
+				nickName := c.GetSession("nickName").(string)
+				//获取二维码随机数
+				userInfo := c.GetSession("userInfo").(*map[string]interface{})
+				openid := (*userInfo)["s_m_openid"].(string)
+				wxnum := cu.FindMyShareId(openid)
+				cu.SendMail("invitebyemail", s_email, nickName+":邀请你加入企明星", nickName, wxnum)
+				//邀请记录
+				yqmap := map[string]interface{}{}
+				yqmap["s_uid"] = userId
+				yqmap["s_toemail"] = s_email
+				yqmap["i_wxnum"] = wxnum
+				yqmap["l_date"] = time.Now().Unix()
+				mongodb.Save("invite_log", yqmap)
+				flag = true
+			}
+		}
+	} else {
+		msg = "请登录之后在操作"
+	}
+	result["flag"] = flag
+	result["msg"] = msg
+	c.ServeJson(result)
+	return nil
+}
+
+//邮箱格式验证
+func isEmail(value string) bool {
+	var emailPattern = regexp.MustCompile("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$")
+	return emailPattern.MatchString(value)
+}

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -13,6 +13,7 @@ import (
 	cf "qfw/coreconfig"
 	"qfw/mobile"
 	"qfw/util"
+	"qfw/util/credit"
 	. "qfw/util/mongodb"
 	"qfw/util/redis"
 	"strconv"
@@ -42,7 +43,7 @@ func FormatDate(src *interface{}) string {
 
 func GetEntInfo(id string) interface{} {
 	res := FindById("enterprise", id, `{"RegNo":1, "EntName":1, "EntType":1, "EntTypeName":1, "OpLocDistrict":1, "LeRep":1, "LegCerNO":1, "Tel":1, "Dom":1, "OpScope":1, "OpFrom":1, "OpTo":1, "RegCap":1, "EstDate":1, "CompForm":1, "CompFormName":1, "OpState":1, "OpStateName":1, "RegOrgName":1, "IssBLicDate":1, "Timestamp":1, "s_synopsis":1, "SourceType":1, "NB_email":1,"IndustryPhyName":1,"investor":1,"alterInfo":1, "s_enturl, "i_province":1, "i_city":1, "i_area":1,"s_action":1,"s_persion":1,"s_mobile":1,"s_address":1,"s_avatar":1,"s_microwebsite":1,"s_qq":1,"s_submitid":1,"s_email":1}`)
-	if res != nil {
+	if res != nil && len(*res) > 0 {
 		id := (*res)["s_submitid"]
 		if id != nil {
 			ud := FindById("user", id.(string), `{"i_comauthenttype":1}`)
@@ -116,9 +117,6 @@ func GetEntInfo(id string) interface{} {
 				}
 			}
 		}
-		for _, v := range alterInfo {
-			log.Println(v["AltAf"])
-		}
 		(*res)["alterInfo"] = alterInfo
 		return *res
 	}
@@ -128,15 +126,19 @@ func GetEntInfo(id string) interface{} {
 //企业黄查询结果
 func (yp *Yellowpage) EnterpriseInfo(id string) error {
 	id = strings.Split(id, "#")[0]
-	if ret, err := redis.GetBytes("enterprise", id); err == nil && false {
+	if ret, err := redis.GetBytes("enterprise", id); err == nil {
 		return yp.SetBody(*ret)
 	} else {
-		yp.T["res"] = GetEntInfo(id)
-		contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
-		if erruser == nil {
-			redis.PutBytes("enterprise", id, &contentuser, 7*ONEDAY)
+		if info := GetEntInfo(id); info != nil {
+			yp.T["res"] = info
+			contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
+			if erruser == nil {
+				redis.PutBytes("enterprise", id, &contentuser, 7*ONEDAY)
+			}
+			return yp.SetBody(contentuser)
+		} else {
+			return yp.Render("/_error.html")
 		}
-		return yp.SetBody(contentuser)
 	}
 }
 
@@ -272,6 +274,13 @@ func (yp *Yellowpage) GetRelation() error {
 			redis.Put("other", "relation-"+regNo, relation, 7*ONEDAY)
 		}
 		yp.ServeJson(M{"flag": true, "relation": relation})
+		r := relation.(map[string]interface{})
+		var links *[]map[string]interface{}
+		if d, err := json.Marshal(r["links"]); err == nil && json.Unmarshal(d, &links) == nil && len(*links) > 0 {
+			if credit.AIsHasDo(credit.A_CKGXW, util.IntAll(yp.GetSession("credit_a"))) {
+				credit.UpuserCreditSession(yp.GetSession("userId").(string), credit.A_CKGXW, "A", nil, yp.Action)
+			}
+		}
 	} else {
 		yp.ServeJson(M{"flag": false})
 	}
@@ -310,7 +319,6 @@ func makeRelation(mnregno, mnname string) interface{} {
 
 	for el := ls.Front(); el != nil; el = el.Next() {
 		v, _ := el.Value.([]string)
-		log.Println(v)
 		//加投资人
 		if _, ok := node[v[1]]; !ok {
 			node[v[1]] = map[string]string{

core/src/template.json

@@ -1,5 +1,6 @@
 {
     "registe": "您的企明星验证码是%s，请不要将该验证码告诉他人。",
     "findpwd": "您申请找回企明星帐号密码，请点击以下链接以重置密码%s，30分钟后该链接失效,请不要回复该邮件！",
-	"inviteemployee": "%s邀请你加入：<font style='color: #dd4814;'>%s</font><br><br>点击下面的链接，加入：<br>%s，该链接将于%s失效。<br><br><font style='color: #aea79f'>如果无法打开链接，请复制上面的链接粘贴到浏览器的地址栏。</font><br><br>企明星，想了解更多信息，请访问http://www.qimingxing.info。"
+	"inviteemployee": "%s邀请你加入：<font style='color: #dd4814;'>%s</font><br><br>点击下面的链接，加入：<br>%s，该链接将于%s失效。<br><br><font style='color: #aea79f'>如果无法打开链接，请复制上面的链接粘贴到浏览器的地址栏。</font><br><br>企明星，想了解更多信息，请访问http://www.qimingxing.info。",
+	"invitebyemail":"你好：<br>你的朋友%s邀请你加入：<a href='http://www.qimingxing.info' style='color:#0066CC'>企明星</a><br>微信扫码加入：<img align='top'  style='width:150px;height:146px;padding:5px;border:1px' src='http://www.qimingxing.info/front/weixinshare/%s'/>"
 }

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

@@ -21,6 +21,10 @@ ul li {
 a{
 	cursor: pointer;
 }
+.overflow-hidden{
+	overflow: hidden;
+	height: 100%;
+}
 .font-size-20{
 	font-size: 20px;
 }
@@ -121,29 +125,29 @@ a{
 	border:1px solid #E5E6E9 !important;
 }
 .a-border {
-	border: 1px solid #ddd !important;
+	border: 1px solid #e5e6e9 !important;
 }
 
 .a-border-l {
-	border-left: 1px solid #ddd !important;
+	border-left: 1px solid #e5e6e9 !important;
 }
 
 .a-border-r {
-	border-right: 1px solid #ddd !important;
+	border-right: 1px solid #e5e6e9 !important;
 }
 
 .a-border-t {
-	border-top: 1px solid #ddd !important;
+	border-top: 1px solid #e5e6e9 !important;
 }
 
 .a-border-b {
-	border-bottom: 1px solid #ddd !important;
+	border-bottom: 1px solid #e5e6e9 !important;
 }
 
 .a-border-t-only {
 	border-radius: 0px !important;
 	border: none !important;
-	border-top: 1px solid #ddd !important;
+	border-top: 1px solid #e5e6e9 !important;
 	box-shadow: none !important;
 }
 /*新样式*/
@@ -2237,14 +2241,14 @@ style="color:#D03102;margin-right:5px;"
 	top: 0px;
 }
 .b-top{
-	min-height: 25px;
+	height: 25px;
 	line-height: 25px;
 	padding-right: 87px;
 	background-color: #464645;
 	font-size: 12px;
-	font-family: "SimSun";
+	font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
 }
-.b-top>div,.b-content{
+.b-top>div{
 	max-width: 1200px;
 	margin: auto;
 }
@@ -2261,7 +2265,7 @@ style="color:#D03102;margin-right:5px;"
 	margin-right: 5px;
 	background-color: #A0A0A0;
 	text-align: center;
-	padding: 3px 9px;
+	padding: 2px 9px;
 	position: relative;
 }
 .b-top i{
@@ -2269,7 +2273,7 @@ style="color:#D03102;margin-right:5px;"
 	left: 0px;
 }
 .b-top i.fuwushichang{
-	left: 3px;
+	left: 2px;
 	top: 3px;
 }
 .b-top i.qiyeshequ{
@@ -2279,15 +2283,14 @@ style="color:#D03102;margin-right:5px;"
 .b-top i.jianyu{
 	font-size: 16px;
 	left: 3px;
-	top: 1px;
 }
 .b-top i.weiguanwang1{
-	left: 4px;
+	left: 3.5px;
 	top: 1px;
 	font-size: 14px
 }
 .b-top i.zhengcefagui{
-	left: 4.5px;
+	left: 4px;
 	top: 2px;
 }
 .b-nav{
@@ -2456,7 +2459,9 @@ style="color:#D03102;margin-right:5px;"
 	height: 35px;
 }
 .b-content{
-	padding: 15px 0px 15px 0px;
+	padding: 0px;
+	margin: 15px auto;
+	max-width: 1200px;
 }
 .b-left{
 	background-color: #FFFFFF;
@@ -2500,6 +2505,69 @@ style="color:#D03102;margin-right:5px;"
 	width: 200px;
 	height: 180px;
 }
+.b-pcshare{
+	margin-top: 10px;
+	font-size: 16px;
+	color: #A0A0A0;
+	cursor: pointer;
+	position: relative;
+}
+.b-pcshare .bdsharebuttonbox{
+	display: none;	
+}
+.bd_weixin_popup{
+	opacity: 0;
+	visibility: hidden;
+}
+.b-pcshare-content{
+	position: absolute;
+	left: -1px;
+	top: 0px;
+	cursor: auto;
+	background-color: #ffffff;
+	font-size: 14px;
+	padding: 20px 0px;
+	border: 1px solid #e5e6e9;
+	color: #666;
+	z-index: 1;
+	display: none;
+}
+.b-pcshare-content img{
+	width: 19px;
+	height: 19px;
+	margin-right: 10px;
+}
+.b-pcshare-content>div:first-child>span:last-of-type{
+	position: relative;
+	width: 100px;
+	height: 100px;
+}
+.b-pcshare-content>div:first-child>span:last-of-type>table{
+	-webkit-transform: scale(0.5,0.5);
+	position: absolute;
+	left: -50px;
+	top: -55px;
+}
+.b-pcshare-content>div:first-child>span:last-of-type{
+	cursor: auto;
+	margin-bottom: 0px;
+}
+.b-pcshare-content>div:last-child>span:last-of-type{
+	margin-bottom: 0px;
+}
+.b-pcshare-content>div:last-child>span{
+	cursor: pointer;
+}
+.b-pcshare-content>div>span{
+	display: block;
+	margin-bottom: 15px;
+}
+.b-pcshare-content>div{
+	float: left;
+	display: inline-block;
+	vertical-align: top;
+	padding: 10px 20px;
+}
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {

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

@@ -34,6 +34,10 @@ a:focus, a:hover{
 .ttcon ul li:hover{
 	color: #16a086;
 }
+.entlist-page .entlist-allclaify{
+	color: #16a086;
+	font-weight: bold;
+}
 .entlist-page .nav-tabs{
 	background-color: #f7f8fa;
 	margin-top: 20px;
@@ -120,6 +124,7 @@ a:focus, a:hover{
 	margin-right: 5px;
 }
 .entinfo-page .b-com-head .b-com-second{
+	height: 29px;
 	line-height: 29px;
 }
 .entinfo-page .b-com-head .b-com-second .glyphicon{
@@ -187,13 +192,6 @@ a:focus, a:hover{
     z-index:1003; 
     overflow: auto; 	
 }
-.entinfo-share{
-	margin-top: 10px;
-	font-size: 16px;
-	color: #A0A0A0;
-	width: 60px;
-	cursor: pointer;
-}
 .ent-tab{
 	height: 50px;
 	background-color: #F6F8FA;
@@ -290,6 +288,10 @@ a:focus, a:hover{
 	display: inline-block;
 	margin-bottom: 5px;
 }
+.entinfo-basicinfo .entinfo-round>div>div>span.entinfo-disabled{
+	background-color: #f0f0f0;
+	color: #a0a0a0;
+}
 .entinfo-basicinfo .entinfo-round>div>div>span:nth-child(2){
 	text-overflow: ellipsis;
 	overflow: hidden;
@@ -330,13 +332,14 @@ a:focus, a:hover{
 }
 /*注册资本*/
 .entinfo-basicinfo .entinfo-regcap{
-	right: 405px;
+	right: 400px;
 	top: 107px;
 	text-align: right;
 }
 .entinfo-basicinfo .entinfo-regcap>img{
 	width: 36px;
 	height: 36.5px;
+	right: -40px !important;
 }
 .entinfo-basicinfo .entinfo-regcap-round{
 	top: 120px;
@@ -378,7 +381,7 @@ a:focus, a:hover{
 .entinfo-basicinfo .entinfo-entscale>img{
 	width: 50.5px;
 	height: 43.5px;
-	left: -45px;
+	left: -50px;
 }
 .entinfo-basicinfo .entinfo-entscale-round{
 	top: 330px;
@@ -414,23 +417,28 @@ a:focus, a:hover{
 }
 /*营业期限*/
 .entinfo-basicinfo .entinfo-operperiod{
-	left: 300px;
+	left: 310px;
 	top: -28px;
 }
 .entinfo-basicinfo .entinfo-operperiod>img{
 	width: 49.5px;
 	height: 49.5px;
-	left: -45px;
+	left: -50px;
 }
 .entinfo-basicinfo .entinfo-operperiod-round{
 	top: 10px;
 	right: 100px;
 }
 /*股东信息*/
-.entinfo-shareholderinfo li{
+.entinfo-shareholderinfo .b-com-content>div{
 	margin-right: 40px;
 	margin-bottom: 20px;
 	text-align: center;
+	word-wrap: break-word;
+	display: inline-block;
+	word-break: normal;
+	width: 100px;
+	vertical-align: top;
 }
 .entinfo-shareholderinfo img{
 	width: 80px;
@@ -439,13 +447,10 @@ a:focus, a:hover{
 	border-radius: 50%;
 	margin-bottom: 10px;
 }
-.entinfo-shareholderinfo li>span{
+.entinfo-shareholderinfo .b-com-content>div>span{
 	display: block;
-	width: 100px;
-	word-wrap: break-word; 
-	word-break: normal;
 }
-.entinfo-shareholderinfo li>span:last-child{
+.entinfo-shareholderinfo .b-com-content>div>span:last-child{
 	color: #A0A0A0;
 }
 /********************关系网**********************/
@@ -544,6 +549,9 @@ a:focus, a:hover{
 	width: 110px;
 	height: 101px;
 }
+.ent-table td.ent-servicepaging{
+	padding-bottom: 0px !important;
+}
 /**************变更信息**********************/
 .ent-alterinfo li{
 	width: 100%;
@@ -641,6 +649,9 @@ a:focus, a:hover{
 	height: 25px;
 	color: #FFFFFF;
 }
+.ent-table{
+	margin-bottom: 0px;
+}
 .ent-table td{
 	padding: 15px 0px !important;
 	border-top: none !important;

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

@@ -1,7 +1,7 @@
 /*========================企业名片列表页样式========================*/
 .qfw-row { margin-left: 0px; margin-right: 0px;}
 #titleactionimgs  img{margin-left:15px;width:18px;height:18px;}
-#titleactionimgs  h3{font-family: "微软雅黑 Regular", "微软雅黑";font-weight: normal;}
+#titleactionimgs  h3{font-weight: normal;}
 .qfw-p-margintop{margin-top:5px;background-color: #fff;}
 .qfw-row-marginbottom{margin-bottom:10px;}
 span.highlight {
@@ -22,7 +22,7 @@ span.highlight {
 .rowsolid-bottom{
 	border-bottom:1px solid #CCCCCC;	
 }
-.rowFltt .qfw-text-more{position:absolute;right:10px;top:7px;cursor:pointer;color: #16a086;}
+.rowFltt .qfw-text-more{position:absolute;right:10px;top:2px;font-weight:bold;cursor:pointer;color: #16a086;}
 .tt{
 	width:90px;
 	padding-left: 15px;
@@ -39,7 +39,6 @@ span.highlight {
 }
 .ttcon{
 	width:85%;
-	font-size:12px;
 	vertical-align:top
 }
 .ttcon ul{
@@ -59,12 +58,14 @@ span.highlight {
 	max-width:180px;
 	height: 35px;
 	font-size: 14px;
-	color: #555;
+	color: #a0a0a0;
 	background-color: #fff;
 	border: 1px solid #ccc;
 	margin-right: 15px;
 }
-
+.sel-checked{
+	color: inherit;
+}
 /******注册资本、认证*******/
 #navs {position:relative}
 #navs .renzheng {position:absolute;right:10px;bottom:0px;}

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

@@ -74,7 +74,7 @@ a:focus, a:hover{
 	
 }
 .index-new-row>ul>li a {
-    font-family: '宋体 Regular', '宋体';
+    font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
     font-size: 12px;
     color: #4E5051;
 	}
@@ -123,7 +123,7 @@ a:focus, a:hover{
     font-size: 16px;
 }
 .a-com-servcename{
-    font-family: '宋体 Regular', '宋体';
+    font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
     font-size: 12px;
     color: #FF5A5F;
 	padding:5px 0px;
@@ -133,7 +133,7 @@ a:focus, a:hover{
 	margin-bottom:30px;
 }
 .index-new-rmxq-name div,.index-new-rmxq-name a{
-    font-family: '宋体 Regular', '宋体';
+    font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
     font-size: 12px;
     color: #A0A0A0;
 }
@@ -204,14 +204,14 @@ a:focus, a:hover{
 }
 .a-index  .index-new-xwzx-con .index-new-xwzx-date{
 	width:70px;
-    font-family: '宋体 Regular', '宋体';
+    font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
     font-size: 12px;
     color: #A0A0A0;
 }
 .a-index  .index-new-xwzx-con .index-new-xwzx-content{
 	height:40px;
 	width:200px;
-    font-family: '宋体 Regular', '宋体';
+    font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
     font-size: 12px;
     color: #A0A0A0;
 	overflow:hidden;
@@ -392,7 +392,7 @@ a:focus, a:hover{
 	left:10px;
 }
 .index-new-rmfw-nameent a {
-    font-family: '宋体 Regular', 宋体;
+    font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
     font-size: 12px;
     color: rgb(160, 160, 160);
 }
@@ -613,7 +613,7 @@ a:focus, a:hover{
 	text-overflow: ellipsis;
 }
 .index-new-tg-con>ul>li>span:nth-child(3){
-	font-family: '宋体 Regular', '宋体';
+	font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
 	color:#A0A0A0;
 	font-size:12px;
 }

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

@@ -155,7 +155,7 @@ a:focus, a:hover{
 	display: inline-block;
 }
 .swordfish-panel-c-t>div>span{
-	font-family: "SimSun";
+	font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
 	font-size: 12px;
 	color: #A0A0A0;
 	margin-left: 10px;

core/src/web/staticres/js/enterprise.js

@@ -93,6 +93,11 @@ function setLocation(entsel,serviceloc){
 	 sel3 = entsel.substring(0,6);
 	}
 	$.cxSelect.setVal(sel1,sel2,sel3);
+	$("#city_china select").each(function(){
+		if($(this).find("option:selected").index() > 0){
+			$(this).addClass("sel-checked");
+		}
+	});
 	if(serviceloc){	
 		//添加编辑服务中的省
 		$("#servicecity_china .province option").each(function(){
@@ -175,7 +180,7 @@ function makeFl(){
 		    var val = chf1;
 			if (val !=""){
 			if (val == tmp[i][1]){
-			str+="<li name='"+ad+"' value='"+tmp[i][1]+"' class='text-primary'>"+tmp[i][0]+"</li>"
+			str+="<li name='"+ad+"' value='"+tmp[i][1]+"' class='entlist-allclaify'>"+tmp[i][0]+"</li>"
 			var j ="J"
 			if (val > j || val == "D" || val == "E" || val == "F" || val == "G"  ){
 			$("#c_hfl").next().find("small").text("收起<")
@@ -186,7 +191,7 @@ function makeFl(){
 			str+="<li name='"+ad+"' value='"+tmp[i][1]+"'>"+tmp[i][0]+"</li>"
 			}
 			}else{
-			str+="<li name='"+ad+"' value='"+tmp[i][1]+"' "+(i==0?"class='text-primary'":"")+">"+tmp[i][0]+"</li>"
+			str+="<li name='"+ad+"' value='"+tmp[i][1]+"' "+(i==0?"class='entlist-allclaify'":"")+">"+tmp[i][0]+"</li>"
 			}
 			
 		}
@@ -203,12 +208,12 @@ function makeFl(){
 			var livtemp= tmp[i][1]+"";
 			if (val !=""){
 			if (val == tmp[i][1]){
-			str+="<li name='"+ad+"' value='"+livtemp+"' class='text-primary'>"+tmp[i][0]+"</li>"
+			str+="<li name='"+ad+"' value='"+livtemp+"' class='entlist-allclaify'>"+tmp[i][0]+"</li>"
 			}else{
 			str+="<li name='"+ad+"' value='"+livtemp+"'>"+tmp[i][0]+"</li>"
 			}
 			}else{
-			str+="<li name='"+ad+"' value='"+livtemp+"' "+(i==0?"class='text-primary'":"")+">"+tmp[i][0]+"</li>"
+			str+="<li name='"+ad+"' value='"+livtemp+"' "+(i==0?"class='entlist-allclaify'":"")+">"+tmp[i][0]+"</li>"
 			}
 			
 		}
@@ -218,13 +223,12 @@ function makeFl(){
 }
 function less(obj){
 	pred=$(obj).prev()
-	obj=$(obj).find("small")
-	var text=obj.text()
-	if(text=="更多>"){
-		obj.text("收起<")
+	var text=$(obj).text()
+	if(text=="更多"){
+		$(obj).text("收起")
 		pred.removeClass("less")
 	}else{
-		obj.text("更多>")
+		$(obj).text("更多")
 		pred.addClass("less")
 	}
 	

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

@@ -1,7 +1,6 @@
 var entType = "企业";
 var relation = null;
 var serviceList = null;
-with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];
 //解析服务列表
 $(function(){
 	//联系地址
@@ -46,7 +45,7 @@ $(function(){
 			serviceList = new ServiceList();
 		}
 	});
-	new ServiceList();
+	pcShare();
 });
 //显示地图
 function showMap(){
@@ -75,7 +74,7 @@ function initRelation(){
 				$("#entrelation-nologin").addClass("hide");
 				$("#entrelation-limit,#entrelation-noauthe").removeClass("hide");
 				$("#entrelation-infovis").hide();
-			}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.links) == "undefined" || r.links.length == 0 || typeof(r.nodes) == "undefined" || r.nodes.length <= 1)){
+			}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.relation.links) == "undefined" || r.relation.links.length == 0 || typeof(r.relation.nodes) == "undefined" || r.relation.nodes.length <= 1)){
 				relation = "";
 				$("#entrelation-infovis").hide();
 				$("#entrelation-findnull").removeClass("hide");
@@ -110,11 +109,12 @@ function ServiceList(){
 						+'<td class="b-com-name"><a href="/market/detail/'+r[i]._id+'.html">'+r[i].s_name+'</a></td>'
 						+'<td width="100" class="text-center">报价：<font class="text-primary">'+(r[i].s_pricemy==0?"面议":r[i].f_price+"元")+'</font></td>'
 						+'<td width="100" class="text-center">评价：<font class="text-primary">'+r[i].i_comments+'</font></td>'
-						+'<tr>'
+						+'</tr><tr>'
 						+'<td>'+r[i].s_introduction+'</td>'
 						+'</tr>';
 			}
-			$("#serviceList").html(html);
+			$("#serviceListPaging").parent().prevAll().remove();
+			$("#serviceListPaging").parent().before(html);
 		});
 	});
 }

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

@@ -492,4 +492,50 @@ function advertAjaxRqe(position){
 			}
 		});
 	}
+}
+//页面中分享功能
+function pcShare(){
+	this.flag = false;
+	var thisClass = this;
+	$("body").click(function(e){
+		if(e.target.id == "pcShare"){
+			$("#pcShare-content").show();
+			if(!thisClass.flag){
+				$("#pcShare-content").after('<div class="bdsharebuttonbox"><a href="#" id="bds_weixin" data-cmd="weixin" title="分享到微信">微信扫码</a><a href="#" id="bds_tsina" data-cmd="tsina" title="分享到新浪微博">新浪微博"</a><a href="#" id="bds_tqq" data-cmd="tqq" title="分享到腾讯微博">腾讯微博</a><a href="#" id="bds_qzone" data-cmd="qzone" title="分享到QQ空间">QQ空间</a><a href="#" id="bds_douban" data-cmd="douban" title="分享到豆瓣网">豆瓣</a></div>');
+				loadJS("http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion="+~(-new Date()/36e5),function(){
+					var interval = setInterval(function(){
+						if($("#bdshare_weixin_qrcode_dialog").length == 1){
+							clearInterval(interval);
+							$("#share-weixin").append($("#bdshare_weixin_qrcode_dialog").find("table"));
+							$("#bdshare_weixin_qrcode_dialog").remove();
+						}else{
+							document.getElementById('bds_weixin').click();
+						}
+					},500);
+					setTimeout(function(){
+						clearInterval(interval);
+					},60000);
+				});
+				$("#share-tsina").click(function(e){
+					document.getElementById('bds_tsina').click();
+					$("#pcShare-content").hide();
+				});
+				$("#share-tqq").click(function(e){
+					document.getElementById('bds_tqq').click();
+					$("#pcShare-content").hide();
+				});
+				$("#share-qzone").click(function(e){
+					document.getElementById('bds_qzone').click();
+					$("#pcShare-content").hide();
+				});
+				$("#share-douban").click(function(e){
+					document.getElementById('bds_douban').click();
+					$("#pcShare-content").hide();
+				});
+				thisClass.flag = true;
+			}
+		}else if(e.target.id != "pcShare-content" && $(e.target).parents(".b-pcshare-content").attr("id") != "pcShare-content" && !$(e.target).hasClass("bdsharebuttonbox") && !$(e.target).parent().hasClass("bdsharebuttonbox")){
+			$("#pcShare-content").hide();
+		}
+	});
 }

core/src/web/staticres/js/relation.js

@@ -17,23 +17,21 @@ function Relation(legcerNo,regNo,data){
 }
 Relation.prototype.init = function(){
 	var thisClass = this;
-	$(function(){
-		$("#entrelation-fullscreen").bind("click",function(){
-			thisClass.initFullScreen();
-		});
-		thisClass.w = $("#entrelation").width();
-		thisClass.h = $("#entrelation").height();
-		$("#entrelation-infovis").width(thisClass.w).append(
-			'<div class="entrelation-controlls hidden-sm hidden-xs">'
-				+'<div class="entrelation-item">'
-					+'<div id="entrelation-fullscreen" class="entrelation-box" title_pos="left"><div class="entrelation-fullscreen"></div></div>'
-				+'</div>'
+	thisClass.w = $("#entrelation").width();
+	thisClass.h = $("#entrelation").height();
+	$("#entrelation-infovis").width(thisClass.w).append(
+		'<div class="entrelation-controlls hidden-sm hidden-xs">'
+			+'<div class="entrelation-item">'
+				+'<div id="entrelation-fullscreen" class="entrelation-box" title_pos="left"><div class="entrelation-fullscreen"></div></div>'
 			+'</div>'
-		);
-		if($(".entrelation-controlls").length>0){
-			$(".entrelation-controlls").css({left:$("#entrelation").width()-$(".entrelation-controlls").width()});
-		}
+		+'</div>'
+	);
+	$("#entrelation-fullscreen").click(function(){
+		thisClass.initFullScreen();
 	});
+	if($(".entrelation-controlls").length>0){
+		$(".entrelation-controlls").css({left:$("#entrelation").width()-$(".entrelation-controlls").width()});
+	}
 	//处理全屏
 	$(document).on('webkitfullscreenchange mozfullscreenchange msfullscreenchange fullscreenchange', function(){
 	    if (!document.fullscreenElement && !document.mozFullScreenElement && !document.webkitFullscreenElement && !document.msFullscreenElement){
@@ -80,9 +78,10 @@ Relation.prototype.init = function(){
 	htmls= htmls+ "<div style='margin:10px 0px;' class='hidden-sm hidden-xs'><span class='text-muted'>提示：点击鼠标右键可以删除不想看的节点。</span></div>";
 	htmls= htmls+"</div>"
 	$("#entrelation").append(htmls);
-	this.dataProcess();
-	this.makeRelation();
-	this.redraw();
+	try{	
+		this.dataProcess();
+		this.makeRelation();	
+	}catch(e){}
 }
 Relation.prototype.dataProcess = function(){
 	var reg = new RegExp(/(有限公司|有限责任公司|股份有限公司|总公司|分公司|公司|事务所|合伙企业)$|\(.*\)|\（.*\）/g);

core/src/web/templates/_err.html

@@ -11,7 +11,7 @@
 			</div>
 			<div class="col-lg-6 col-md-6 col-sm-6" style="padding-top: 100px;padding-bottom: 50px;">
 				<div style="padding-left: 55px;"><h4><strong class="text-muted">网络错误，页面找不到</strong></h4></div>
-				<div id="alink" class="text-center" style="width:300px;margin-top:30px;"><h4 style="display:inline-block;"><a href="{{.T.refer}}"><img s1="reload.png" s2="u170.png" src="/images/reload.png" style="width:18px;margin-right:5px;">刷新页面</a>　|　</h4><h4 style="display:inline-block"><a href="/"><img s1="home1.png" s2="home2.png" src="/images/home1.png" style="width:18px;margin-right:5px;">返回首页</a></h4></div>
+				<div id="alink" class="text-center" style="width:300px;margin-top:30px;"><h5 style="display:inline-block;"><a href="{{.T.refer}}"><img s1="reload.png" s2="u170.png" src="/images/reload.png" style="width:18px;margin-right:5px;">刷新页面</a>　|　</h5><h5 style="display:inline-block"><a href="/"><img s1="home1.png" s2="home2.png" src="/images/home1.png" style="width:18px;margin-right:5px;">返回首页</a></h5></div>
 			</div>
 		</div>
 	</div>

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

@@ -1,3 +1,14 @@
+<style>
+body{
+	background-color: #f0f0f0;
+}
+.b-content{
+	background-color: #ffffff;
+}
+h5 a{
+	color: #a0a0a0;
+}
+</style>
 <div class="b-head">
 	{{include "/common/top.html"}}
 	<div class="b-nav">

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

@@ -284,7 +284,7 @@ function afterLoginSkip(data,flag){
 					<div class="login wxlogin hidden-xs col-md-5">
 						<div class="text-muted" style="margin-top:5px;font-weight: 700;color:#000;font-size: 14px;">微信扫码登录</div>
 						<img alt="加载中.." style="width:124px;height:127px;margin:20px;" id="wxPic" class="border">
-						<div class="text-muted" style="line-height: 22px;margin-top:5px;font-family: '宋体 Regular', 宋体;font-size: 12px;color: rgb(160, 160, 160);">使用微信扫描登录<br/>新用户自动注册</div>
+						<div class="text-muted" style="line-height: 22px;margin-top:5px;font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;;font-size: 12px;color: rgb(160, 160, 160);">使用微信扫描登录<br/>新用户自动注册</div>
 					</div>
 					<div class="login col-md-7" style="border-left:1px solid #F0F0F0;">
 						<form class="form-horizontal loginForm" method="post" style="width:220px;margin-left: 40px;">

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

@@ -83,7 +83,7 @@
 					<img class="img-circle" src="{{$s_avatar}}" onerror="this.className='img-circle defaultHeadImg';this.src='/images/image_radius_bg.png'">
 				{{end}}
 			</div>
-			<div><span class="member-loginName cursor-pointer" onclick="window.location.href = '/member/show/memberindex'">{{session "nickName"}}</span></div>
+			<div><span style="line-height:35px" class="member-loginName cursor-pointer" onclick="window.location.href = '/member/show/memberindex'">{{session "nickName"}}</span></div>
 			<div>
 			{{if session "credit_qd"}}
 				{{if eq (session "credit_qd") "y"}}

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

@@ -56,7 +56,7 @@
 		  {{range $k,$v:=.T.data}}
 			  <tr>
 			  <td>
-			  <div style="margin-top:10px;font-weight: bold;font-size:16px;"><a target="_blank"  href="/front/webregulationscontent/{{index $v "_id"}}.html">{{index $v "s_title"}}</a></div><div style=" font-size:12px; color:#666666; margin:15px 0px 5px 0; font-family: SimSun; font-weight: 400; font-style:normal;"><span style="">发布日期：{{index $v "l_createdate"}}</span>　|　<span>所属类别：{{index $v "s_code"}}</span></div>
+			  <div style="margin-top:10px;font-weight: bold;font-size:16px;"><a target="_blank"  href="/front/webregulationscontent/{{index $v "_id"}}.html">{{index $v "s_title"}}</a></div><div style=" font-size:12px; color:#666666; margin:15px 0px 5px 0; font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif; font-weight: 400; font-style:normal;"><span style="">发布日期：{{index $v "l_createdate"}}</span>　|　<span>所属类别：{{index $v "s_code"}}</span></div>
 			  <div style=" font-size:14px;line-height:24px;color: #000000; width:80%; padding: 5px 0px;">{{if eq (index $v "s_content") ""}}{{index $v "s_mbcontent"}}......{{else}}{{index $v "s_content"}}{{end}}</div>
 			  </td>
 			  </tr>

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

@@ -62,7 +62,7 @@ $(document).ready(function(){
 	     <!--<div class="col-md-3 logoDiv" style=" height:80px; width:200px;">
 			<a href="/"><img alt="" class="hidden-xs img-responsive" src="/images/header_logo.png"  style="width:200px; margin:10px 30px 30px 15px;"></a>
         </div>
-		<div class="col-md-2" ><p style="font-size:28px; color:#999999; font-weight:bold; font-family:'微软雅黑 Bold', '微软雅黑'; margin-top:20px;
+		<div class="col-md-2" ><p style="font-size:28px; color:#999999; font-weight:bold; margin-top:20px;
 		 border-left:1px solid #333333; padding-left:20px; margin-left:15px;">新闻资讯</p></div>
         <div class="col-md-6 text-left" style=" margin-top:20px;">
 		<div style="margin:5px" class="input-group pull-right" id="search"><input type="text" id="searchtext" value=""  data-original-title="Search" class="form-control" placeholder="请输入检索条件..." style=" border:2px solid #DD4814; border-radius: 4px;"><span class="input-group-btn"><a href="/manage/web_newexpresslist" class="btn" data-original-title="Search" id="searchtip" type="button" style=" border-radius: 4px;margin-left:5px; background-color:#DD4814; color:#FFFFFF; width:80px; font-weight:bold;">查询</a></span></div>

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

@@ -58,7 +58,7 @@
 	<div class="member-right">
 		<div class="member-panel">
 			<div class="panel-title-out">
-				<i class="glyphicon jinbi" style="color:#FF5A5F;"></i><span>积分规则</span>
+				<i class="glyphicon jinbi"></i><span>积分规则</span>
 			</div>
 			<div class="a-line"></div>	
 			<div class="credit-explain">积分获取方法与计算规则</div>

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

@@ -65,7 +65,7 @@
 	<div class="member-right">
 		<div class="member-panel">
 			<div class="panel-title-out">
-				<i class="glyphicon zhanghao"></i><span>我的积分</span>
+				<i class="glyphicon jinbi"></i><span>我的积分</span>
 			</div>	
 			<div class="panel-body message a-border-t-only"  >	
 				<ul class="nav nav-tabs msgheader" style="margin-top:10px;position:relative">
@@ -319,11 +319,11 @@
 				<span class="modal-title" id="yaoqingModalLabel">邀请</span>
 			</div>
 			<div class="modal-body">
-				<form class="validForm form-horizontal" role="form" method="post">
+				<form class="validForm form-horizontal" role="form" id="yaoqingemail" method="post">
 				<div class="form-group">
 					<span id="col-sm-3" class="col-sm-3 control-label" for="name"><span>*</span>邀请人邮箱　</span>
 					<div class="col-sm-6">
-						<input type="text" name="s_email" class="form-control" maxlength="50"  datatype="*"z  nullmsg="请输入邮箱地址" errormsg="请输入邮箱地址" >
+						<input type="text" name="s_email" id="s_email" class="form-control" maxlength="50"  datatype="e"  nullmsg="请输入邮箱地址" errormsg="请输入邮箱地址" >
 					</div>
 					<div class="col-sm-3">
 					   <span class="Validform_checktip checkCodeIdValid Validform_error"></span>
@@ -332,7 +332,7 @@
 				<div class="form-group">
 					<span class="col-sm-3 control-label"><span>*</span>验证码　</span>
 					<div class="input-group col-sm-6 checkCodeId">
-						<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" id="chedkcode" datatype="*"  nullmsg="请输入验证码" errormsg="请输入验证码" >
+						<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" id="chedkcode" datatype="*4"  nullmsg="请输入验证码" errormsg="请输入验证码" >
 						<span class="input-group-addon " id="phone-checkCodeId">
 							<img id="yaoqing_captcha" src="/tool/captcha" onClick="reLoadCaptcha('yaoqing_captcha');">
 							<a onClick="reLoadCaptcha('yaoqing_captcha');" class="text-primary">刷新</a>
@@ -355,8 +355,9 @@
 {{include "/common/bottom.html"}}
 
 <script type="text/javascript">
+var validForm=bindValidForm({});
 $(function(){
-	bindValidForm({})
+	
 	$("#c_0,#c_1").click(function(){
 		var _v=$(this).attr("value")
 		checkContent("list_"+_v)
@@ -411,11 +412,46 @@ function toUrl(url){
 	window.location.href=url
 }
 function yaoqing(){
-	alert();
+	if($("#s_email").val()==""){
+		$("#s_email").focus();
+		return;
+	}
+	if($("#chedkcode").val()==""){
+		$("#chedkcode").focus();
+		return;
+	}
+	var formParam = $("#yaoqingemail").serialize();
+	$.ajax({    
+		type: 'post',        
+		url: '/member/credit/yaoqingByEmail',    
+		data: formParam,    
+		cache: false,    
+		dataType: 'json', 
+		success:function(r){
+			if(r&&r.flag){		
+				alert("发送成功！");
+				$("#s_email").val("");
+				$("#chedkcode").val("");
+				reLoadCaptcha("yaoqing_captcha");
+				$("#yaoqingModal").modal('hide');
+			}
+			if(r&&!r.flag){		
+				alert(r.msg);
+				$("#chedkcode").val("");
+				reLoadCaptcha("yaoqing_captcha");
+			}
+			
+		}
+	});
 }
 function reLoadCaptcha(id){
 	document.getElementById(id).src='/tool/captcha?rnd='+Math.random()
 }
+
+$('#yaoqingModal').on('hidden.bs.modal', function () {
+	$(".Validform_checktip").removeAttr("style");
+	validForm.resetForm();
+})
 </script>
 </body>
 </html>

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

@@ -17,7 +17,7 @@
 		<!--查询条件-->
 		<div class="border container-fluid hidden-sm hidden-xs" >
 			<div class="rowFl rowFltt">
-				<div class="tt lineb qfw-p-margintop" >&nbsp;所&nbsp;在&nbsp;地：</div>
+				<div class="tt lineb qfw-p-margintop" ><b>&nbsp;所&nbsp;在&nbsp;地：</b></div>
 				<div id="city_china" class="lineb ttcon" >
 					<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
 					<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
@@ -26,12 +26,12 @@
 				<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
 			</div>
 			<div class="rowFl rowFltt" >
-				<div class="tt lineb">行业类别：</div>
+				<div class="tt lineb"><b>行业类别：</b></div>
 				<div class="lineb ttcon less" id="c_hfl"></div>
-				<div class="qfw-text-more" onClick="less(this)"><small>更多></small></div>
+				<div class="qfw-text-more" onClick="less(this)">更多</div>
 			</div>
 			<div class="rowFl ">
-				<div class="tt lineb">注册资本：</div>
+				<div class="tt lineb"><b>注册资本：</b></div>
 				<div class="lineb ttcon less" id="c_zb"></div>
 			</div>
 		</div>
@@ -91,7 +91,7 @@
 											<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
 										{{end}}
 									{{end}}
-									<div>
+									<div class="margin-t-10">
 										<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
 										{{if index $v "EntType"}}
 											{{if eq $v.EntType "9600"}}
@@ -106,7 +106,6 @@
 										<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
 										<span class="margin-l-15">所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
 									</div>
-									{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
 									{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
 									{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
 								</div>

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

@@ -63,7 +63,7 @@
 					<div class="form-group margin-t-15">
 						<span class="col-sm-3 control-label"><span>*</span>验证码　</span>
 						<div class="input-group col-sm-6 checkCodeId">
-							<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" id="chedkcode" datatype="*"  nullmsg="请输入验证码" errormsg="请输入验证码" >
+							<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" id="chedkcode" datatype="*4"  nullmsg="请输入验证码" errormsg="请输入验证码" >
 							<span class="input-group-addon " id="phone-checkCodeId">
 								<img id="phone_captcha" src="/tool/captcha" onClick="reLoadCaptcha('phone_captcha');">
 								<a onClick="reLoadCaptcha('phone_captcha');" class="text-primary">刷新</a>

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

@@ -16,7 +16,6 @@
 	}
 	body{
 			background-color:#F0F0F0;
-			font-family:"微软雅黑","宋体"
 		}
 	.container-fluid .a-content{
 		margin-top:10px;

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

@@ -7,7 +7,6 @@
 <style>
 	body{
 		background-color:#F0F0F0;
-		font-family:"Microsoft YaHei","SimSun"
 	}
 	.list-new-list{
 		max-width: 940px;

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

@@ -50,7 +50,7 @@
 			</div>
 			<div class="b-com-last">
 				{{if .T.res.s_persion}}<span class="glyphicon ren2"></span>{{.T.res.s_persion}}<span class="margin-r-15"></span>{{end}}
-				{{if .T.res.s_mobile}}<span class="glyphicon shouji"></span>{{.T.res.s_mobile}}<span class="margin-r-15"></span>{{end}}
+				{{if or .T.res.s_mobile .T.res.Tel}}<span class="glyphicon shouji"></span>{{if .T.res.s_mobile}}{{.T.res.s_mobile}}{{else if .T.res.Tel}}{{.T.res.Tel}}{{end}}<span class="margin-r-15"></span>{{end}}
 				{{if .T.res.s_qq}}
 					<span class="glyphicon qq1"></span>
 					<script type="text/javascript">
@@ -76,24 +76,39 @@
 				{{end}}
 				{{if .T.res.s_enturl}}<span class="glyphicon wangzhi1"></span>{{.T.res.s_enturl}}{{end}}
 				<br>
-				{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address}}
+				{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address .T.res.Dom}}
 					<span class="glyphicon dizhi margin-0"></span>
 					<span id="city_china">
+						{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address}}
 						<select class="province cxselect select hide" id="provincesel" name="province" data-first-title="全国"></select>								
 						<select class="city cxselect select hide" id="citysel" name="city" data-first-title="选择市"></select>
 						<select class="area cxselect select hide" id="areasel" name="area" data-first-title="选择县"></select>
+						{{else if .T.res.Dom}}
+							{{.T.res.Dom}}
+						{{end}}
 					</span>
-					<input id="location" type="hidden">
-					<input id="cityname" type="hidden">
-					{{if .T.res.s_address}}
+					<input id="location" type="hidden" value="{{if .T.res.Dom}}{{.T.res.Dom}}{{end}}">
+					<input id="cityname" type="hidden" value="">
+					{{if or .T.res.s_address}}
 					<a href="javascript:void(0)" onclick="showMap()">查看详细地图</a>
 					{{end}}
 				{{end}}
 			</div>
 		</div>
-		<div class="entinfo-share">
-			<span class="glyphicon fenxiang"></span>分享
-			<div class="bdsharebuttonbox"><a href="#" id="bds_weixin" data-cmd="weixin" title="分享到微信">微信扫码</a><a href="#" id="bds_tsina" data-cmd="tsina" title="分享到新浪微博">新浪微博"</a><a href="#" id="bds_tqq" data-cmd="tqq" title="分享到腾讯微博">腾讯微博</a><a href="#" id="bds_qzone" data-cmd="qzone" title="分享到QQ空间">QQ空间</a><a href="#" id="bds_douban" data-cmd="douban" title="分享到豆瓣网">豆瓣</a></div>
+		<div class="b-pcshare">
+			<span id="pcShare"><span class="glyphicon fenxiang"></span>分享</span>
+			<div class="b-pcshare-content" id="pcShare-content">
+				<div class="text-center">
+					<span><img src="/images/wx.png">微信扫码</span>
+					<span id="share-weixin"></span>
+				</div>
+				<div class="a-border-l">
+					<span id="share-tsina"><img src="/images/sina.png">新浪微博</span>
+					<span id="share-tqq"><img src="/images/wb.png">腾讯微博</span>
+					<span id="share-qzone"><img src="/images/kj.png">QQ空间</span>
+					<span id="share-douban"><img src="/images/db.png">豆瓣</span>
+				</div>
+			</div>
 		</div>
 	</div>
 	<!--切换-->
@@ -139,93 +154,87 @@
 							<div><span>行业</span><span>{{if .T.res.IndustryPhyName}}{{.T.res.IndustryPhyName}}{{end}}</span></div>
 						</div>
 						<!--成立日期-->
-						{{if .T.res.EstDate}}
 						<div class="entinfo-estdate">
 							<div>
-								<span>成立日期</span>
-								<span>{{.T.res.EstDate}}</span>
+								<span{{if not .T.res.EstDate}} class="entinfo-disabled"{{end}}>成立日期</span>
+								<span>{{if .T.res.EstDate}}{{.T.res.EstDate}}{{end}}</span>
 							</div>
 							<img src="/images/entcommunity/chenglirizi.png">
 						</div>
 						<a class="entinfo-estdate-round"></a>
-						{{end}}
 						<!--注册资本-->
-						{{if .T.res.RegCap}}
-							{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810")}}
-							 <div class="entinfo-regcap">
-								<div>
+						<div class="entinfo-regcap">
+							<div>
+							{{if .T.res.RegCap}}
+								{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810")}}
 									<span>注册资本</span>
 									<span><script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万元</span>
-								</div>
-								<img src="/images/entcommunity/zhuceziben.png">
+								{{else}}
+									<span class="entinfo-disabled">注册资本</span>
+									<span></span>
+								{{end}}
+							{{else}}
+								<span class="entinfo-disabled">注册资本</span>
+								<span></span>
+							{{end}}
 							</div>
-							<a class="entinfo-regcap-round"></a>
-						    {{end}}
-						{{end}}
+							<img src="/images/entcommunity/zhuceziben.png">
+						</div>
+						<a class="entinfo-regcap-round"></a>
 						<!--公司类型-->
-						{{if .T.res.EntTypeName}}
-						  	<div class="entinfo-enttype">
-								<div>
-									<span>公司类型</span>
-									<span>{{.T.res.EntTypeName}}</span>
-								</div>
-								<img src="/images/entcommunity/gongsileixing.png">
+					  	<div class="entinfo-enttype">
+							<div>
+								<span{{if not .T.res.EntTypeName}} class="entinfo-disabled"{{end}}>公司类型</span>
+								<span>{{if .T.res.EntTypeName}}{{.T.res.EntTypeName}}{{end}}</span>
 							</div>
-							<a class="entinfo-enttype-round"></a>
-						{{end}}
+							<img src="/images/entcommunity/gongsileixing.png">
+						</div>
+						<a class="entinfo-enttype-round"></a>
 						<!--法定代表人-->
-						{{if .T.res.LeRep}}
-						  	<div class="entinfo-lerep">
-								<div>
-									<span>{{.T.res.EntTypeLabel}}</span>
-									<span>{{.T.res.LeRep}}</span>
-								</div>
-								<img src="/images/entcommunity/ren.png">
+					  	<div class="entinfo-lerep">
+							<div>
+								<span{{if not .T.res.LeRep}} class="entinfo-disabled"{{end}}>{{if .T.res.EntTypeLabel}}{{.T.res.EntTypeLabel}}{{else}}无{{end}}</span>
+								<span>{{if .T.res.LeRep}}{{.T.res.LeRep}}{{end}}</span>
 							</div>
-							<a class="entinfo-lerep-round"></a>
-						{{end}}
+							<img src="/images/entcommunity/ren.png">
+						</div>
+						<a class="entinfo-lerep-round"></a>
 						<!--公司规模-->
 					  	<div class="entinfo-entscale">
 							<img src="/images/entcommunity/rens.png">
 							<div>
-								<span>公司规模</span>
+								<span class="entinfo-disabled">公司规模</span>
 								<span></span>
 							</div>
 						</div>
 						<a class="entinfo-entscale-round"></a>
 						<!--登记机关-->
-						{{if .T.res.RegOrgName}}
-						  	<div class="entinfo-regorgname">
-								<img src="/images/entcommunity/dengjijiguan.png">
-								<div>
-									<span>登记机关</span>
-									<span>{{.T.res.RegOrgName}}</span>
-								</div>
+					  	<div class="entinfo-regorgname">
+							<img src="/images/entcommunity/dengjijiguan.png">
+							<div>
+								<span{{if not .T.res.RegOrgName}} class="entinfo-disabled"{{end}}>登记机关</span>
+								<span>{{if .T.res.RegOrgName}}{{.T.res.RegOrgName}}{{end}}</span>
 							</div>
-							<a class="entinfo-regorgname-round"></a>
-						{{end}}
+						</div>
+						<a class="entinfo-regorgname-round"></a>
 						<!--地址-->
-						{{if .T.res.Dom}}
-						  	<div class="entinfo-dom">
-								<img src="/images/entcommunity/dizhi.png">
-								<div>
-									<span>地址</span>
-									<span>{{.T.res.Dom}}</span>
-								</div>
+					  	<div class="entinfo-dom">
+							<img src="/images/entcommunity/dizhi.png">
+							<div>
+								<span{{if not .T.res.Dom}} class="entinfo-disabled"{{end}}>地址</span>
+								<span>{{if .T.res.Dom}}{{.T.res.Dom}}{{end}}</span>
 							</div>
-							<a class="entinfo-dom-round"></a>
-						{{end}}
+						</div>
+						<a class="entinfo-dom-round"></a>
 						<!--营业期限-->
-						{{if .T.res.OpFrom}}
 						<div class="entinfo-operperiod">
 							<img src="/images/entcommunity/shijian.png">
 							<div>
-								<span>营业期限</span>
-								<span>自{{.T.res.OpFrom}}{{if .T.res.OpTo}}至{{.T.res.OpTo}}{{end}}</span>
+								<span{{if and (not .T.res.OpFrom) (not .T.res.OpTo)}} class="entinfo-disabled"{{end}}>营业期限</span>
+								<span>自{{if .T.res.OpFrom}}{{.T.res.OpFrom}}{{end}}{{if .T.res.OpTo}}至{{.T.res.OpTo}}{{end}}</span>
 							</div>
 						</div>
 						<a class="entinfo-operperiod-round"></a>
-						{{end}}
 					</div>
 				</div>
 			</div>
@@ -236,22 +245,20 @@
 					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>股东信息
 				</div>
 				<div class="b-com-content">
-					<ul>
-						{{range $k,$v := .T.res.investor}}
-						{{if $v.InvType}}
-						<li>
-							{{if eq $v.InvType "20" "21" "22"}}
-							<img src="/images/entcommunity/ziranren.png">
-							{{else}}
-							<img src="/images/entcommunity/faren.png">
-							{{end}}
-							<span><b>{{$v.InvTypeName}}</b></span>
-							<span>{{$v.Inv}}</span>
-						</li>
-						{{end}}
+					{{range $k,$v := .T.res.investor}}
+					{{if $v.InvType}}
+					<div>
+						{{if eq $v.InvType "20" "21" "22"}}
+						<img src="/images/entcommunity/ziranren.png">
+						{{else}}
+						<img src="/images/entcommunity/faren.png">
 						{{end}}
-						<div class="clearfix"></div>
-					</ul>
+						<span><b>{{$v.InvTypeName}}</b></span>
+						<span><script>document.write({{$v.Inv}}.replace(/\s/gm,""));</script></span>
+					</div>
+					{{end}}
+					{{end}}
+					<span class="clearfix"></span>
 				</div>
 			</div>
 			{{end}}
@@ -354,7 +361,7 @@
 		<div class="hide ent-service">
 			<table class="table ent-table" id="serviceList">
 				<tr>
-					<td colspan="4" class="text-center" id="serviceListPaging"></td>
+					<td colspan="4" class="text-center ent-servicepaging" id="serviceListPaging"></td>
 				</tr>
 			</table>
 			<div class="ent-findnull hide">

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

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

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

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

weixin/src/qfw/weixin/menu.go

@@ -32,7 +32,7 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	menu.Buttons[1].SubButtons[2].Key = "oidentification"
 
 	menu.Buttons[2].Name = "会员服务"
-	menu.Buttons[2].SubButtons = make([]MenuButton, 3)
+	menu.Buttons[2].SubButtons = make([]MenuButton, 4)
 	menu.Buttons[2].SubButtons[0].Name = "微官网"
 	menu.Buttons[2].SubButtons[0].Type = MenuButtonTypeKey
 	menu.Buttons[2].SubButtons[0].Key = "msite" //"http://" + wf.SysConfig.Domain + "/weixin/site/edit" //微官网编辑
@@ -43,6 +43,9 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	menu.Buttons[2].SubButtons[2].Name = "法规查询"
 	menu.Buttons[2].SubButtons[2].Type = MenuButtonTypeUrl
 	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "lawsearchaction")
+	menu.Buttons[2].SubButtons[3].Name = "签到"
+	menu.Buttons[2].SubButtons[3].Type = MenuButtonTypeUrl
+	menu.Buttons[2].SubButtons[3].Url = fmt.Sprintf(urlstr, "signature")
 
 	//menu.Buttons[2].SubButtons[3].Name = "领取红包"
 	//menu.Buttons[2].SubButtons[3].Type = MenuButtonTypeUrl