Browse Source

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

renzheng 9 years ago
parent
commit
07697cc826

+ 1 - 1
core/src/qfw/mobile/wxmenu.go

@@ -265,7 +265,7 @@ func getSignature(action string) []string {
 	}
 	if len(signature) == 0 {
 		signature = coreutil.GetJSInterfaceParam(url)
-		redis.Put("other", "wxshare-"+url, signature, 60*1000)
+		redis.Put("other", "wxshare-"+url, signature, 90*60) //一个半小时
 	}
 	log.Println(url, "------", signature)
 	return signature

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

@@ -385,7 +385,7 @@ a{
 
 .a-header .a-h-search form{
 	height: 40px;
-  	margin-top: 15px;
+  	margin-top: 17px;
 }
 
 .a-header .a-h-search.a-com-focus{
@@ -417,7 +417,7 @@ a{
 	border: 2px #dd4814 solid;
 	box-shadow: none;
 	padding-right: 25px;
-	height: 40px;
+	height: 36px;
 	border-left-width: 0px;
 }
 

+ 0 - 0
core/src/web/staticres/css/qfw-enterprise.css → core/src/web/staticres/css/enterprise.css


+ 4 - 0
core/src/web/staticres/css/qfw.css

@@ -920,6 +920,10 @@ span.highlight {
 	content: "\2B";
 }
 
+.guanbi1:before{
+	content: "\6C";
+}
+
 .icon-small {
 	font-size: 12px;
 }

BIN
core/src/web/staticres/fonts/qimingxing.eot


+ 4 - 3
core/src/web/staticres/fonts/qimingxing.svg

@@ -16,9 +16,9 @@
 <glyph unicode="'" horiz-adv-x="2049" d="M0 157v1655q0 65 48 111q46 46 112 46h321q0 32 24 57q24 24 58 24h683q32 0 56 -24t24 -57h282q67 0 112 -46q48 -46 48 -111v-723l-160 -164v809q0 32 -24 55q-24 24 -57 23h-201v-78q0 -32 -24 -56q-24 -22 -56 -23h-683q-34 0 -58 23q-24 24 -24 56v78h-240 q-32 0 -57 -23q-24 -22 -24 -55v-1497q0 -34 24 -56q24 -24 57 -24h643l160 -157h-884q-67 0 -112 46q-48 46 -48 111zM481 788v40q0 39 41 39h724q39 0 39 -39v-40q0 -39 -39 -39h-724q-41 0 -41 39zM481 1222v39q0 39 41 39h724q39 0 39 -39v-39q0 -39 -39 -39h-724 q-41 0 -41 39zM829 439l106 104l297 -255l818 815l-806 -1103z" />
 <glyph unicode="(" horiz-adv-x="2027" d="M0 983q0 341 224 623q119 131 180 169q263 188 579 188q341 0 623 -224q131 -119 169 -181q188 -263 188 -578q0 -341 -224 -623q-119 -131 -181 -169q-263 -188 -578 -188q-341 0 -623 224q-131 119 -169 180q-188 263 -188 579zM22 978q0 -384 289 -683 q292 -273 674 -273q384 0 682 289q273 292 273 674q0 384 -288 682q-292 273 -674 273q-384 0 -683 -288q-273 -292 -273 -674zM360 1130v15q0 171 171 290q122 74 259 74q230 0 382 -178q49 -84 57 -126q-15 0 -46 3q-172 0 -292 -138q-72 -94 -72 -196v-21q0 -27 12 -78 h-3q-12 -2 -19 -2h-19q-56 0 -150 22l-150 -76v3q41 123 41 128h-2q-169 125 -169 280zM585 1273q9 -56 65 -56h7q43 0 48 56q-9 51 -48 51h-7q-49 0 -63 -44q0 -4 -2 -7zM847 862v15q0 152 165 258q97 48 191 48h22q131 0 251 -96q104 -97 104 -211v-7q0 -131 -152 -248 l35 -107h-2q-48 27 -120 65q-79 -22 -129 -23q-205 0 -326 168q-39 73 -39 138zM889 1266q0 -34 55 -49h10q43 0 53 43v17q-9 48 -46 47h-14q-58 -10 -58 -58zM1051 966q9 -41 43 -41q53 7 53 38v6q0 36 -53 43q-43 -12 -43 -41v-5zM1289 969q10 -44 44 -44h2q51 5 51 46 q0 31 -55 41q-28 0 -42 -43z" />
 <glyph unicode=")" horiz-adv-x="2041" d="M0 256v1534q0 106 75 181t179 75h1531q106 0 181 -75t75 -181v-1534q0 -106 -75 -181t-181 -75h-1531q-104 0 -179 75t-75 181zM254 384q0 -53 38 -90q38 -38 90 -38h1277q53 0 89 38q38 38 37 90v1278q0 53 -37 91q-38 38 -89 37h-1277q-53 0 -90 -37q-38 -38 -38 -91 v-1278zM510 575v128q0 65 63 65h893q65 0 65 -65v-128q0 -63 -65 -63h-893q-63 0 -63 63zM510 1343v128q0 63 63 63h128q63 0 64 -63v-128q0 -63 -64 -63h-128q-63 0 -63 63zM893 959v128q0 65 63 65h510q65 0 65 -65v-128q0 -63 -65 -63h-510q-63 0 -63 63zM893 1343v128 q0 63 63 63h128q65 0 65 -63v-128q0 -63 -65 -63h-128q-63 0 -63 63zM1275 1343v128q0 63 65 63h126q65 0 65 -63v-128q0 -63 -65 -63h-126q-65 0 -65 63z" />
-<glyph unicode="*" horiz-adv-x="0" d="M0 910v75q53 585 608 833q53 -113 70 -161q-253 -102 -383 -312q-164 -271 -94 -570q63 -258 275 -425q225 -176 522 -176q292 0 521 179q213 172 271 427q68 305 -95 567q-121 193 -383 317q12 24 36 77q22 55 38 77q544 -246 604 -820v-104q-34 -379 -295 -621 q-268 -247 -640 -273h-116q-398 32 -647 278q-273 275 -292 632zM903 1732v342q0 9 3 8h181v-686h-181q-3 126 -3 336z" />
-<glyph unicode="+" horiz-adv-x="0" d="M0 84v99q24 544 300 797q-140 102 -189 310q-51 218 34 408q157 357 592 401h91q288 -27 466 -211q200 -207 179 -494q-15 -232 -210 -414q271 -237 297 -794q5 -90 -7 -125q-17 -48 -77 -61h-1389q-70 20 -87 84zM217 201h1130q-24 486 -267 656q-118 -60 -297 -60 q-183 -2 -295 60q-246 -162 -271 -656zM305 1437q3 -130 65 -225q75 -118 221 -178q159 -65 324 -20q147 39 242 148q106 121 106 284q0 183 -133 314q-157 155 -396 134q-130 -12 -225 -75q-89 -58 -145 -150q-61 -101 -59 -232z" />
-<glyph unicode="," horiz-adv-x="0" d="M0 164v1331q27 135 167 162h1767q147 -31 169 -170v-1315q-9 -58 -48 -104q-43 -48 -101 -59q-14 -3 -225 -4h-1362q-208 0 -224 4q-118 24 -143 155zM191 328q263 244 603 580q-90 67 -301 225q-193 145 -302 224v-1029zM326 188h1447q-31 29 -623 602q-75 -60 -124 -51 q-17 5 -41 24q-27 22 -38 27q-53 -51 -297 -283q-186 -176 -295 -285q-31 -31 -29 -34zM350 1471q94 -68 350 -261q220 -166 353 -261q58 44 350 261q213 160 346 265h-701q-432 2 -698 -4zM1302 901q94 -87 287 -273q191 -184 287 -273q32 -31 35 -29q-2 97 0 517 q0 317 -3 514q-48 -36 -304 -227q-184 -138 -302 -229z" />
+<glyph unicode="*" horiz-adv-x="1989" d="M0 910v75q53 585 608 833q53 -113 70 -161q-253 -102 -383 -312q-164 -271 -94 -570q63 -258 275 -425q225 -176 522 -176q292 0 521 179q213 172 271 427q68 305 -95 567q-121 193 -383 317q12 24 36 77q22 55 38 77q544 -246 604 -820v-104q-34 -379 -295 -621 q-268 -247 -640 -273h-116q-398 32 -647 278q-273 275 -292 632zM903 1732v342q0 9 3 8h181v-686h-181q-3 126 -3 336z" />
+<glyph unicode="+" horiz-adv-x="1565" d="M0 84v99q24 544 300 797q-140 102 -189 310q-51 218 34 408q157 357 592 401h91q288 -27 466 -211q200 -207 179 -494q-15 -232 -210 -414q271 -237 297 -794q5 -90 -7 -125q-17 -48 -77 -61h-1389q-70 20 -87 84zM217 201h1130q-24 486 -267 656q-118 -60 -297 -60 q-183 -2 -295 60q-246 -162 -271 -656zM305 1437q3 -130 65 -225q75 -118 221 -178q159 -65 324 -20q147 39 242 148q106 121 106 284q0 183 -133 314q-157 155 -396 134q-130 -12 -225 -75q-89 -58 -145 -150q-61 -101 -59 -232z" />
+<glyph unicode="," horiz-adv-x="2102" d="M0 164v1331q27 135 167 162h1767q147 -31 169 -170v-1315q-9 -58 -48 -104q-43 -48 -101 -59q-14 -3 -225 -4h-1362q-208 0 -224 4q-118 24 -143 155zM191 328q263 244 603 580q-90 67 -301 225q-193 145 -302 224v-1029zM326 188h1447q-31 29 -623 602q-75 -60 -124 -51 q-17 5 -41 24q-27 22 -38 27q-53 -51 -297 -283q-186 -176 -295 -285q-31 -31 -29 -34zM350 1471q94 -68 350 -261q220 -166 353 -261q58 44 350 261q213 160 346 265h-701q-432 2 -698 -4zM1302 901q94 -87 287 -273q191 -184 287 -273q32 -31 35 -29q-2 97 0 517 q0 317 -3 514q-48 -36 -304 -227q-184 -138 -302 -229z" />
 <glyph unicode="0" horiz-adv-x="2544" d="M0 0h2545v2050h-2545v-2050zM212 212v1624h2119v-1624h-2119zM445 437h1308v135q0 79 -164 152q-341 150 -369 155q53 56 113 210q15 43 15 157q0 150 -1 159q-49 174 -250 174q-198 0 -247 -174q-2 -10 -2 -159q0 -114 16 -157q61 -155 112 -210q-27 -5 -367 -157 q-162 -72 -164 -150v-135zM1534 940h442v106h-442v-106zM1534 1186h313v104h-313v-104zM1534 1434h529v105h-529v-105z" />
 <glyph unicode="2" horiz-adv-x="2239" d="M0 1024q0 72 27 133t74 109q48 46 109 74q61 27 135 27q80 0 153 -38l326 306q-9 29 -8 70q0 72 27 133q27 63 75 108q46 46 108 73q63 27 135 27t133 -27q63 -27 109 -73q44 -44 72 -108q27 -61 27 -133t-27 -135q-27 -61 -72 -107q-46 -48 -109 -75q-61 -27 -133 -28 q-49 0 -96 14q-44 14 -80 37l-313 -290q14 -49 14 -97q0 -61 -20 -114l320 -270q39 22 82 34q44 12 93 12q72 0 133 -27q63 -27 109 -74q44 -48 72 -109q27 -63 27 -135t-27 -133q-27 -63 -72 -107q-46 -46 -109 -74q-61 -27 -133 -27t-135 27q-61 27 -108 74 q-48 44 -75 107q-27 61 -27 133q0 22 3 41q2 19 5 38l-343 290q-31 -15 -65 -22q-36 -7 -71 -7q-73 0 -135 27q-61 27 -109 74q-46 46 -74 107q-27 61 -27 135z" />
 <glyph unicode="3" horiz-adv-x="1500" d="M0 159v1450q0 31 14 60q12 29 32 53q22 24 50 39q29 15 59 16h116v148q0 49 45 87q44 36 94 36q51 0 93 -36q43 -38 43 -87v-148h408v148q0 49 41 87q43 36 99 36t97 -36q43 -38 43 -87v-148h97q31 0 62 -14q31 -15 54 -38q24 -22 38 -52q15 -29 15 -60v-1439 q0 -31 -15 -60q-14 -31 -38 -56q-24 -26 -54 -41q-31 -17 -62 -17h-1184q-61 0 -104 48t-43 111zM265 478q0 -29 18 -53q20 -24 48 -24h428q29 0 48 24q20 24 21 53q0 29 -21 53q-19 24 -48 24h-428q-27 0 -48 -24q-19 -24 -18 -53zM265 898q0 -31 18 -60q20 -29 48 -29h836 q31 0 52 29q19 29 18 60q0 27 -18 47q-20 19 -52 19h-836q-27 0 -48 -19q-19 -20 -18 -47zM546 1297q0 -29 19 -53q20 -24 48 -24h546q31 0 51 24q19 24 19 53q0 27 -19 51q-20 24 -51 24h-546q-27 0 -48 -24q-19 -24 -19 -51z" />
@@ -66,6 +66,7 @@
 <glyph unicode="i" horiz-adv-x="3193" d="M0 29v1816h280l584 -1212v1212h268v-1816h-289l-575 1184v-1184h-268zM1370 707q1 172 69 334q67 164 189 249q123 85 275 86q236 0 384 -195q150 -195 150 -490q0 -299 -150 -495q-152 -196 -382 -196q-142 0 -270 82q-130 82 -196 239q-68 159 -69 386zM1652 688 q0 -197 72 -301q73 -104 181 -104t179 104q73 104 73 302q0 193 -73 297q-72 104 -179 105q-108 0 -181 -105q-72 -102 -72 -298zM2652 29v348h273v-348h-273z" />
 <glyph unicode="j" horiz-adv-x="2713" d="M75 20q-29 16 -29 42q0 43 75 115q77 41 179 77q-26 60 -25 125q0 119 78 205q79 85 190 85q109 0 187 -85q79 -85 79 -205q0 7 0 -10q31 5 53 6v1496q0 75 48 126q49 51 123 51h1025q73 0 121 -51q46 -51 46 -126v-1579q184 -51 304 -118q116 -77 116 -121 q0 -25 -41 -39q-39 -14 -97 -14q-22 0 -46 2l-2289 1h-15q-51 0 -82 17zM1082 770q0 -34 36 -62q33 -25 70 -25h3h154q38 0 63 25q26 26 26 62v242q0 38 -26 63q-26 26 -63 26h-176q-36 0 -61 -26q-26 -26 -26 -63v-242zM1082 1408q0 -34 36 -61q34 -26 73 -26h154 q38 0 63 26q26 26 26 61v242q0 38 -26 63q-26 26 -63 26h-176q-36 0 -61 -26q-26 -26 -26 -63v-242zM1654 770q0 -34 36 -62q35 -25 72 -25h3h153q36 0 62 25q26 26 25 62v242q0 38 -25 63q-26 26 -62 26h-175q-38 0 -64 -26t-25 -63v-242zM1654 1408q0 -34 36 -61 q36 -26 75 -26h153q36 0 62 26t25 61v242q0 38 -25 63q-26 26 -62 26h-175q-38 0 -64 -26t-25 -63v-242z" />
 <glyph unicode="k" d="M0 1024q0 -425 300 -724q299 -300 724 -300t724 300q300 299 300 724t-300 724q-299 300 -724 300t-724 -300q-300 -299 -300 -724zM560 1644h177l292 -477l287 477h171l-325 -552h268v-140h-266v-201h268v-133h-270v-272h-271v270h-277v135h277v203h-277v137h277z" />
+<glyph unicode="l" horiz-adv-x="2179" d="M0 1026v126q14 210 108 411q79 164 213 297q294 287 705 318h126q427 -36 708 -318q283 -282 319 -708v-126q-36 -425 -319 -709q-282 -282 -708 -317h-126q-425 36 -709 317q-282 282 -317 709zM155 1036q24 -377 301 -635q270 -248 628 -248q29 0 59 2q369 22 630 301 q251 267 251 627q0 28 -2 57q-19 370 -300 633q-264 248 -620 248q-33 0 -66 -2q-382 -24 -633 -297q-250 -270 -250 -627q0 -29 2 -59zM657 756q44 49 328 329q-53 60 -164 169t-164 168q56 53 108 109q259 -258 291 -289q43 -43 40 -42l41 42q44 44 124 123t125 123 q43 43 39 43q3 0 58 -55q53 -53 53 -54q-56 -64 -162 -168q-119 -118 -164 -165q44 -48 164 -166q106 -104 162 -167q-2 -2 -80 -82l-28 -25l-83 80l-208 208q-41 41 -38 41l-43 -41q-44 -46 -124 -123q-82 -80 -125 -125q-41 -41 -39 -40q-2 0 -56 52z" />
 <glyph unicode="p" horiz-adv-x="2054" d="M9 1229l42 572q7 82 65 139q56 56 138 64l572 44q9 1 18 1q89 0 154 -66l992 -991q65 -65 65 -156q0 -92 -65 -157l-614 -614q-65 -65 -157 -65q-91 0 -156 65l-991 991q-64 64 -64 151q0 11 1 22zM96 1222q-1 -6 -1 -13q0 -53 38 -91l992 -992q37 -37 91 -37h3 q58 0 95 37l615 615q39 39 39 95q0 55 -39 94l-992 992q-39 39 -94 39h-10l-572 -44q-49 -3 -84 -40q-34 -34 -39 -83zM374 1505q0 73 51 125q51 51 125 51q72 0 122 -51q51 -51 52 -125q0 -72 -52 -123q-51 -51 -122 -51q-74 0 -125 51t-51 123zM486 1444q26 -24 64 -24 q36 0 61 24q26 26 26 61q0 38 -26 63q-26 26 -61 26q-38 0 -64 -26q-23 -25 -23 -60q0 -39 23 -64z" />
 <glyph unicode="q" d="M0 1024q0 423 300 724q300 300 724 300q423 0 724 -300q300 -300 300 -724q0 -423 -300 -724q-300 -300 -724 -300t-724 300t-300 724zM147 1024q0 -364 257 -620q255 -257 617 -257h3q364 0 621 257q258 256 258 620t-258 621q-258 258 -621 258q-364 0 -620 -258 q-258 -258 -257 -621zM493 734q3 29 28 48q24 19 54 15q29 -3 48 -27q154 -196 404 -197q251 0 407 200q17 24 47 27q31 5 55 -13q24 -19 27 -48v-10q0 -25 -13 -45q-197 -257 -520 -257h-3h-3q-318 0 -515 252q-16 21 -16 47v8zM587 1126v147q0 46 33 77q32 32 78 32 q44 0 77 -32q32 -31 32 -77v-147q0 -44 -32 -76t-77 -33q-46 1 -78 33t-33 76zM1246 1126v147q0 46 32 77q32 32 77 32q46 0 79 -32q32 -31 32 -77v-147q0 -44 -32 -76t-79 -33q-45 1 -77 33t-32 76z" />
 <glyph unicode="r" d="M0 1024q0 423 300 724q300 300 724 300q423 0 724 -300q300 -300 300 -724q0 -423 -300 -724q-300 -300 -724 -300t-724 300t-300 724zM150 1024q0 -362 256 -618t618 -256t618 256t256 618t-256 618t-618 256t-618 -256t-256 -618zM916 944v624q0 31 23 53q22 22 53 23 q31 0 52 -23q22 -22 23 -53v-592l218 -220q22 -22 22 -53t-22 -53t-53 -22t-53 22l-240 241q-22 22 -23 53z" />

BIN
core/src/web/staticres/fonts/qimingxing.ttf


BIN
core/src/web/staticres/fonts/qimingxing.woff


+ 0 - 0
core/src/web/staticres/js/qfw-enterprise.js → core/src/web/staticres/js/enterprise.js


+ 0 - 0
core/src/web/staticres/js/qfw-frontenterprise.js → core/src/web/staticres/js/frontenterprise.js


+ 0 - 0
core/src/web/staticres/js/qfw-geocoder.js → core/src/web/staticres/js/geocoder.js


+ 2 - 2
core/src/web/templates/member/editenterprise.html

@@ -5,7 +5,7 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{.T.res.EntName}} {{.T.res.OpLoc}}{{.T.res.EntName}} {{.T.res.EntName}}产品 {{.T.res.EntName}}服务 {{.T.res.EntName}}注册资本 企业查询 信息查询 信用查询 企业服务 信用公示"/>
 <meta name="Description" content="{{.T.res.OpScope}}"/>
-<link href="/css/qfw-enterprise.css" rel="stylesheet">
+<link href="/css/enterprise.css" rel="stylesheet">
 <script src="/js/upload.js"></script>
 <script src="/js/jquery.cxselect.js"></script>
 <script src="/js/qfwtable.js"></script>
@@ -262,5 +262,5 @@ function btnSaveForm(){
 	+"</div><div class='col-sm-1 servicename'> </div>"
 	+"</div></td><tr>"
 </script>
-<script src="/js/qfw-enterprise.js"></script>
+<script src="/js/enterprise.js"></script>
 </html>

+ 2 - 2
core/src/web/templates/member/editservice.html

@@ -5,7 +5,7 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{.T.entinfo.EntName}} {{.T.entinfo.OpLoc}}{{.T.entinfo.EntName}} {{.T.entinfo.EntName}}产品 {{.T.entinfo.EntName}}服务 {{.T.entinfo.EntName}}注册资本 企业查询 信息查询 信用查询 企业服务 信用公示"/>
 <meta name="Description" content="{{.T.entinfo.OpScope}}"/>
-<link href="/css/qfw-enterprise.css" rel="stylesheet">
+<link href="/css/enterprise.css" rel="stylesheet">
 <script src="/js/jquery.cxselect.js"></script>
 <script src="/js/upload.js"></script>
 <script src="/js/qfwtable.js"></script>
@@ -353,7 +353,7 @@ function initSecondServiceType(firstsertype){
 	{{end}}
 }
 </script>
-<script src="/js/qfw-enterprise.js"></script>
+<script src="/js/enterprise.js"></script>
 <script>
    window.onload=function(){limouseover();}
 </script>

+ 3 - 3
core/src/web/templates/member/showenterprise.html

@@ -5,8 +5,8 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{.T.res.EntName}},{{.T.res.EntName}}地址,{{.T.res.EntName}}怎么样"/>
 <meta name="Description" content="{{.T.entinfo.OpScope}}"/>
