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

core/src/qfw/search/wxsearchservice.go

@@ -524,15 +524,22 @@ func (n *Wxsearch) WxMingpian() error {
 		if len(ret) > 1 {
 			res["on"] = ret[0]
 			names := coreutil.CardRecognition(ret[1])
-			for k, v := range names {
+			for _, v := range names {
 				name := fmt.Sprint(v)
 				if mpian_reg.MatchString(name) {
 					res["name"] = name
 					break
 				}
-				if k == len(names)-1 {
-					res["name"] = name
+			}
+			var name = ""
+			if res["name"] == "" {
+				for _, v := range names {
+					tmp := fmt.Sprint(v)
+					if len(name) < len(tmp) {
+						name = tmp
+					}
 				}
+				res["name"] = name
 			}
 		}
 	}

core/src/qfw/yellowpage/yellowpage_test.go

@@ -3,9 +3,12 @@ package yellowpage
 //企业黄页的测试类
 import (
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	. "gopkg.in/mgo.v2/bson"
 	"log"
+	cf "qfw/coreconfig"
+	"qfw/util"
 	. "qfw/util/mongodb"
 	"regexp"
 	"strings"
@@ -51,3 +54,23 @@ func Test_isEmail(test *testing.T) {
 	ok, _ := regexp.MatchString("^[239]$|^\\s*$", t)
 	fmt.Println(ok)
 }
+func Test_filter(test *testing.T) {
+	//d := "拉进来看见"
+	//log.Println(len([]rune(d)))
+	//return
+	/*r := regexp.MustCompile("(有限公司|有限责任公司|股份有限公司|总公司|分公司|公司|事务所|合伙企业)$|\\([^\\)]*\\)|（[^）]*）")
+	log.Println(r.ReplaceAllString("（水电费）金水路附件（水电费）", ""))
+	log.Println(r.ReplaceAllString("(水电费)金水路附件(水电费)", ""))
+	return*/
+	util.ReadConfig("../../config.json", &cf.SysConfig)
+	InitMongodbPool(1, "192.168.3.18:27080", "qfw")
+	log.Println(getCopyright("55a85bdba442ceca9e215a01", "西藏自然密码环保制品有限公司"))
+	return
+	relation := makeRelation("540126200001082", "西藏自然密码环保制品有限公司")
+	var nodes *[]map[string]interface{}
+	if d, err := json.Marshal(relation.(map[string]interface{})["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
+		go func() {
+			filterEntName(nodes)
+		}()
+	}
+}

core/src/seo.json

@@ -1,4 +1,4 @@
-{	"cdn":"//cdn.qmx.top:9000",
+{	"cdn":"",
     "qfw": {
         "enterprise": {
             "description": "提供企业信息查询，企业产品服务查询，企业关系网展示",

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-22 11:15:00"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-22 11:15:00"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-23 15:15:05"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-23 15:15:05"}},"marketisstart":true,"marketrate":300}

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

@@ -379,7 +379,7 @@ a:focus, a:hover{
 }
 .ent-tab-content{
 	margin-top: 10px;
-	min-height: 491px;
+	min-height: 500px;
 }
 /********************企业画像**********************/
 .entinfo-basicinfo .b-com-content{
@@ -644,18 +644,36 @@ a:focus, a:hover{
 /*全屏代码*/
 .entrelation .entrelation-controlls{
 	position: absolute;
-	margin-top: 10px;
 	z-index: 2;
+	right: 0px;
+	width: 95px;
+}
+.entrelation .entrelation-controlls-fullscreen{
+	top: 15px;
+	right: 15px;
 }
 .entrelation .entrelation-controlls>div{
-	margin-bottom: 15px;
+	margin-bottom: 10px;
+	margin-left: 10px;
+	display: inline-block;
+	width: 35px;
+	height: 35px;
+	box-shadow: 0px 0px 5px #DADADA;
+	padding-top: 8px;
+}
+.entrelation .entrelation-controlls>div:nth-child(n+3){
+	padding-top: 10px;
 }
 .entrelation .entrelation-controlls .entrelation-box{
 	border: 1px solid #e5e6e9;
-	width: 80px;
-	line-height: 30px;
 	text-align: center;
 	cursor: pointer;
+	vertical-align: top;
+	border-radius: 3px;
+	
+}
+.entrelation .entrelation-controlls .entrelation-box.checked{
+	color: #16a086;
 }
 :-moz-full-screen .entrelation,:-webkit-full-screen .entrelation,:-o-full-screen .entrelation,
 :-ms-full-screen .entrelation,:fullscreen .entrelation,:-ms-fullscreen .entrelation,:full-screen .entrelation{
@@ -972,4 +990,9 @@ a:focus, a:hover{
 }
 .ent-copyright table{
 	margin-top: 15px;
+}
+.ent-copyright .badge{
+	background-color: #16a086;
+	margin-left: 10px;
+	color: #ffffff;
 }

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

@@ -652,4 +652,49 @@ a:focus, a:hover{
 	width:22px;
 	margin-top: 110px;
     margin-left: 100px;
-}
+}
+.index-mob-wzjs{
+	background-color:#fff;
+	padding:20px;
+}
+.index-mobwz-title{
+	height:35px; 
+	border-bottom:1px solid #e5e6e9;
+	padding-bottom:15px;
+}
+.indexmob-tleft{
+	height:20px;
+	width:10px;
+	background-color:#FF5A5F;
+	float:left;
+}
+.indexmob-tright{
+	color:#FF5A5F;
+	float:left;
+	margin-left:15px;
+}
+.indexmob-cont{
+	margin-top:20px;
+}
+.indexmob-sjty{
+	background-color:#fff; 
+	margin-top:10px;
+	padding:20px;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -1008,6 +1008,22 @@ span.highlight {
 	content: "\A9";
 }
 
+.quanping:before{
+	content: "\AA";
+}
+
+.suofang:before{
+	content: "\AB";
+}
+
+.yibanmoshi:before{
+	content: "\AC";
+}
+
+.xiangximoshi:before{
+	content: "\AE";
+}
+
 .icon-small {
 	font-size: 12px;
 }

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

@@ -8,7 +8,9 @@ var relationFlag = false;
 var identWayFlag = false;
 //解析服务列表
 $(function(){
-	$(".ent-tab-content.b-left").css("min-height",$(".b-right").height());
+	if($(".b-right").height() >= 500){
+		$(".ent-tab-content.b-left").css("min-height",$(".b-right").height());
+	}
 	//失信信息如果没有数据，选项卡不可点
 	if(dishonesty.count > 0){
 		DishonestyPaging();
@@ -264,6 +266,7 @@ function CopyrightEntity(){
 		loadJS(cdn+"/js/frontpaging.js",function(){
 			var workCopyRight = copyright.WorkCopyRight;
 			if(typeof(workCopyRight) != "undefined" && workCopyRight != null){
+				$("#workCopyRightList .badge").text(workCopyRight.length);
 				workCopyRight.sort(function(a,b){
 					if(a.FirstPublishDate<b.FirstPublishDate){
 						return 1;
@@ -290,6 +293,7 @@ function CopyrightEntity(){
 			}
 			var computerSoftCopyRight = copyright.ComputerSoftCopyRight;
 			if(typeof(computerSoftCopyRight) != "undefined" && computerSoftCopyRight != null){
+				$("#computerSoftCopyRightList .badge").text(computerSoftCopyRight.length);
 				computerSoftCopyRight.sort(function(a,b){
 					if(a.FirstPublishDate<b.FirstPublishDate){
 						return 1;
@@ -317,6 +321,7 @@ function CopyrightEntity(){
 			}
 			var patent = copyright.Patent;
 			if(typeof(patent) != "undefined" && patent != null){
+				$("#patentList .badge").text(patent.length);
 				patent.sort(function(a,b){
 					if(a.PublicDate<b.PublicDate){
 						return 1;

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

@@ -27,26 +27,39 @@ Relation.prototype.init = function(){
 	thisClass.h = $("#entrelation").height();
 	$("#entrelation-infovis").width(thisClass.w).append(
 		'<div class="entrelation-controlls hidden-sm hidden-xs">'
-		+'<div id="entrelation-pattern" class="entrelation-box" title_pos="left">一般模式</div>'
-		+'<div id="entrelation-verbosemode" class="entrelation-box" title_pos="left">详细模式</div>'
-			+'<div id="entrelation-fullscreen" class="entrelation-box" title_pos="left">全屏</div>'
+		+'<div id="entrelation-pattern" class="entrelation-box'+(thisClass.modleFlag?' checked':'')+'" title="一般模式"><span class="glyphicon yibanmoshi"></span></div>'
+		+'<div id="entrelation-verbosemode" class="entrelation-box'+(thisClass.modleFlag?'':' checked')+'" title="详细模式"><span class="glyphicon xiangximoshi"></span></div>'
+		+'<div id="entrelation-restore" class="entrelation-box checked" title="退出"><span class="glyphicon suofang"></span></div>'
+		+'<div id="entrelation-fullscreen" class="entrelation-box" title="全屏"><span class="glyphicon quanping"></span></div>'
 		+'</div>'
 	);
 	//一般模式
 	$("#entrelation-pattern").click(function(){
+		if($(this).hasClass("checked")){
+			return;
+		}
+		$("#entrelation-verbosemode").removeClass("checked");
+		$(this).addClass("checked");
 		thisClass.pattern();
 	});
 	//详细模式
 	$("#entrelation-verbosemode").click(function(){
+		if($(this).hasClass("checked")){
+			return;
+		}
+		$("#entrelation-pattern").removeClass("checked");
+		$(this).addClass("checked");
 		thisClass.verbosemode();
 	});
 	//全屏
-	$("#entrelation-fullscreen").click(function(){
+	$("#entrelation-restore,#entrelation-fullscreen").click(function(){
+		if($(this).hasClass("checked")){
+			return;
+		}
+		$("#entrelation-restore,#entrelation-fullscreen").removeClass("checked");
+		$(this).addClass("checked");
 		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){
@@ -84,7 +97,7 @@ Relation.prototype.init = function(){
 	///////////////////////关系网实例////////////////////////////
 	var htmls="<div style='position:absolute;top:0px;' class='legend'>";
 	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ff9800;opacity: 0.8;'></div><span style='margin-left: 20px;color: #ffffff;'>本企业</span></div>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ABE6DB;'></div><span style='margin-left: 12px;'>其他企业</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ABE6DB;'></div><span style='margin-left: 12px;color: #056351;'>其他企业</span></div>";
 	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #2196f3;'></div><span style='margin-left: 25px;color: #ffffff;'>个人</span></div>";
 	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;margin-bottom: 10px;'><div style='background-color: #afafaf;'></div><span style='margin-left: 5px;color: #ffffff;'>注吊销企业</span></div>";
 	htmls= htmls+ "<div style='position: relative;'><span style='position: absolute;top: 7.5px;width: 25px;height: 5px;background-color: #e2e2e2;'></span><span style='position: absolute;left: 25px;top: 4px;border-top: 6px solid transparent;border-bottom: 6px solid transparent;border-left: 12px solid #e2e2e2;'></span><span style='margin-left: 45px;'>投资关系（股东→企业）</span></div>";
@@ -102,7 +115,8 @@ Relation.prototype.pattern = function(){
 		return;
 	}
 	var thisClass = this;
-	d3.selectAll("text").each(function (p){
+	d3.selectAll(".textpath").style("display","none");
+	d3.selectAll(".textnode").each(function (p){
 		if(p.type == "ce" || p.type == "e"){
 			$(this).text(p.shorttext);
 		}
@@ -118,7 +132,8 @@ Relation.prototype.verbosemode = function(){
 		return;
 	}
 	var thisClass = this;
-	d3.selectAll("text").each(function (p){
+	d3.selectAll(".textpath").style("display","block");
+	d3.selectAll(".textnode").each(function (p){
 		if(p.type == "ce" || p.type == "e"){
 			$(this).text(p.text);
 		}
@@ -172,6 +187,7 @@ Relation.prototype.dataProcess = function(){
 	/*********************************连线处理***********************************/
 	var minLink=-1,maxLink=-1;
 	for(var i=0;i<this.data.links.length;i++){
+		this.data.links[i]["nodeId"] = "path-"+(i+1);
 		var linkObj = this.data.links[i];
 		if(linkObj.target==this.index && this.data.nodes[linkObj.source].name==this.legcerNo){
 			//this.data.nodes[linkObj.source].type="cp";
@@ -393,12 +409,12 @@ Relation.prototype.launchFullScreen = function(element) {
 }
 Relation.prototype.cancelFullScreen = function(){
 	this.h = $("#entrelation-infovis").height();  
-	$("#entrelation-fullscreen").text("全屏").attr("title","进入全屏视图"+((!!window.ActiveXObject || "ActiveXObject" in window)?"":" (F11)"));	
+	//$("#entrelation-fullscreen").text("全屏").attr("title","进入全屏视图"+((!!window.ActiveXObject || "ActiveXObject" in window)?"":" (F11)"));	
 	//force.linkDistance(120).charge(-200).size([w,h]).resume();
 	$("#entrelation-infovis").css({width:this.w,height:this.h});
 	//设置svg标签的宽度与高度
 	d3.select("svg").attr("width", this.w).attr("height", this.h);
-	$(".entrelation-controlls").css({left:$("#entrelation").width()-$(".entrelation-controlls").width()-30});
+	$(".entrelation-controlls").removeClass("entrelation-controlls-fullscreen");
     if(document.exitFullscreen) {
       document.exitFullscreen();
     } else if (document.msExitFullscreen) {
@@ -418,7 +434,7 @@ Relation.prototype.initFullScreen = function(){
 		document.msFullscreenElement;
 	if(!fullscreenElement || fullscreenElement==null){
 		this.redrawflag = true;
-		$("#entrelation-fullscreen").text("退出").attr("title","退出全屏视图 (F11)");
+		//$("#entrelation-fullscreen").text("退出").attr("title","退出全屏视图 (F11)");
 		this.launchFullScreen(this.infovisdiv);
 		var timeout = 100;
 		if(!!window.ActiveXObject || "ActiveXObject" in window){
@@ -434,7 +450,7 @@ Relation.prototype.initFullScreen = function(){
 				//}
 				$("#entrelation-infovis").css({width:w,height:h});
 				d3.select("svg").attr("width", w).attr("height", h);
-				$(".entrelation-controlls").css({left:w-$(".entrelation-controlls").width() - 70});
+				$(".entrelation-controlls").addClass("entrelation-controlls-fullscreen");
 				thisClass.force.linkDistance(h).charge(-700).size([w,h]).resume();
 			}
 			
@@ -483,14 +499,16 @@ Relation.prototype.removeNode = function(obj){
 			});
 		}
 	}
-	d3.selectAll("path").each(function (){
+	d3.selectAll("path").each(function (p){
 		if(name == this.__data__.target.name){
 			var fromNodeName = this.__data__.source.name;
 			d3.select(this).remove();
+			$('#text'+p.nodeId).parent().remove();
 			removeAloneNode(fromNodeName);
 		}else if(name == this.__data__.source.name){
 			var toNodeName = this.__data__.target.name;
 			d3.select(this).remove();
+			$('#text'+p.nodeId).parent().remove();
 			removeAloneNode(toNodeName);
 		}
 	});
@@ -543,34 +561,6 @@ Relation.prototype.tick = function(){
 		}
 		return "translate(" + d.x + "," + d.y + ")scale(" + thisClass.zoomlevel+ ")";
 	});
-	/*this.lineLables.attr("transform",function(d){
-		var sx   = d.source.x,
-			sy   = d.source.y,
-			x    = d.target.x,
-            y    = d.target.y;
-		if(sy > y){
-			sy -= 12;
-		}else{
-			sy += 5;
-		}
-		var line = new geo.LineSegment(sx, sy, x, y);
-		for (var e in d.target.edge) {
-            var ix = line.intersect(d.target.edge[e].offset(x, y));
-            if (ix.in1 && ix.in2) {
-                x = ix.x;
-                y = ix.y;
-                break;
-            }
-        }
-        var dx = x - sx,
-	        dy = y - sy,
-	        dr = Math.sqrt(dx * dx + dy * dy);
-		var cx = (sx + x) / 2,
-			cy = (sy + y) / 2,
-			cr = dr - Math.sqrt(Math.pow(dr,2) - Math.pow(dr / 2,2));
-		//var c = convert(sx,sy,x,y,0,0,dr,dr,0);
-		return "translate("+(cx-cr)+","+(cy-cr)+")";
-	});*/
 	if(thisClass.tickFlag){
 		thisClass.force.tick();
 	}
@@ -587,8 +577,9 @@ Relation.prototype.highlightObject = function(obj,flag){
 		d3.selectAll(".node").each(function (){
 			d3.select(this).style("opacity","1");
 		});
-		d3.selectAll("path").each(function (){
+		d3.selectAll("path").each(function (p){
 			d3.select(this).style("opacity","1");
+			d3.select("#text"+p.nodeId).style("opacity","1");
 		});
 		return;
 	}
@@ -598,15 +589,17 @@ Relation.prototype.highlightObject = function(obj,flag){
 			d3.select(this).style("opacity","0.2");
 		}
 	});
-	d3.selectAll("path").each(function (){
+	d3.selectAll("path").each(function (p){
 		var targetName = this.__data__.target.name;
 		var sourceName = this.__data__.source.name;
 		if(name != targetName && name != sourceName){
 			d3.select(this).style("opacity","0.2");
+			d3.select("#text"+p.nodeId).style("opacity","0.2");
 		}else{
 			d3.selectAll(".node").each(function (){
 				if(targetName == this.__data__.name || sourceName == this.__data__.name){
 					d3.select(this).style("opacity","1");
+					d3.select("#text"+p.nodeId).style("opacity","1");
 				}
 			});
 		}
@@ -649,16 +642,21 @@ Relation.prototype.makeRelation = function(){
 	var zoom = d3.behavior.zoom().scaleExtent([0.4, 10]).on("zoom", function(){
 		thisClass.zoomed();
 	});
+	
 	this.svg = d3.select("#entrelation-infovis").append("svg:svg")
 	    .attr("width", this.w)
 	    .attr("height", this.h)
 		.call(zoom)
 		.append("g");
-	var gs = this.svg.append("svg:g")
+		
+	this.lines = this.svg.append("svg:g")
 	    .selectAll("path")
 	    .data(this.force.links())
-	    .enter();
-	this.lines = gs.append("path")
+	    .enter()
+	 	.append("path")
+		.attr("id",function(p){
+			return p.nodeId;
+		})
 		.style("fill", function(p){
 	    	return (p.type=="cp" || p.isLegal)?"#cd93d7":"#e2e2e2";
 	    })
@@ -668,18 +666,37 @@ Relation.prototype.makeRelation = function(){
 		.attr("stroke-width",function (e,i){
 			return e.linkVal;
 		});
-	/*this.lineLables = gs.append("g").each(function(d){
-		var invacconam = new Number(d.invacconam);
-		if(invacconam > 0){
-			var lenInvacconam = (invacconam + "").length;
-			if(lenInvacconam > 4 && (invacconam + "").indexOf(".") > -1 && (lenInvacconam - (invacconam + "").indexOf(".")) > 4){
-				invacconam = (new Number(invacconam)).toFixed(4);
+		
+	this.svg.append("svg:g")
+	 	.selectAll("textPath")
+		.data(this.force.links())
+		.enter()
+		.append("text")
+		.attr("x", "0")
+		.attr("y", "0")
+		.append("textPath")
+		.attr("class", "textpath")
+		.attr("id", function(d) { 
+			return 'text'+d.nodeId;
+		})
+		.attr("xlink:href", function(d) { 
+			return '#'+d.nodeId;
+		})
+		.text(function(d) { 
+			var invacconam = new Number(d.invacconam);
+			if(invacconam > 0){
+				var lenInvacconam = (invacconam + "").length;
+				if(lenInvacconam > 4 && (invacconam + "").indexOf(".") > -1 && (lenInvacconam - (invacconam + "").indexOf(".")) > 4){
+					invacconam = (new Number(invacconam)).toFixed(4);
+				}
+				return invacconam+"万元";
+			}else{
+				return "";
 			}
-			d3.select(this).append("text").text(invacconam+"万元");
-		}else{
-			d3.select(this).remove();
-		}
-	});*/
+		})
+		.style("fill", "#4e5051")
+		.attr("startOffset", "20%")
+		.style("display", this.modleFlag?"none":"block");
 	
 	this.lines.each(function (d,i){
 		var invacconam = new Number(d.invacconam);
@@ -732,8 +749,9 @@ Relation.prototype.makeRelation = function(){
 	    });
 	this.makeTitle();
 	this.nodes.append('text')
+	.attr("class","textnode")
     .text(function(d){
-		if(thisClass.modleFlag){
+		if(d.type != "p" && thisClass.modleFlag){
 			return d.shorttext;
 		}else{
 			return d.text;
@@ -757,7 +775,7 @@ Relation.prototype.makeRelation = function(){
 		if(p.type == "e" && (p.opstate == "11" || p.opstate == "07")){
 			return "#ffffff";
 		}
-    	return p.type=="p"?"#ffffff":p.type=="ce"?"#ffffff":"auto";
+    	return p.type=="p"?"#ffffff":p.type=="ce"?"#ffffff":"#056351";
 	})
 	.on("click",function (d,i){
 		if(!dragstatus && d.type == "e"){
@@ -859,112 +877,4 @@ Relation.prototype.makeTextBg = function(){
             bottom : new geo.LineSegment(bounds.x1, bounds.y2, bounds.x2, bounds.y2)
         };
     });
-}
-// svg : [A | a] (rx ry x-axis-rotation large-arc-flag sweep-flag x y)+
-
-/* x1 y1 x2 y2 fA fS rx ry φ */
-function  radian( ux, uy, vx, vy ) {
-    var  dot = ux * vx + uy * vy;
-    var  mod = Math.sqrt( ( ux * ux + uy * uy ) * ( vx * vx + vy * vy ) );
-    var  rad = Math.acos( dot / mod );
-    if( ux * vy - uy * vx < 0.0 ) rad = -rad;
-    return  rad;
-}
-//https://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
-//conversion_from_endpoint_to_center_parameterization
-//sample :  convert(200,200,300,200,1,1,50,50,0,{})
-function convert(x1, y1, x2, y2, fA, fS, rx, ry, phi) {
-    var cx,cy,theta1,delta_theta;
-
-    if( rx == 0.0 || ry == 0.0 ) return -1;  // invalid arguments
-
-    var  s_phi = Math.sin( phi );
-    var  c_phi = Math.cos( phi );
-    var  hd_x = ( x1 - x2 ) / 2.0;   // half diff of x
-    var  hd_y = ( y1 - y2 ) / 2.0;   // half diff of y
-    var  hs_x = ( x1 + x2 ) / 2.0;   // half sum of x
-    var  hs_y = ( y1 + y2 ) / 2.0;   // half sum of y
-
-    // F6.5.1
-    var  x1_ = c_phi * hd_x + s_phi * hd_y;
-    var  y1_ = c_phi * hd_y - s_phi * hd_x;
-
-    var  rxry = rx * ry;
-    var  rxy1_ = rx * y1_;
-    var  ryx1_ = ry * x1_;
-    var  sum_of_sq = rxy1_ * rxy1_ + ryx1_ * ryx1_;   // sum of square
-    var  coe = Math.sqrt( ( rxry * rxry - sum_of_sq ) / sum_of_sq );
-    if( fA == fS ) coe = -coe;
-
-    // F6.5.2
-    var  cx_ = coe * rxy1_ / ry;
-    var  cy_ = -coe * ryx1_ / rx;
-
-    // F6.5.3
-    cx = c_phi * cx_ - s_phi * cy_ + hs_x;
-    cy = s_phi * cx_ + c_phi * cy_ + hs_y;
-
-    var  xcr1 = ( x1_ - cx_ ) / rx;
-    var  xcr2 = ( x1_ + cx_ ) / rx;
-    var  ycr1 = ( y1_ - cy_ ) / ry;
-    var  ycr2 = ( y1_ + cy_ ) / ry;
-
-    // F6.5.5
-    theta1 = radian( 1.0, 0.0, xcr1, ycr1 );
-
-    // F6.5.6
-    delta_theta = radian( xcr1, ycr1, -xcr2, -ycr2 );
-    var  PIx2 = Math.PI * 2.0;
-    while( delta_theta > PIx2 ) delta_theta -= PIx2;
-    while( delta_theta < 0.0 ) delta_theta += PIx2;
-    if( fS == false ) delta_theta -= PIx2;
-
-    var outputObj = { /* cx, cy, theta1, delta_theta */ 
-        cx : cx,
-        cy : cy,
-        theta1 : theta1,
-        delta_theta : delta_theta
-    }
-    console.dir(outputObj);
-
-    return outputObj;
-}
-function convert_tmp(x1, y1, x2, y2, fA, fS, rx, ry, phi) {
-    var cx,cy,theta1,delta_theta;
-
-    if( rx == 0.0 || ry == 0.0 ) return -1;  // invalid arguments
-
-    var  s_phi = Math.sin( phi );
-    var  c_phi = Math.cos( phi );
-    var  hd_x = ( x1 - x2 ) / 2.0;   // half diff of x
-    var  hd_y = ( y1 - y2 ) / 2.0;   // half diff of y
-    var  hs_x = ( x1 + x2 ) / 2.0;   // half sum of x
-    var  hs_y = ( y1 + y2 ) / 2.0;   // half sum of y
-
-    // F6.5.1
-    var  x1_ = c_phi * hd_x + s_phi * hd_y;
-    var  y1_ = c_phi * hd_y - s_phi * hd_x;
-
-    var  rxry = rx * ry;
-    var  rxy1_ = rx * y1_;
-    var  ryx1_ = ry * x1_;
-    var  sum_of_sq = rxy1_ * rxy1_ + ryx1_ * ryx1_;   // sum of square
-    var  coe = Math.sqrt( ( rxry * rxry - sum_of_sq ) / sum_of_sq );
-    if( fA == fS ) coe = -coe;
-
-    // F6.5.2
-    var  cx_ = coe * rxy1_ / ry;
-    var  cy_ = -coe * ryx1_ / rx;
-
-    // F6.5.3
-    cx = c_phi * cx_ - s_phi * cy_ + hs_x;
-    cy = s_phi * cx_ + c_phi * cy_ + hs_y;
-
-    var outputObj = { /* cx, cy */ 
-        cx : rxry,
-        cy : rxy1_
-    }
-    console.dir(outputObj);
-
-    return outputObj;
 }

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

@@ -41,6 +41,9 @@ function b_afterLogin(flag,result){
 		$("#experience").click(function(){
 			loginModalShow();
 		});
+		$("#goToSearch").click(function(){
+			loginModalShow();
+		});
 		$("#goToRssset").click(function(){
 			loginModalShow(10);
 		});

core/src/web/templates/index.html

@@ -8,10 +8,18 @@
 <link href="{{Msg "seo" "cdn"}}/css/index-new.css" rel="stylesheet">
 <script src="{{Msg "seo" "cdn"}}/js/jquery.lazyload.min.js"></script>
 
+<script type="text/javascript">
+$(function(){
+	var wid = document.body.clientWidth;
+	if (wid < 760){
+		window.location.href = "/front/webindexcontent/56f24224af53745027000078.html";
+	} 
+});
+</script>
 </head>
 <body>
 
-<!---->
+<!--手机版首页 start-->
 <div class="index-new-head b-head visible-xs">
 	
 	<div class="b-nav index-new-nva text-center" style="height:69px;">
@@ -21,27 +29,28 @@
 {{$s:=(Ad "index-center-mob" 1)}}
 	{{range $k,$v := $s}}
 <div class="text-center visible-xs" style="margin-top:10px;">
-	<div style="background-color:#fff;padding:20px;">
-	<div style="height:35px; border-bottom:1px solid #e5e6e9;padding-bottom:15px;">
-	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
-	<div style="color:#FF5A5F;float:left;margin-left:15px;">网站介绍</div>
+	<div class="index-mob-wzjs" >
+	<div class="index-mobwz-title" >
+	<div class="indexmob-tleft" ></div>
+	<div class="indexmob-tright" >网站介绍</div>
 	<div style="clear:both;"></div>
 	</div>
-	<div style="margin-top:20px;">
+	<div class="indexmob-cont" >
 	{{if $v.s_remark}}{{$v.s_remark}} {{end}}
 	</div>
 	</div>
-	<div  style="background-color:#fff; margin-top:10px;padding:20px;">
-	<div style="height:35px; border-bottom:1px solid #e5e6e9;padding-bottom:15px;">
-	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
-	<div style="color:#FF5A5F;float:left;margin-left:15px;">手机体验</div>
+	<div class="indexmob-sjty" >
+	<div class="index-mobwz-title" >
+	<div class="indexmob-tleft" ></div>
+	<div class="indexmob-tright" >手机体验</div>
 	<div style="clear:both;"></div>
 	</div>
-	<div style="margin-top:20px;"><img src="{{if $v.s_pic}} {{$v.s_pic}} {{else}}/images/u109.png{{end}}"></div>
-	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>	
+	<div class="indexmob-cont" ><img src="{{if $v.s_pic}} {{$v.s_pic}} {{else}}/images/u109.png{{end}}"></div>
+	<div  class="indexmob-cont" style="width:100%;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>	
 	</div>
 </div>
 	{{end}}
+<!--手机版首页 end-->
 {{include "/common/indexhead.html"}}
 <div class="a-content a-index hidden-xs">	
 	<div class="a-index-head index-new-head">

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

@@ -99,7 +99,7 @@ background-color:#F0F0F0;
 	margin-right:5px;
 }
 .lisecond{
-	width:210px;
+	width:190px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;

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

@@ -72,7 +72,6 @@ body{
 				<div style="margin-top:0px;" class="row-fluid">
 					<div class="span12">		
 							<div class="widget-content nopadding">
-								
 								<div style="width:98%; margin:auto; margin-bottom:10px;">
 	
 	<div style="margin-top: 40px;height:35px; border-bottom:1px solid #e5e6e9;">
@@ -81,7 +80,7 @@ body{
 	<div style="clear:both;"></div>
 	</div>
 	<div style="width:100%;    margin-top: 20px;" class="text-center"><img src="{{if .T.s_pic }}{{.T.s_pic}}{{else}}{{Msg "seo" "cdn"}}/images/u109.png{{end}}"/></div>	
-	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>						
+	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn</br>体验企明星的强大功能</div>						
 		                        </div>
 							</div>
 					</div>

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

@@ -98,6 +98,15 @@
 	border-top:1px solid #e5e6e9;
 	padding:10px 20px;
 }
+.wx-xhx{
+	border-top:1px solid #e5e6e9; 
+	width:100%;
+}
+.searchbs{
+	height:45px;
+	line-height:45px;
+	cursor:hand;
+}
 </style>
 </head>
 <body>
@@ -108,7 +117,7 @@
 <div class="searchshow">
 		<!--招标 start-->
 	<form action="/member/wxswordfish/searchlist" name="searchone" method="post">
-		<div onClick="searchbiao(1)" style="height:45px;line-height:45px;cursor:hand;">
+		<div onClick="searchbiao(1)" class="searchbs" >
 		<div class="searchzhao1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
 		<div class="searchzhao2">查询招标公告：</div>
 		<div class="searchzhao3">
@@ -121,10 +130,10 @@
 		</div>
 	</form>
 		<!--招标 end-->
-		<div  style="border-top:1px solid #e5e6e9; width:100%;"></div>
+		<div class="wx-xhx" ></div>
 		<!--中标 start-->
 	<form action="/member/wxswordfish/searchlist" name="searchtwo" method="post">
-		<div onClick="searchbiao(2)" style="height:45px;line-height:45px;cursor:hand;">
+		<div onClick="searchbiao(2)"  class="searchbs" >
 		<div class="searchzhong1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
 		<div class="searchzhong2">查询中标公告：</div>
 		<div class="searchzhong3">
@@ -137,10 +146,10 @@
 		</div>
 	</form>
 		<!--中标 end-->
-		<div  style="border-top:1px solid #e5e6e9; width:100%;"></div>
+		<div  class="wx-xhx"></div>
 		<!--企业情报 start-->
-	<form action="/member/wxswordfish/searchlist" name="searchone" method="post">
-		<div onClick="searchbiao(3)" style="height:45px;line-height:45px;cursor:hand;">
+	<form action="/member/wxswordfish/searchlist" name="searchthree" method="post">
+		<div onClick="searchbiao(3)"  class="searchbs" >
 		<div class="searchzhong1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
 		<div class="searchzhong2">查询企业情报：</div>
 		<div class="searchzhong3">
@@ -151,7 +160,7 @@
 		</div>
 	</form>
 		<!--企业情报 end-->
-		<div style="border-top:1px solid #e5e6e9; width:100%;"></div>
+		<div  class="wx-xhx"></div>
 		<div id="myorder" class="text-center">
 		<div class="rsssetbtn" onClick="window.location.href='/swordfish/page';">进入我的信息订阅</div>
 		</div>

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

@@ -257,7 +257,6 @@ body{
 	padding:10px 20px;
 	background-color:#fff;
 	width:100%;
-	height:100%;
 }
 .tslist{
 	height:80px;
@@ -277,7 +276,7 @@ body{
 <div class="rescontent">
 	
 </div>
-
+<div style="height:40px;"></div>
 
 </div>
 <div class="resbm" >

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

@@ -5,7 +5,7 @@
 	</li>
 	<li class="parent-node">
 		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/dingyue.png">
-		我得订阅
+		我的订阅
 	</li>
 	<li class="parent-node toolbar-list" id="toolbar-list">
 		<div class="toolbar-popover">
@@ -86,9 +86,9 @@ var feedback = null;
 $(function(){
 	$(".bottom-toolbar>li").click(function(){
 		if($(this).index() == 0){
-			alert("搜索");
+			window.location.href = "/member/wxswordfish/search";
 		}else if($(this).index() == 1){
-			alert("我得订阅");
+			window.location.href = "/swordfish/page";
 		}else if($(this).index() == 2){
 			$(this).children(".toolbar-popover").show();
 		}