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

core/src/qfw/coreutil/weixinrpc.go

@@ -1,6 +1,7 @@
 package coreutil
 
 import (
+	"fmt"
 	"log"
 	"net/rpc"
 	"qfw/coreconfig"
@@ -77,3 +78,19 @@ func GetJSInterfaceParam(url string) []string {
 	}
 	return ret
 }
+
+//
+func GetShareQR(url uint32) string {
+	var ret string
+	client, err := rpc.DialHTTP("tcp", rpcserver)
+	if err != nil {
+		log.Println(err.Error())
+		return ret
+	}
+	err = client.Call("WeiXinRpc.GetShareQR", url, &ret)
+	if err != nil {
+		log.Println(err.Error())
+	}
+	fmt.Println("ret:::::::::::", ret)
+	return ret
+}

core/src/qfw/front/index.go

@@ -98,7 +98,7 @@ func (i *Index) LoadIndex() error {
 		}
 		//
 		content, _ := i.Render4Cache("/index.html", &xweb.T{"data": data, "pagination": pagination, "zkdata": zkdata, "entdata": entdata, "sfdata": sfdata})
-		redis.Put("other", "/", string(content), 0) //设置首页缓存
+		redis.Put("other", "/", string(content), 60*60*2) //设置首页缓存
 		return i.SetBody(content)
 	}
 }

core/src/qfw/front/webcentent.go

@@ -11,6 +11,7 @@ import (
 	"github.com/go-xweb/xweb"
 	"html/template"
 	"log"
+	"qfw/coreutil"
 	"qfw/util"
 	"qfw/util/elastic"
 	. "qfw/util/mongodb"
@@ -42,6 +43,23 @@ type Newscont struct {
 	getJsonList xweb.Mapper `xweb:"POST /front/(\\w+)list/list"`
 	//微信端使用通用信息展示页
 	weixincontent xweb.Mapper `xweb:"GET /front/weixincontent/(\\w+)"`
+	//微信分享内容
+	weixinshare xweb.Mapper `xweb:"GET /front/weixinshare"`
+}
+
+//微信分享内容
+
+func (e *Newscont) Weixinshare() error {
+	id := coreutil.GetShareId(coreutil.TYPE_INVITE)
+	var pngdata = ""
+	if ret := redis.Get("sso", fmt.Sprintf("p_share_%d", id)); ret != nil {
+		return e.SetBody([]byte(ret.(string)))
+	} else {
+		pngdata = coreutil.GetShareQR(id)
+	}
+	e.T["pngdata"] = pngdata
+	fmt.Println("pngdata:", pngdata, "000000:", fmt.Sprintf("p_share_%d", id))
+	return e.Render("/manage/web_weixinshare.html", &e.T)
 }
 
 //文章点赞

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-18 16:22:55"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-18 16:22:55"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-19 09:51:19"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-19 09:51:19"}},"marketisstart":true,"marketrate":300}

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