-<link href="/css/qfw-enterprise.css" rel="stylesheet">
-<script src="/js/qfw-geocoder.js"></script>
+<link href="/css/enterprise.css" rel="stylesheet">
+<script src="/js/geocoder.js"></script>
 <script type="text/javascript" src="http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217"></script>  
 <script src="/js/jquery.cxselect.js"></script>
 <script src="/js/upload.js"></script>
@@ -734,7 +734,7 @@ function initSecondServiceType(firstsertype){
 	{{end}}
 }
 </script>
-<script src="/js/qfw-enterprise.js"></script>
+<script src="/js/enterprise.js"></script>
 
 
 </html>

+ 2 - 2
core/src/web/templates/search/enterpriseList.html

@@ -4,7 +4,7 @@
 <meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
 {{include "/common/inc.html"}}
 <script src="/js/jquery.cxselect.js"></script>
-<link href="/css/qfw-enterprise.css" rel="stylesheet">
+<link href="/css/enterprise.css" rel="stylesheet">
 <meta name="Keywords" content="{{Msg "seo" "qfw.enterprise.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.enterprise.description"}}"/>
 </head>
@@ -167,7 +167,7 @@ var czb= '{{index .T.querymap "c_zb"}}';
 var $chiancity= true,$listent=true;
 setNavbarActive(2);
 </script>
-<script src="/js/qfw-enterprise.js"></script>
+<script src="/js/enterprise.js"></script>
 
 </body>
 </html>

+ 1 - 1
core/src/web/templates/service/appointment.html

@@ -4,7 +4,7 @@
   	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 		  	<div class="modal-header">
-				<span data-dismiss="modal" aria-label="Close" onClick="qxdx()" class="close bootstrap-glyphicon glyphicon-remove-circle"></span>
+				<span data-dismiss="modal" aria-label="Close" onClick="qxdx()" class="close glyphicon guanbi1"></span>
 				<span class="modal-title" id="appointmentModalLabel">免费预约</span>
 			</div>
 			<div id="reg_b">

+ 0 - 277
core/src/web/templates/yellowpage/editenterprise.html

@@ -1,277 +0,0 @@
-<!--企业黄页--编辑企业信息-->
-<html>
-<head>
-<title>企业黄页--编辑企业信息</title>
-{{include "/common/inc.html"}}
-<script src="/js/validform-min.js"></script>
-<script src="/js/jquery.cxselect.js"></script>
-<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>
-<style type="text/css">
-.qfw-index-select {
-	width: 80px !important;
-	border-top-left-radius: 5px !important;
-	border-bottom-left-radius: 5px !important;
-}
-.username{
-	background: url("images/user.png") no-repeat;
-	background-position: 5px center;
-	padding-left: 30px;
-}
-.password{
-	background: url("images/key.png") no-repeat;
-	background-position: 5px center;
-	padding-left: 30px;
-}
-.thirdParty{
-	line-height: 40px;
-}
-.thirdParty img{
-	margin-left: 10px;
-}
-.hrdashed{
-	border-bottom: 1px dashed #2F8DF2; 
-	padding-bottom:5px;
-}
-.bordersolid{
-	border: 1px solid #2F8DF2;
-}
-.header-table{
-	padding-left: 20px;
-	height:90px;
-	line-height:90px;
-	vertical-align: middle;
-    background-color: #fff;
-}
-.qfw-navbar li {
-  width: 33%;
-  text-align: center;
-}
-.header-top .leftul {
-	float: left;
-	margin-top: 5px;
-	margin-left: 15px;
-	font-size: 12px;
-}
-.header-top ul {
-	float: right;
-	margin-top: 5px;
-}
-.form-horizontal .form-group {
-	margin-left: 10px;
-}
-.select-control{
-  height: 34px;
-  padding: 6px 12px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #555;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-  -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
-  -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-  transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-}
-.select-width{
-	width: 170px;
-}
-
-</style>
-</head>
-<body>
-<form class="form-horizontal validForm" action="../../../dosave/enterprise" method="post">
-<div class="container-fluid">
-	<!-- 头部 -->
-	{{include "common/yptop.html"}}
-</div>
-<!-- 中间 -->
-<div class="bordersolid" style="margin:15px; margin-top:0px;">
-<div class="container">
-	<div class="row" style="padding-top:10px;">
-		<div class="col-xs-12 hrdashed">		
-			<img src="../../../images/qfw_qyxx.png" class="hidden-xs" />
-			<span style="font-size:20px; vertical-align: middle;">企业简介</span>
-		</div>
-		<div class="col-xs-12" style="border-bottom: 2px solid #2F8DF2; margin-top:15px;margin-bottom:5px; min-height:180px;" >
-			<input id="id" name="id"  type="hidden" value="{{.T.entid}}">
-			<input type="hidden" value="{{.T.entinfo.EntName}}" name="EntName" id="EntName"> 		
-			
-		<textarea name="s_synopsis">{{.T.entinfo.s_synopsis}}</textarea>
-         <script>
-		 $(function(){
-			var kindEditInit=function(){
-		     editor = KindEditor.create('textarea[name="s_synopsis"]', {
-			 id:"ke_editor",
-			 allowFileManager : false,
-			 filterMode:true,
-			 width : '100%',
-			 height:'20px',
-			 items:items_simp,
-			 allowImageRemoteImageRemote:false,
-			 uploadJson : '/filemanage/upload',
-			 afterCreate:function() {
-				    this.sync()
-			    },
-			 beforesubmit:function(){
-					this.sync()
-				},
-			 afterBlur: function(){
-					this.sync()
-				}
-			 });		
-			 }
-			 kindEditInit()
-			
-		})
-		</script>
-		</div>
-	</div>
-
-
-	<div class="row">
-		<div class="col-xs-12 hrdashed">
-			<img src="../../../images/qfw_ywfw.png" class="hidden-xs" />
-			<span style="font-size:20px; vertical-align: middle;">业务范围</span>
-		</div>
-		<div class="col-xs-12" style="border-bottom: 2px solid #2F8DF2;line-height:40px; margin-top:15px;margin-bottom:5px; min-height:100px;">
-			<div class="form-group">
-				<label for="OpScope" class="col-xs-3 col-md-2">
-					<select  class="select-width cxselect select-control" name="ywfw_key1">
-					{{range $k, $v := .T.dictionary_enterprise}}
-					 <option value="{{$v.s_name}}"> {{$v.s_name}}</option>
-					{{end}}
-					<option value="其他" >其他</option>
-					</select>
-				</label>
-				<div class="col-xs-9 col-md-8">
-					<input type="text" onpaste="return false" class="form-control" name="ywfw_value1">
-				</div>
-			</div>
-			
-			<div class="form-group">
-				<label for="OpScope" class="col-xs-3 col-md-2">
-					<select  class="select-width cxselect select-control" name="ywfw_key2">
-					{{range $k, $v := .T.dictionary_enterprise}}
-					 <option value="{{$v.s_name}}"> {{$v.s_name}}</option>
-					{{end}}
-					<option value="其他" >其他</option>
-					</select>
-				</label>
-				<div class="col-xs-9 col-md-8">
-					<input type="text" onpaste="return false" class="form-control" name="ywfw_value2" >
-				</div>
-			</div>
-			<div class="form-group">
-				<label for="OpScope" class="col-xs-3 col-md-2">
-					<select  class="select-width cxselect select-control" name="ywfw_key3">					
-					{{range $k, $v := .T.dictionary_enterprise}}					
-					 <option value="{{$v.s_name}}"> {{$v.s_name}}</option>
-					{{end}}
-					<option value="其他" selected="true">其他</option>
-					</select>
-				</label>
-				<div class="col-xs-9 col-md-8">
-					<input type="text" onpaste="return false" class="form-control" name="ywfw_value3" value="{{.T.entinfo.OpScope}}">
-				</div>
-			</div>
-
-		</div>
-	</div>
-
-	
-	<div class="row">
-		<div class="col-xs-12 hrdashed">
-			<img src="../../../images/qfw_lxfs.png" class="hidden-xs" />
-			<span style="font-size:20px; vertical-align: middle;">联系方式</span>
-		</div>
-		<div class="col-xs-12" style="line-height:40px; margin-top:15px;">
-			<div class="form-group">
-			    <label for="LeRep" class="col-xs-3 col-md-1">联  系  人: </label>
-			    <div class="col-xs-9 col-md-4">
-			      <input type="text" name="LeRep" class="form-control" id="LeRep" value="{{.T.entinfo.LeRep}}">
-			    </div>
-			</div>
-			<div class="form-group">
-			    <label for="Tel" class="col-xs-3 col-md-1">手    机: </label>
-			    <div class="col-xs-9 col-md-4">
-			      <input type="text" name="Tel" class="form-control" id="Tel" value="{{.T.entinfo.Tel}}" >
-			    </div>
-			</div>
-			<div class="form-group">
-			    <label for="s_enturl" class="col-xs-3 col-md-1">企业网站: </label>
-			    <div class="col-xs-9 col-md-4">
-			      <input type="text" name="s_enturl" onpaste="return false" class="form-control" id="s_enturl" value="{{.T.entinfo.s_enturl}}"  >
-			    </div>
-			</div>
-			
-			<div class="form-group">
-				<input type="hidden" id="province" value="{{.T.entinfo.i_province}}">
-				<input type="hidden" id="city" value="{{.T.entinfo.i_city}}">
-				<input type="hidden" id="area" value="{{.T.entinfo.i_area}}">
-			    <label for="Dom" class="col-xs-3 col-md-1">联系地址: </label>
-			    <div  class="col-xs-9 col-md-8">
-			    <div id="city_china">
-				<select  class="province cxselect select-control" name="province" data-first-title="全国"></select>
-				<select class="city cxselect select-control" disabled="disabled" name="city" data-first-title="选择市"></select>
-				<select class="area cxselect select-control" disabled="disabled" name="area" data-first-title="选择县"></select>
-				</div>
-			      <input type="text" name="Dom" class="form-control"  placeholder="街道 门牌号 大厦名称 房间号" value="{{.T.entinfo.Dom}}"  >
-			    </div>
-			</div>
-		</div>
-	</div>
-</div>
-</div>
-</form>
-<div class="container-fluid">
-{{include "/common/bottom.html"}}
-</div>
-
-{{include "/common/login.html"}}
-<script type="text/javascript">
-var province = $("#province").val();
-var city = $("#city").val();
-var area = $("#area").val();
-
-$('#city_china').cxSelect({
-	selects: ['province', 'city', 'area'],
-	required:0
-});
-
-$.cxSelect.setVal(province,city,area);
-
-$(function (){
-	var obj = $(".navbar-nav li a.qfw-navbar-active");
-	$(".navbar-nav li a").mouseover(function (){
-		obj.removeClass("qfw-navbar-active");
-		$(this).addClass("qfw-navbar-active");
-	}).mouseout(function (){
-		$(this).removeClass("qfw-navbar-active");
-		obj.addClass("qfw-navbar-active");
-	});
-});
-//表单提交事件
-function btnSaveForm (){
-	//序列化表格内容为字符串
-	var param = $("#entForm").serialize();
-	$.ajax({    
-     type:'post',        
-     url:'../../../dosave/enterprise',    
-     data:param,    
-     cache:false,    
-     dataType:'json', 
-     success:function(data){
-   		alert(data.info);
-		setTimeout(window.history.back(-1),1000);   
-     }    
-     });    
-	
-}
-</script>
-</body>
-</html>

+ 3 - 3
core/src/web/templates/yellowpage/enterpriseinfo.html

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

+ 392 - 0
core/src/web/templates/yellowpage/enterpriseinfo_copy.html

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

+ 2 - 2
core/src/web/templates/yellowpage/ungxenterpriseinfo.html

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

+ 2 - 2
core/src/web/templates/yellowpage/unrzenterpriseinfo.html

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