@@ -226,7 +226,8 @@ a:focus, a:hover{
 }
 /********************企业画像**********************/
 .entinfo-basicinfo .b-com-content{
-	padding: 60px 0px;
+	padding-top: 60px !important;
+	padding-bottom: 60px !important;
 }
 .entinfo-basicinfo .entinfo-round{
 	border: 1px solid #DFE0E2;
@@ -538,6 +539,14 @@ a:focus, a:hover{
 	margin-top: 20px;
 	width: 200px;
 }
+/*************产品服务******************/
+.ent-service{
+	padding: 0px 20px;
+}
+.ent-service img{
+	width: 110px;
+	height: 101px;
+}
 /************公用****************/
 .ent-layout-up{
 	padding: 0px 20px;
@@ -557,16 +566,13 @@ a:focus, a:hover{
 	margin-left: 5px;
 }
 .ent-layout-up .b-com-content{
-	margin-top: 20px;
-}
-.ent-layout-down{
-	padding-top: 20px;
+	padding-top: 30px;
+	padding-bottom: 30px;
 }
 .ent-layout-down .b-com-content{
-	padding: 0px 25px;
+	padding: 30px 20px;
 }
 .ent-layout-down .b-com-title{
-	margin-bottom: 30px;
 	font-size: 16px;
 	color: #16a086;
 }
@@ -580,4 +586,20 @@ a:focus, a:hover{
 	width: 25px;
 	height: 25px;
 	color: #FFFFFF;
+}
+.ent-table td{
+	padding: 15px 0px !important;
+	border-top: none !important;
+}
+.ent-table tr:first-child{
+	border-top: none !important;
+}
+.ent-table tr:nth-child(2n+1){
+	border-top: 1px solid #e5e6e9;
+}
+.ent-table .b-com-name{
+	font-weight: bold;
+	font-size: 16px;
+	word-wrap: break-word;
+	word-break: normal;
 }

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

@@ -553,7 +553,7 @@ a:focus, a:hover{
 	border:1px solid #f0f0f0;
 }
 .index-new-tg-tb img{
-	width:40px;
+	width:36px;
 	height:39px;
 	margin-bottom:1px;
 }
@@ -566,10 +566,30 @@ a:focus, a:hover{
 	color:#FFF;
 	padding:24px 6px;
 	height:120px;
-	width:40px; 
+	width:36px; 
 	border:1px solid #FF5A5F;
 	font-size: 16px;
 }
+.index-new-mingcheng1 div{
+	height: 119px;
+	background-color:#00bcd4;
+	color:#FFF;
+	padding:24px 6px;
+	width:36px; 
+	border:1px solid #00bcd4;
+	font-size: 16px;
+	
+}
+.index-new-mingcheng2 div{
+	height: 119px;
+	background-color:#16a086;
+	color:#FFF;
+	padding:24px 6px;
+	width:36px; 
+	border:1px solid #16a086;
+	font-size: 16px;
+	
+}
 .index-new-tg-con ul li{
 	padding:5px;
 }    
@@ -597,3 +617,6 @@ a:focus, a:hover{
 	color:#A0A0A0;
 	font-size:12px;
 }
+.index-new-tg-tb .bmrzqy img{
+	margin-bottom:0px;
+}

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

@@ -155,9 +155,9 @@ a.new_red:hover, a.new_red:active {
 }
 /* 底部 */
 .qfw-bottom {
-	background: url("../images/bottom_bg.jpg");
+	background: url("../images/bottom_bg_new.jpg");
 	font-size: 12px;
-	height: 122px;
+	height: 120px;
 	padding: 0px;
 }
 
@@ -170,13 +170,14 @@ a.new_red:hover, a.new_red:active {
 
 .qfw-bottom>div {
 	display: inline-block;
+	font-size:14px;
 }
 
 .qfw-bottom img {
 	vertical-align: text-bottom;
 	margin-top: 26px;
-	width: 70px;
-	height: 70px;
+	width: 50px;
+	height: 52px;
 }
 
 .qfw-bottom-text span {

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

@@ -101,7 +101,12 @@ function ServiceList(){
 		paging = new Paging("serviceList","/front/findServiceByEntId",{entId:entId},6,function(r){
 			var html = '';
 			for(var i=0;i<r.length;i++){
-				
+				html += '<tr>'
+						+'<td rowspan="2" width="120"><img src="/images/services/default.png"></td>'
+						+'<td class="b-com-name">'+r[i].s_name+'</td>'
+						+'<tr>'
+						+'<td>'+r[i].s_introduction+'</td>'
+						+'</tr>';
 			}
 			$("#serviceList").html(html);
 		});

core/src/web/staticres/wxswordfish/style.css

@@ -529,18 +529,18 @@ img{
 }
 .tip-button{
 	float: right;
- 	margin-right: 50px;
+ 	margin-right: 20px;
 	margin-top:5px;
 }
 .tip-button span{
-	border-radius:5px;
+	border-radius:4px;
 	display:inline-block;
-	padding:3px 10px;
-	margin-right:5px;
+	padding:4px 20px;
+	margin-right:10px;
 	border:1px solid #689AFF;
 	cursor:pointer;
 }
-.tip-button span:nth-child(1){
+.tip-button span:nth-child(2){
 	background-color:#24C0D7;
 }
 .visible{
@@ -552,4 +552,8 @@ img{
 	margin-left:2px;
 	color:#999;
 }
+#txt_tip{
+	text-indent:2em;
+	padding:10px;
+}
 	

core/src/web/templates/index.html

@@ -190,7 +190,7 @@
 		<div class="a-cols row index-new-xwzx-con">
  			{{range $k,$v:=.T.data}}
  			{{ if lt $k 3}}
-			<ul class="a-wrap a-com-ul-block{{if ge $k 3}} a-com-last{{end}}{{if ge $k 2}} hidden-xs{{end}}" {{if lt $k 2}} style="border-right:1px solid #ccc;padding-bottom:0px;"{{end}}>
+			<ul class="a-wrap a-com-ul-block{{if ge $k 3}} a-com-last{{end}}{{if ge $k 2}} hidden-xs{{end}}" {{if lt $k 2}} style="border-right:1px solid #e5e6e9;padding-bottom:0px;"{{end}}>
 				<li class="index-new-first"><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html"><img  data-original="{{if $v.s_pic1}}{{if eq (index $v "s_pic1") ""}}{{index $v "s_pic"}}{{else}}{{index $v "s_pic1"}}{{end}}{{else}}{{index $v "s_pic"}}{{end}}" class="lazy"   onerror="this.src='/images/u166.png'"></a></li>
 				<li class="index-new-xwzx-title"><a class="data" target="_blank" title="{{index $v "s_title"}}" href="/front/webcontent/{{index $v "_id"}}.html">{{index $v "s_shorttitle"}}</a></li>
 				<li class="index-new-xwzx-content">{{index $v "s_shortdescription"}}</li>
@@ -244,14 +244,14 @@
 		<div class="bmjy"><img src="/images/u0118.png"/></div>
 		<div class="bmrzqy"><img src="/images/u0119.png"/></div>
 		</li>
-		<li class="index-new-mingcheng"><div class="text-center" style="padding-top: 35px;height: 119px;">剑鱼</div></li>
+		<li class="index-new-mingcheng1"><div class="text-center" style="padding-top:35px;">剑鱼</div></li>
 		</ul>
 		</div>
 		<div class="col-sm-5 index-new-tg-con">
 		<ul>
 		{{range $k,$v:=.T.sfdata}}
 		{{ if lt $k 8}}
-		<li><span></span><span><a target="_blank" href="http://{{index $v "href"}}"/>{{index $v "title"}}</a></span><span style="float:right;">{{if (index $v "publishtime")}}{{index $v "publishtime"}}{{else}}------{{end}}</span></li>
+		<li><span></span><span><a target="_blank" href="{{index $v "href"}}"/>{{index $v "title"}}</a></span><span style="float:right;">{{if (index $v "publishtime")}}{{index $v "publishtime"}}{{else}}------{{end}}</span></li>
 		{{if ge $k 3}}
 		{{if lt $k 4}}
 		</ul>
@@ -279,7 +279,7 @@
 		<div class="bmjy"><img src="/images/u0117.png"/></div>
 		<div class="bmrzqy"><img src="/images/u0120.png"/></div>
 		</li>
-		<li class="index-new-mingcheng"><div class="text-center" style="padding-top: 15px;height: 119px;">认证企业</div></li>
+		<li class="index-new-mingcheng2"><div class="text-center" style="padding-top:15px;">认证企业</div></li>
 		</ul>
 		</div>
 		<div class="col-sm-5 index-new-tg-con">

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

@@ -0,0 +1,16 @@
+<html>
+<head>
+<title>帮助中心-意见反馈</title>
+{{include "/common/inc.html"}}
+<link rel="stylesheet" href="/js/kindeditor/themes/default/default.css" />
+<script charset="utf-8" src="/js/kindeditor/kindeditor-all.js"></script>
+<script charset="utf-8" src="/js/kindeditor/kinditem.js"></script>
+<script src="/js/upload.js"></script>
+<script type="text/javascript" src="/js/zDrag.js"></script>
+<script type="text/javascript" src="/js/zDialog.js"></script>
+
+</head>
+<body>
+{{.T.pngdata}}
+</body>
+</html>

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

@@ -18,8 +18,8 @@
 	<div class="tip">
 		<div id="txt_tip"></div>
 		<div class="tip-button">
-		<span id="credit_yes">提交</span>
 		<span id="credit_no">取消</span>
+		<span id="credit_yes">提交</span>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -63,7 +63,7 @@
 			<span class="on-off" id="intelligence-on-off"></span>
 		</li>
 		<li class="parent-node">
-			<img src="/wxswordfish/images/qingbao.png">
+			<img src="/wxswordfish/images/feerule.png">
 			收费规则
 			<span class="rule" id="rule"></span>
 		</li>

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

@@ -34,7 +34,7 @@
 		<div class="dialog-content" style="height:115px;">
 			<div class="rule-content">
 				<div>剑鱼收费标准：</div>
-				<div>每个栏目、每月1000积分。。</div>
+				<div>每个栏目、每月1000积分。</div>
 				<div>积分按月扣除，到期后默认自动扣除下月积分，积分不足则停止服务。如果您不希望下月继续服务，可提前将服务关闭。</div>
 			</div>
 		</div>

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

@@ -313,15 +313,8 @@
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-		<div class="hide">
-			<table class="table a-table" id="serviceList">
-				<tr id="tableTitle">
-					<td width="30%">我的预约</td>
-					<td width="30%" align="center">服务商名称</td>
-					<td width="20%" align="center">预约时间</td>
-					<td	width="10%" align="center">订单状态</td>
-					<td width="10%" align="center">操作</td>
-				</tr>
+		<div class="ent-service">
+			<table class="table ent-table" id="serviceList">
 				<tr>
 					<td colspan="5" class="text-center" id="myAppointmentPaging"></td>
 				</tr>