Explorar o código

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

wangchuanjin %!s(int64=9) %!d(string=hai) anos
pai
achega
8d533a9d5c
Modificáronse 53 ficheiros con 1405 adicións e 85 borrados
  1. 14 14
      core/src/serviceclassify.json
  2. 1 1
      core/src/timetask.json
  3. 498 0
      core/src/web/staticres/css/index-new.css
  4. 498 0
      core/src/web/staticres/css/index-new.css.bak
  5. BIN=BIN
      core/src/web/staticres/images/djz-a.png
  6. BIN=BIN
      core/src/web/staticres/images/djz.png
  7. BIN=BIN
      core/src/web/staticres/images/flyz-a.png
  8. BIN=BIN
      core/src/web/staticres/images/flyz.png
  9. BIN=BIN
      core/src/web/staticres/images/rz-a.png
  10. BIN=BIN
      core/src/web/staticres/images/rz.png
  11. BIN=BIN
      core/src/web/staticres/images/sbzl-a.png
  12. BIN=BIN
      core/src/web/staticres/images/sbzl.png
  13. BIN=BIN
      core/src/web/staticres/images/serviceclassify-01-new.png
  14. BIN=BIN
      core/src/web/staticres/images/serviceclassify-02-new.png
  15. BIN=BIN
      core/src/web/staticres/images/serviceclassify-03-new.png
  16. BIN=BIN
      core/src/web/staticres/images/serviceclassify-04-new.png
  17. BIN=BIN
      core/src/web/staticres/images/serviceclassify-05-new.png
  18. BIN=BIN
      core/src/web/staticres/images/serviceclassify-06-new.png
  19. BIN=BIN
      core/src/web/staticres/images/serviceclassify-07-new.png
  20. BIN=BIN
      core/src/web/staticres/images/serviceclassify-08-new.png
  21. BIN=BIN
      core/src/web/staticres/images/serviceclassify-09-new.png
  22. BIN=BIN
      core/src/web/staticres/images/serviceclassify-10-new.png
  23. BIN=BIN
      core/src/web/staticres/images/serviceclassify-11-new.png
  24. BIN=BIN
      core/src/web/staticres/images/serviceclassify-12-new.png
  25. BIN=BIN
      core/src/web/staticres/images/serviceclassify-13-new.png
  26. BIN=BIN
      core/src/web/staticres/images/serviceclassify-14-new.png
  27. BIN=BIN
      core/src/web/staticres/images/u0107.png
  28. BIN=BIN
      core/src/web/staticres/images/u1011.png
  29. BIN=BIN
      core/src/web/staticres/images/u185.png
  30. BIN=BIN
      core/src/web/staticres/images/u230.png
  31. BIN=BIN
      core/src/web/staticres/images/u234.png
  32. BIN=BIN
      core/src/web/staticres/images/u236.png
  33. BIN=BIN
      core/src/web/staticres/images/u2381.png
  34. BIN=BIN
      core/src/web/staticres/images/u2401.png
  35. BIN=BIN
      core/src/web/staticres/images/u347.png
  36. BIN=BIN
      core/src/web/staticres/images/u385.png
  37. BIN=BIN
      core/src/web/staticres/images/u4171.png
  38. BIN=BIN
      core/src/web/staticres/images/u439.png
  39. BIN=BIN
      core/src/web/staticres/images/u445.png
  40. BIN=BIN
      core/src/web/staticres/images/u457.png
  41. BIN=BIN
      core/src/web/staticres/images/u46.png
  42. BIN=BIN
      core/src/web/staticres/images/u467.png
  43. BIN=BIN
      core/src/web/staticres/images/u469.png
  44. BIN=BIN
      core/src/web/staticres/images/u471.png
  45. BIN=BIN
      core/src/web/staticres/images/u473.png
  46. BIN=BIN
      core/src/web/staticres/images/wdzx-a.png
  47. BIN=BIN
      core/src/web/staticres/images/wdzx.png
  48. BIN=BIN
      core/src/web/staticres/images/zcgs-a.png
  49. BIN=BIN
      core/src/web/staticres/images/zcgs.png
  50. 2 2
      core/src/web/staticres/js/qfw.js
  51. 1 0
      core/src/web/templates/common/inc.html
  52. 296 0
      core/src/web/templates/common/indexhead.html
  53. 95 68
      core/src/web/templates/index.html

+ 14 - 14
core/src/serviceclassify.json

@@ -2,7 +2,7 @@
     {
         "code": "01",
         "name": "工商、财税服务",
-        "image": "serviceclassify-01.png",
+        "image": "serviceclassify-01-new.png",
         "children": [
             {
                 "code": "0101",
@@ -67,7 +67,7 @@
     {
         "code": "02",
         "name": "金融服务",
-        "image": "serviceclassify-02.png",
+        "image": "serviceclassify-02-new.png",
         "children": [
             {
                 "code": "0201",
@@ -108,7 +108,7 @@
     {
         "code": "03",
         "name": "设计服务",
-        "image": "serviceclassify-03.png",
+        "image": "serviceclassify-03-new.png",
         "children": [
             {
                 "code": "0301",
@@ -271,7 +271,7 @@
     {
         "code": "04",
         "name": "人力资源、招聘服务",
-        "image": "serviceclassify-04.png",
+        "image": "serviceclassify-04-new.png",
         "children": [
             {
                 "code": "0401",
@@ -346,7 +346,7 @@
     {
         "code": "05",
         "name": "法律服务、知识产权",
-        "image": "serviceclassify-05.png",
+        "image": "serviceclassify-05-new.png",
         "children": [
             {
                 "code": "0501",
@@ -385,7 +385,7 @@
     {
         "code": "06",
         "name": "教育培训、管理咨询",
-        "image": "serviceclassify-06.png",
+        "image": "serviceclassify-06-new.png",
         "children": [
             {
                 "code": "0601",
@@ -464,7 +464,7 @@
     {
         "code": "07",
         "name": "商旅服务",
-        "image": "serviceclassify-07.png",
+        "image": "serviceclassify-07-new.png",
         "children": [
             {
                 "code": "0701",
@@ -533,7 +533,7 @@
     {
         "code": "08",
         "name": "IT服务",
-        "image": "serviceclassify-08.png",
+        "image": "serviceclassify-08-new.png",
         "children": [
             {
                 "code": "0801",
@@ -614,7 +614,7 @@
     {
         "code": "09",
         "name": "营销推广",
-        "image": "serviceclassify-09.png",
+        "image": "serviceclassify-09-new.png",
         "children": [
             {
                 "code": "0901",
@@ -703,7 +703,7 @@
     {
         "code": "10",
         "name": "日常服务",
-        "image": "serviceclassify-10.png",
+        "image": "serviceclassify-10-new.png",
         "children": [
             {
                 "code": "1001",
@@ -822,7 +822,7 @@
     {
         "code": "11",
         "name": "创业辅导服务",
-        "image": "serviceclassify-11.png",
+        "image": "serviceclassify-11-new.png",
         "children": [
             {
                 "code": "1101",
@@ -851,7 +851,7 @@
     {
         "code": "12",
         "name": "校企合作服务",
-        "image": "serviceclassify-12.png",
+        "image": "serviceclassify-12-new.png",
         "children": [
             {
                 "code": "1201",
@@ -880,7 +880,7 @@
     {
         "code": "13",
         "name": "产业链整合服务",
-        "image": "serviceclassify-13.png",
+        "image": "serviceclassify-13-new.png",
         "children": [
             {
                 "code": "1301",
@@ -897,7 +897,7 @@
     {
         "code": "14",
         "name": "涉外企业服务",
-        "image": "serviceclassify-14.png",
+        "image": "serviceclassify-14-new.png",
         "children": [
             {
                 "code": "1401",

+ 1 - 1
core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-05 17:12:57"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-05 17:12:57"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-08 17:35:28"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-08 17:35:28"}},"marketisstart":true,"marketrate":300}

+ 498 - 0
core/src/web/staticres/css/index-new.css

@@ -0,0 +1,498 @@
+/****indexhead*****/
+.index-new-nva{
+	border-bottom:1px solid #ccc;
+    border-top: 5px solid #FF5A5F;
+    background-color: rgb(255, 255, 255);
+	margin-bottom:10px;
+}
+.index-new-head .loginStatus li a:hover {
+	background-color: #FF5A5F;
+	color: #fff !important;
+}
+.a-com-active>a{
+	font-size:18px;
+	color:#fff;
+	font-weight:bold;
+}
+.a-com-active{
+	background-color:#FF5A5F;
+}
+.index-new-top {
+    height: 30px;
+    line-height: 30px;
+    padding-right: 50px;
+    background-color: rgb(70, 70, 69);
+}
+.index-new-top > div {
+    max-width: 1200px;
+    margin: auto;
+}
+.index-new-top li {
+    padding-left: 20px;
+}
+.index-new-top i.fuwushichang {
+    padding-top: 5px;
+    padding-right: 5px;
+}
+.index-new-top li:hover>a , .index-new-nva-c a:hover,#loginStatus a:hover{
+	color: #FF5A5F !important;
+}
+.a-com-active a:hover{
+	color: #ccc !important;
+}
+.index-new-top li:hover>i{
+	background-color: #FF5A5F !important;
+}
+.index-new-top i {
+    font-size: 12px;
+    display: inline-block;
+    background-color: rgb(160, 160, 160);
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+    text-align: center;
+    padding-top: 4px;
+}
+.index-new-top a {
+    color: rgb(160, 160, 160);
+}
+.index-new-head a {
+    text-decoration: none;
+}
+.index-new-top i.jianyu {
+    padding-left: 2px;
+}
+.index-new-top i.zhengcefagui {
+    padding-top: 5px;
+}
+.index-new-nva > ul {
+    height: 70px;
+    line-height: 70px;
+    max-width: 1200px;
+    margin: auto;
+}
+.index-new-nva-l {
+    padding-right: 20px;
+}
+.logo {
+    width: 161px;
+    height: 68px;
+}
+.index-new-nva-c {
+    width: 100px;
+    text-align: center;
+    font-size: 16px;
+}
+.index-new-head .loginstatus {
+    padding-right: 15px;
+}
+.loginstatus > a {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    display: inline-block;
+    vertical-align: middle;
+    margin-left: 5px;
+}
+
+a:focus, a:hover{
+	color: #FF5A5F !important;
+}
+.setserver,#setdemand{
+    font-family: '宋体 Regular', '宋体';
+    font-size: 14px;
+}
+.index-new-nva-s {
+    width: 1px;
+    height: 20px;
+    margin-top: 25px;
+    border-right: 1px solid #999;
+    float: right;
+    margin-right: -2px;
+}
+.index-new-nva .fwsc{
+	width:120px;
+	margin-left:24px;
+	margin-right:20px;
+}
+.index-new-nva .a-h-search{
+    width: 25%;
+    padding-right: 15px;
+	float:right;
+	padding-top:18px;
+}
+.index-new-nva .a-h-search span i {
+    position: absolute;
+    right: 10px;
+    top: 50%;
+    z-index: 10;
+    font-size: 14px;
+    margin-top: -7px;
+	color:#fff;
+}
+.index-new-nva .a-h-search span{
+    position: absolute;
+    right: 10px;    
+	border-radius: 50px;
+    top: 50%;
+    z-index: 20;
+    margin-top: -19px;
+	margin-right:-10px;
+    display: inline-block;
+	width:38px;
+	height:38px;
+	border:1px solid #ccc;
+	background-color:#FF5A5F;
+}
+.index-new-nva .a-h-search .input-group {
+    width: 100%;
+    height: inherit;
+}
+.index-new-nva #header-searchInput{
+	border-radius: 50px;
+}
+.index-new-head .loginStatus>span {
+    position: relative;
+    display: inline-block;
+}
+.index-new-head .head-hideMenu {
+    display: none;
+    position: absolute;
+    width: 120px;
+    left: 50%;
+    margin-left: -60px;
+}
+.index-new-head .head-hideMenu ul {
+    background-color: #F7F9FB;
+    box-shadow: 0 5px 10px rgba(0,0,0,.2);
+    margin-top: 1px;
+    float: left;
+}
+.index-new-head .head-hideMenu li:hover {
+    background-color: #FF5A5F;
+    color: #fff;
+}
+.index-new-head .head-hideMenu li {
+    width: 100%;
+    border-bottom: 1px solid #EDEEEF;
+    line-height: 40px;
+    padding-left: 20px;
+    cursor: pointer;
+}
+.index-new-head .headimg {
+    width: 40px;
+    height: 40px;
+    margin-right: 5px;
+}
+.index-new-head .head-hideMenu li:hover>i {
+    color: #fff;
+}
+.index-new-head .head-hideMenu i.youjian {
+    font-size: 12px;
+}
+.index-new-head .head-hideMenu i {
+    color: #FF5A5F;
+    margin-right: 5px;
+}
+.index-new-head .head-hideMenu i.ren1, .index-new-head .head-hideMenu i.tuichu {
+    font-size: 16px;
+    margin-right: 15px !important;
+}
+.index-new-head .head-hideMenu i.ren1 {
+    margin-left: 2px;
+}
+.index-new-head .loginStatus>span .round-dot {
+    right: 5px;
+    width: 8px;
+    height: 8px;
+}
+.index-new-head .round-dot {
+    background-color: #FF5A5F;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    position: absolute;
+    display: block;
+    top: 0px;
+	padding:0px;
+	margin-right:2px;
+}
+.index-new-head .head-hideMenu li:hover .round-dot {
+    background-color: #FFFFFF;
+}
+.index-new-head .head-hideMenu li .round-dot {
+    right: 15px;
+	top:10px;
+}
+/*****index****/
+
+.a-index-head .a-i-h-right .a-index-want {
+	border:1px solid #f0f0f0;
+}
+.index-new-row{
+	margin-top:20px;
+	border-bottom:3px solid #FF5A5F;
+	margin-bottom:0px;
+}
+.index-new-fwfl{
+    width: 200px;
+    text-align: center;
+    font-size: 18px;
+	margin-left:0px;
+	color:#fff;
+	font-weight:bold;
+}
+.index-new-row>ul{
+    height: 60px;
+    line-height: 60px;
+    max-width: 1200px;
+    margin: auto;
+}
+.index-new-row>ul>li img {
+	width:40px;
+	height:40px;
+	margin-left:10px;
+}
+.index-new-row>ul>li span {
+	margin-left:50px;
+	color:#FF5A5F;
+	font-size:18px;
+	font-weight:bold;
+	
+}
+.index-new-row>ul>li a {
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #4E5051;
+	}
+	
+.index-new-row>ul>li a:hover{
+	color:#FF5A5F;
+    text-decoration: none;
+}
+.index-new-rmfw-title,.index-new-rmxq-title{
+	border:1px solid #f0f0f0;
+	margin-bottom:0px;
+	padding:10px; 
+	border-bottom:0px;
+}
+.index-new-rmfw-list,.index-new-rmxq-list,.a-qysq,.index-new-wgw,.index-new-xwzx{
+	border:1px solid #f0f0f0; 
+	padding:10px;
+}
+.index-new-fbfw-a{
+	padding:10;
+    font-family: '宋体 Regular', '宋体';
+    font-size: 14px;
+    color: #666666;	
+}
+.index-new-rmfw-remark{
+	margin-top:-60px;
+}
+.index-new-rmfw-remark a{
+	font-family: '微软雅黑 Regular', '微软雅黑';
+    font-size: 16px;
+    color: #FFFFFF;
+}
+.index-new-rmfw-fgx{
+	border:1px solid #FF5A5F; 
+	margin-top:-70px;
+}
+.index-new-rmfw-name{
+	margin-top:-32px;
+}
+.index-new-rmxq-remark a{
+	font-family: '微软雅黑 Bold', '微软雅黑';
+    font-weight: 700;
+    font-size: 16px;
+}
+.a-com-servcename{
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #FF5A5F;
+	padding:5px 10px;
+}
+.index-new-rmxq-name{
+	margin-top:20px;
+	margin-bottom:30px;
+}
+.index-new-rmxq-name div{
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+}
+.a-qysq .a-com-title span,.index-new-wgw .a-com-title span{
+	display:inline-block;
+	margin-top:10px;
+	margin-bottom:40px;
+}
+
+.a-index .a-qysq .a-com-title font a,.a-index .index-new-wgw .a-com-title font a,.a-index .index-new-xwzx .a-com-title font a{
+	font-family: '微软雅黑 Bold', '微软雅黑';
+    font-weight: 700;
+    font-size: 24px;
+    color: #FF5A5F;
+}
+.index-new-qysq-con{
+	padding:10px 20px 50px 20px;
+}
+.a-index .a-qysq .index-new-qysq-con img {
+	border:0px;
+}
+.a-index .index-new-wgw-fgx{
+	margin-top:-20px;
+	margin-bottom:30px;
+}
+.index-new-wgwcon{
+	padding:20px 150px;
+}
+.a-index .index-new-wgw-remark a{
+    font-family: '微软雅黑 Regular', '微软雅黑';
+    font-size: 14px;
+    color: #FFFFFF;
+}
+.a-index .index-new-wgw-remark{
+	margin-top:-40px;
+}
+.a-index .index-new-wgw-fgx2{
+	border:1px solid #FF5A5F;
+	margin-top:-55px;
+}
+.a-index .index-new-title{
+	padding:20px;
+}
+.a-index .index-new-first img{
+    width:100px;
+	height:105px;
+    display: table;
+    background-color: rgb(255, 255, 255);
+    text-align: center;	
+}
+.a-index  .index-new-xwzx-con{
+	padding:20px 30px;
+}
+.a-index  .index-new-xwzx-con ul{
+	width:350px;
+	border:0px;
+	background-color:#fff;
+}
+.a-index  .index-new-xwzx-con .index-new-first{
+	width:100px;
+	margin-right:8px;
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-title{
+	width:230px;
+    font-family: '微软雅黑 Bold', '微软雅黑';
+    font-weight: 700;
+    font-size: 16px;
+	padding-bottom:5px;
+	white-space:nowrap;
+	overflow:hidden;
+	text-overflow:ellipsis; 
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-date{
+	width:70px;
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-content{
+	height:50px;
+	width:230px;
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+}
+.a-index .a-index-head .index-new-left{
+	border-top:3px solid #FF5A5F;
+}
+.a-index .a-index-head{
+	margin-top:5px;
+}
+.a-index-head .index-new-left > ul {
+	background-color:#fff;
+	border-bottom:3px solid #FF5A5F;
+}
+.a-index-head .index-new-left > div {
+	background-color:#fff;
+	color:#FF5A5F;
+	border-bottom:1px solid #ccc;
+	font-size:18px;
+    font-family: '宋体 Regular', '宋体';
+	padding-left:0px;
+}
+.a-index-head .index-new-left > ul > li {
+    font-family: '宋体 Regular', '宋体';
+    font-size: 14px;
+    color: #4E5051;	
+}
+.a-index-head  .a-new-hover {
+    background-color: #f0f0f0;
+    color: #000;
+}
+.a-index-head .a-i-h-left .index-new-zb{
+	float:right;
+	width:20px;
+	height:30px;
+}
+.a-index-head .a-i-h-right .a-com-title-line {
+	border-bottom:1px solid #f0f0f0;
+	width:293px;
+	margin-left:-10px;
+}
+body {
+	background-color:#f0f0f0;
+}
+.a-index-head .a-i-h-right, .a-rmfw,.a-rmxq,.a-qysq,.a-xwzx,.index-new-wgw{
+	background-color:#fff;
+}
+.index-new-top,.index-new-nva{
+	max-width:1349px;
+	margin:auto;
+}
+.index-new-rmxq-list .a-com-ul-block .a-com-last{
+	padding-left:0px;
+}
+.a-index .a-panel .index-new-rmfw-title font a,.a-index .a-panel .index-new-rmxq-title font a{
+	color:#000;
+}
+#one-levelClassify #index-new-qztb{
+	margin-top:-3px;
+}
+.a-index-head .a-i-h-right ul {
+	height:280px;
+	margin-bottom:20px;
+}
+.a-index .a-index-want .a-com-two {
+	margin:20px 5px 40px;
+}
+.a-index .a-qysq-con{
+	width:100%;
+	height:300px;
+	background-color:#E5E3E3;
+	margin-top:-20px;
+}
+.a-index .a-qysq-con ul{
+	padding:50px;
+}
+.a-index .a-qysq-con ul li{
+	width:25%;
+}
+.a-index .a-qysq-con ul li div{
+	margin-bottom:5px;
+}
+.a-index .a-qysq-con ul li img{
+	width:200px; 
+	height:114px;
+}
+.a-index .a-qysq-con .qysq-cpmp-title{
+	padding:10px 0px; 
+	font-size:18px;
+	font-weight:bold;
+}
+.a-index .a-qysq-con .qysq-entname{
+	font-size:14px;
+}
+.a-index a:hover{
+    text-decoration: none;
+}

+ 498 - 0
core/src/web/staticres/css/index-new.css.bak

@@ -0,0 +1,498 @@
+/****indexhead*****/
+.index-new-nva{
+	border-bottom:1px solid #ccc;
+    border-top: 5px solid #FF5A5F;
+    background-color: rgb(255, 255, 255);
+	margin-bottom:10px;
+}
+.index-new-head .loginStatus li a:hover {
+	background-color: #FF5A5F;
+	color: #fff !important;
+}
+.a-com-active>a{
+	font-size:18px;
+	color:#fff;
+	font-weight:bold;
+}
+.a-com-active{
+	background-color:#FF5A5F;
+}
+.index-new-top {
+    height: 30px;
+    line-height: 30px;
+    padding-right: 50px;
+    background-color: rgb(70, 70, 69);
+}
+.index-new-top > div {
+    max-width: 1200px;
+    margin: auto;
+}
+.index-new-top li {
+    padding-left: 20px;
+}
+.index-new-top i.fuwushichang {
+    padding-top: 5px;
+    padding-right: 5px;
+}
+.index-new-top li:hover>a , .index-new-nva-c a:hover,#loginStatus a:hover{
+	color: #FF5A5F !important;
+}
+.a-com-active a:hover{
+	color: #ccc !important;
+}
+.index-new-top li:hover>i{
+	background-color: #FF5A5F !important;
+}
+.index-new-top i {
+    font-size: 12px;
+    display: inline-block;
+    background-color: rgb(160, 160, 160);
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+    text-align: center;
+    padding-top: 4px;
+}
+.index-new-top a {
+    color: rgb(160, 160, 160);
+}
+.index-new-head a {
+    text-decoration: none;
+}
+.index-new-top i.jianyu {
+    padding-left: 2px;
+}
+.index-new-top i.zhengcefagui {
+    padding-top: 5px;
+}
+.index-new-nva > ul {
+    height: 70px;
+    line-height: 70px;
+    max-width: 1200px;
+    margin: auto;
+}
+.index-new-nva-l {
+    padding-right: 20px;
+}
+.logo {
+    width: 161px;
+    height: 68px;
+}
+.index-new-nva-c {
+    width: 100px;
+    text-align: center;
+    font-size: 16px;
+}
+.index-new-head .loginstatus {
+    padding-right: 15px;
+}
+.loginstatus > a {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    display: inline-block;
+    vertical-align: middle;
+    margin-left: 5px;
+}
+
+a:focus, a:hover{
+	color: #FF5A5F !important;
+}
+.setserver,#setdemand{
+    font-family: '宋体 Regular', '宋体';
+    font-size: 14px;
+}
+.index-new-nva-s {
+    width: 1px;
+    height: 20px;
+    margin-top: 25px;
+    border-right: 1px solid #999;
+    float: right;
+    margin-right: -2px;
+}
+.index-new-nva .fwsc{
+	width:120px;
+	margin-left:24px;
+	margin-right:20px;
+}
+.index-new-nva .a-h-search{
+    width: 25%;
+    padding-right: 15px;
+	float:right;
+	padding-top:18px;
+}
+.index-new-nva .a-h-search span i {
+    position: absolute;
+    right: 10px;
+    top: 50%;
+    z-index: 10;
+    font-size: 14px;
+    margin-top: -7px;
+	color:#fff;
+}
+.index-new-nva .a-h-search span{
+    position: absolute;
+    right: 10px;    
+	border-radius: 50px;
+    top: 50%;
+    z-index: 20;
+    margin-top: -19px;
+	margin-right:-10px;
+    display: inline-block;
+	width:38px;
+	height:38px;
+	border:1px solid #ccc;
+	background-color:#FF5A5F;
+}
+.index-new-nva .a-h-search .input-group {
+    width: 100%;
+    height: inherit;
+}
+.index-new-nva #header-searchInput{
+	border-radius: 50px;
+}
+.index-new-head .loginStatus>span {
+    position: relative;
+    display: inline-block;
+}
+.index-new-head .head-hideMenu {
+    display: none;
+    position: absolute;
+    width: 120px;
+    left: 50%;
+    margin-left: -60px;
+}
+.index-new-head .head-hideMenu ul {
+    background-color: #F7F9FB;
+    box-shadow: 0 5px 10px rgba(0,0,0,.2);
+    margin-top: 1px;
+    float: left;
+}
+.index-new-head .head-hideMenu li:hover {
+    background-color: #FF5A5F;
+    color: #fff;
+}
+.index-new-head .head-hideMenu li {
+    width: 100%;
+    border-bottom: 1px solid #EDEEEF;
+    line-height: 40px;
+    padding-left: 20px;
+    cursor: pointer;
+}
+.index-new-head .headimg {
+    width: 40px;
+    height: 40px;
+    margin-right: 5px;
+}
+.index-new-head .head-hideMenu li:hover>i {
+    color: #fff;
+}
+.index-new-head .head-hideMenu i.youjian {
+    font-size: 12px;
+}
+.index-new-head .head-hideMenu i {
+    color: #FF5A5F;
+    margin-right: 5px;
+}
+.index-new-head .head-hideMenu i.ren1, .index-new-head .head-hideMenu i.tuichu {
+    font-size: 16px;
+    margin-right: 15px !important;
+}
+.index-new-head .head-hideMenu i.ren1 {
+    margin-left: 2px;
+}
+.index-new-head .loginStatus>span .round-dot {
+    right: 5px;
+    width: 8px;
+    height: 8px;
+}
+.index-new-head .round-dot {
+    background-color: #FF5A5F;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    position: absolute;
+    display: block;
+    top: 0px;
+	padding:0px;
+	margin-right:2px;
+}
+.index-new-head .head-hideMenu li:hover .round-dot {
+    background-color: #FFFFFF;
+}
+.index-new-head .head-hideMenu li .round-dot {
+    right: 15px;
+	top:10px;
+}
+/*****index****/
+
+.a-index-head .a-i-h-right .a-index-want {
+	border:1px solid #f0f0f0;
+}
+.index-new-row{
+	margin-top:20px;
+	border-bottom:3px solid #FF5A5F;
+	margin-bottom:0px;
+}
+.index-new-fwfl{
+    width: 200px;
+    text-align: center;
+    font-size: 18px;
+	margin-left:0px;
+	color:#fff;
+	font-weight:bold;
+}
+.index-new-row>ul{
+    height: 60px;
+    line-height: 60px;
+    max-width: 1200px;
+    margin: auto;
+}
+.index-new-row>ul>li img {
+	width:40px;
+	height:40px;
+	margin-left:10px;
+}
+.index-new-row>ul>li span {
+	margin-left:50px;
+	color:#FF5A5F;
+	font-size:18px;
+	font-weight:bold;
+	
+}
+.index-new-row>ul>li a {
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #4E5051;
+	}
+	
+.index-new-row>ul>li a:hover{
+	color:#FF5A5F;
+    text-decoration: none;
+}
+.index-new-rmfw-title,.index-new-rmxq-title{
+	border:1px solid #f0f0f0;
+	margin-bottom:0px;
+	padding:10px; 
+	border-bottom:0px;
+}
+.index-new-rmfw-list,.index-new-rmxq-list,.a-qysq,.index-new-wgw,.index-new-xwzx{
+	border:1px solid #f0f0f0; 
+	padding:10px;
+}
+.index-new-fbfw-a{
+	padding:10;
+    font-family: '宋体 Regular', '宋体';
+    font-size: 14px;
+    color: #666666;	
+}
+.index-new-rmfw-remark{
+	margin-top:-60px;
+}
+.index-new-rmfw-remark a{
+	font-family: '微软雅黑 Regular', '微软雅黑';
+    font-size: 16px;
+    color: #FFFFFF;
+}
+.index-new-rmfw-fgx{
+	border:1px solid #FF5A5F; 
+	margin-top:-70px;
+}
+.index-new-rmfw-name{
+	margin-top:-32px;
+}
+.index-new-rmxq-remark a{
+	font-family: '微软雅黑 Bold', '微软雅黑';
+    font-weight: 700;
+    font-size: 16px;
+}
+.a-com-servcename{
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #FF5A5F;
+	padding:5px 10px;
+}
+.index-new-rmxq-name{
+	margin-top:20px;
+	margin-bottom:30px;
+}
+.index-new-rmxq-name div{
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+}
+.a-qysq .a-com-title span,.index-new-wgw .a-com-title span{
+	display:inline-block;
+	margin-top:10px;
+	margin-bottom:40px;
+}
+
+.a-index .a-qysq .a-com-title font a,.a-index .index-new-wgw .a-com-title font a,.a-index .index-new-xwzx .a-com-title font a{
+	font-family: '微软雅黑 Bold', '微软雅黑';
+    font-weight: 700;
+    font-size: 24px;
+    color: #FF5A5F;
+}
+.index-new-qysq-con{
+	padding:10px 20px 50px 20px;
+}
+.a-index .a-qysq .index-new-qysq-con img {
+	border:0px;
+}
+.a-index .index-new-wgw-fgx{
+	margin-top:-20px;
+	margin-bottom:30px;
+}
+.index-new-wgwcon{
+	padding:20px 150px;
+}
+.a-index .index-new-wgw-remark a{
+    font-family: '微软雅黑 Regular', '微软雅黑';
+    font-size: 14px;
+    color: #FFFFFF;
+}
+.a-index .index-new-wgw-remark{
+	margin-top:-40px;
+}
+.a-index .index-new-wgw-fgx2{
+	border:1px solid #FF5A5F;
+	margin-top:-55px;
+}
+.a-index .index-new-title{
+	padding:20px;
+}
+.a-index .index-new-first img{
+    width:100px;
+	height:105px;
+    display: table;
+    background-color: rgb(255, 255, 255);
+    text-align: center;	
+}
+.a-index  .index-new-xwzx-con{
+	padding:20px 30px;
+}
+.a-index  .index-new-xwzx-con ul{
+	width:350px;
+	border:0px;
+	background-color:#fff;
+}
+.a-index  .index-new-xwzx-con .index-new-first{
+	width:100px;
+	margin-right:8px;
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-title{
+	width:230px;
+    font-family: '微软雅黑 Bold', '微软雅黑';
+    font-weight: 700;
+    font-size: 16px;
+	padding-bottom:5px;
+	white-space:nowrap;
+	overflow:hidden;
+	text-overflow:ellipsis; 
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-date{
+	width:70px;
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-content{
+	height:50px;
+	width:230px;
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+}
+.a-index .a-index-head .index-new-left{
+	border-top:3px solid #FF5A5F;
+}
+.a-index .a-index-head{
+	margin-top:5px;
+}
+.a-index-head .index-new-left > ul {
+	background-color:#fff;
+	border-bottom:3px solid #FF5A5F;
+}
+.a-index-head .index-new-left > div {
+	background-color:#fff;
+	color:#FF5A5F;
+	border-bottom:1px solid #ccc;
+	font-size:18px;
+    font-family: '宋体 Regular', '宋体';
+	padding-left:0px;
+}
+.a-index-head .index-new-left > ul > li {
+    font-family: '宋体 Regular', '宋体';
+    font-size: 14px;
+    color: #4E5051;	
+}
+.a-index-head  .a-new-hover {
+    background-color: #f0f0f0;
+    color: #000;
+}
+.a-index-head .a-i-h-left .index-new-zb{
+	float:right;
+	width:20px;
+	height:30px;
+}
+.a-index-head .a-i-h-right .a-com-title-line {
+	border-bottom:1px solid #f0f0f0;
+	width:293px;
+	margin-left:-10px;
+}
+body {
+	background-color:#f0f0f0;
+}
+.a-index-head .a-i-h-right, .a-rmfw,.a-rmxq,.a-qysq,.a-xwzx,.index-new-wgw{
+	background-color:#fff;
+}
+.index-new-top,.index-new-nva{
+	max-width:1349px;
+	margin:auto;
+}
+.index-new-rmxq-list .a-com-ul-block .a-com-last{
+	padding-left:0px;
+}
+.a-index .a-panel .index-new-rmfw-title font a,.a-index .a-panel .index-new-rmxq-title font a{
+	color:#000;
+}
+#one-levelClassify #index-new-qztb{
+	margin-top:-3px;
+}
+.a-index-head .a-i-h-right ul {
+	height:280px;
+	margin-bottom:20px;
+}
+.a-index .a-index-want .a-com-two {
+	margin:20px 5px 40px;
+}
+.a-index .a-qysq-con{
+	width:100%;
+	height:300px;
+	background-color:#E5E3E3;
+	margin-top:-20px;
+}
+.a-index .a-qysq-con ul{
+	padding:50px;
+}
+.a-index .a-qysq-con ul li{
+	width:25%;
+}
+.a-index .a-qysq-con ul li div{
+	margin-bottom:5px;
+}
+.a-index .a-qysq-con ul li img{
+	width:200px; 
+	height:114px;
+}
+.a-index .a-qysq-con .qysq-cpmp-title{
+	padding:10px 0px; 
+	font-size:18px;
+	font-weight:bold;
+}
+.a-index .a-qysq-con .qysq-entname{
+	font-size:14px;
+}
+.a-index a:hover{
+	
+}

BIN=BIN
core/src/web/staticres/images/djz-a.png


BIN=BIN
core/src/web/staticres/images/djz.png


BIN=BIN
core/src/web/staticres/images/flyz-a.png


BIN=BIN
core/src/web/staticres/images/flyz.png


BIN=BIN
core/src/web/staticres/images/rz-a.png


BIN=BIN
core/src/web/staticres/images/rz.png


BIN=BIN
core/src/web/staticres/images/sbzl-a.png


BIN=BIN
core/src/web/staticres/images/sbzl.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-01-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-02-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-03-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-04-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-05-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-06-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-07-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-08-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-09-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-10-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-11-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-12-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-13-new.png


BIN=BIN
core/src/web/staticres/images/serviceclassify-14-new.png


BIN=BIN
core/src/web/staticres/images/u0107.png


BIN=BIN
core/src/web/staticres/images/u1011.png


BIN=BIN
core/src/web/staticres/images/u185.png


BIN=BIN
core/src/web/staticres/images/u230.png


BIN=BIN
core/src/web/staticres/images/u234.png


BIN=BIN
core/src/web/staticres/images/u236.png


BIN=BIN
core/src/web/staticres/images/u2381.png


BIN=BIN
core/src/web/staticres/images/u2401.png


BIN=BIN
core/src/web/staticres/images/u347.png


BIN=BIN
core/src/web/staticres/images/u385.png


BIN=BIN
core/src/web/staticres/images/u4171.png


BIN=BIN
core/src/web/staticres/images/u439.png


BIN=BIN
core/src/web/staticres/images/u445.png


BIN=BIN
core/src/web/staticres/images/u457.png


BIN=BIN
core/src/web/staticres/images/u46.png


BIN=BIN
core/src/web/staticres/images/u467.png


BIN=BIN
core/src/web/staticres/images/u469.png


BIN=BIN
core/src/web/staticres/images/u471.png


BIN=BIN
core/src/web/staticres/images/u473.png


BIN=BIN
core/src/web/staticres/images/wdzx-a.png


BIN=BIN
core/src/web/staticres/images/wdzx.png


BIN=BIN
core/src/web/staticres/images/zcgs-a.png


BIN=BIN
core/src/web/staticres/images/zcgs.png


+ 2 - 2
core/src/web/staticres/js/qfw.js

@@ -467,9 +467,9 @@ function advertAjaxRqe(position){
 					var status = demand[i].status;
 					var html = null;
 					if(status == 1){
-						html = '<span class="a-bg-blue">等待选标</span>';
+						html = '<span><img src="/images/u385.png"/></span>';
 					}else if(status == 2){
-						html = '<span class="a-bg-red">圆满结束</span>';
+						html = '<span><img src="/images/u347.png"/></span>';
 					}else if(status == 3){
 						html = '<span class="a-bg-gray">任务超时</span>';
 					}else if(status == 4){

+ 1 - 0
core/src/web/templates/common/inc.html

@@ -6,6 +6,7 @@
 <link href="/css/bootswatch.min.css" rel="stylesheet">
 <link href="/css/qfw.css" rel="stylesheet">
 <link href="/css/dev-qfw.css" rel="stylesheet">
+<link href="/css/index-new.css" rel="stylesheet">
 <link rel="stylesheet" href="/css/unicorn.main.css" />
 <link rel="stylesheet" href="/css/unicorn.grey.css" />
 <script src="/js/jquery.js"></script>

+ 296 - 0
core/src/web/templates/common/indexhead.html

@@ -0,0 +1,296 @@
+<!---->
+<style>
+</style>
+<div class="index-new-head">
+	<div class="index-new-top">
+		<div>
+			<ul class="pull-right">
+				<li><i class="img-circle glyphicon fuwushichang"></i><a href="/market/0/list.html">服务市场</a></li>
+				<li><i class="img-circle glyphicon jianyu"></i><a href="/front/swordfish">剑鱼</a></li>
+				<li><i class="img-circle glyphicon qiyeshequ"></i><a href="/search/enterprise/ent.html">企业社区</a></li>
+				<li><i class="img-circle glyphicon weiguanwang1"></i><a href="/front/wsite.html">微官网</a></li>
+				<li><i class="img-circle glyphicon zhengcefagui"></i><a href="/front/content_zcfg_list.html">政策法规</a></li>
+			</ul>
+		</div>
+	</div>
+	<div class="index-new-nva">
+		<ul>
+			<li class="index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			<li class="index-new-nva-c a-com-active fwsc"><a href="/front/swordfish">服务市场</a></li>
+			<li class="index-new-nva-c"><a class="setserver"  id="releaseService">发服务</a><a class="index-new-nva-s"></a></li>
+			<li class="index-new-nva-c"><a id="setdemand"  href="/market/demand/add.html">发需求</a></li>
+			
+			<li class="pull-right loginStatus" id="loginStatus"></li>
+			<li class="a-h-search">
+					<div class="input-group">
+				        <div class="input-group-btn hide">
+				        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
+				        </div> <!--/btn-group -->
+						<form method="post" id="searchForm" action="/market/0/list.html">
+							<span><i class="glyphicon sousuo" id="searchFormBtn"></i></span>
+					        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="{{if .T.hotword}}{{.T.hotword}}{{else}}找服务{{end}}">
+							<input type="hidden" name="city" id="city" value="">
+							<input type="hidden" name="cityNo" id="cityNo" value="">
+							<!-- 服务市场 -->
+							<input type="hidden" name="c_searchtype" id="c_searchtype" value="">
+							<input type="hidden" name="c_fwtype" id="c_fwtype" value="">
+							<input type="hidden" name="c_fbtime" id="c_fbtime" value="">
+							<input type="hidden" name="c_rztype" id="c_rztype" value="">
+							<input type="hidden" name="c_xqtype" id="c_xqtype" value="">
+							<input type="hidden" name="c_sorttype" value="">
+							<!-- 企业社区 -->
+							<input type="hidden" name="c_author" id="hauthor" value="">
+							<input type="hidden" name="c_hfl" id="hfl" value="">
+							<input type="hidden" name="c_zb" id="zb" value="">
+						</form>
+		       		</div><!-- /input-group -->
+				<div class="a-h-nav-btn">
+					<img src="/images/nav-btn.png" class="visible-xs-inline" id="nvaBtn">
+				</div>
+			</li>
+		</ul>
+	</div>
+</div>
+<script type="text/javascript">
+//顶部是否加载完毕
+var topLoadOver = false;
+var isMobile = false;
+var keyCode=0;
+document.onkeydown=function(event){
+    var e = event || window.event || arguments.callee.caller.arguments[0];
+    if(e && e.keyCode==13){ // enter 键
+        keyCode=13
+    }
+};
+$(function (){
+	isMobile = !$("#loginStatus").is(":visible");
+	reLoadTop();
+	$("#searchFormBtn").click(function(){
+		keyCode = 13;
+		$("form#searchForm").submit();
+	});
+	$("form#searchForm").submit(function(){
+		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
+		if(input_val==""){
+			input_val = $("#header-searchInput").attr('placeholder');
+		}
+		if (keyCode==13){
+	 		if(input_val==""||input_val=="请输入关键字"){
+				keyCode=0;
+				return false;
+			}else {
+				$("input[name='words']").val(input_val);
+				keyCode=0;
+				return true;
+			}	
+		}
+	});
+	$("#header-searchInput").bind("focus blur",function(){
+		//$(".a-h-search").toggleClass("a-com-focus");
+		$(this).prev("i").toggleClass("text-primary");
+		//$("#loginStatus").toggleClass("hide");
+	});
+	//
+	$("[id='releaseService']").click(function(){
+		if(isLogined){
+			window.location.href = "/front/reurl";
+		}else{
+			loginModalShow(6);
+		}
+	});
+	//手机版
+	$("#nvaBtn").click(function(){
+		if($(this).attr("src") == "/images/nav-btn.png"){
+			$(this).attr("src","/images/nav-btn-a.png");
+		}else{
+			$(this).attr("src","/images/nav-btn.png");
+		}
+		$("#head-navbar").toggleClass("hidden-xs");
+	});
+	$("body").click(function(e){
+		if(isMobile && e.target.id != "head-navbar-ul" && e.target.id != "nvaBtn"){
+			$("#head-navbar").addClass("hidden-xs");
+		}
+	});
+});
+function reLoadTop(){
+	$.ajax({
+	  	type: "POST",
+	  	url: "/front/getWebSiteTop",
+	 	dataType: "json",
+		async: false,
+	  	success: function(result){
+			topLoadOver = true;
+			if(result.status == "y"){
+				isLogined = true;
+				var msgCount = result.msgCount;
+				var hasMsgCount = msgCount > 0;
+				msgCount = msgCount>999?'...':msgCount;
+				var avatar = null;
+				if(avatar != ""){
+					avatar = result.avatar;
+				}
+				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
+				if(hasMsgCount){
+					html += '<a class="round-dot"></a>';
+				}
+				html += '</span><a href="/member/show/memberindex">'+result.nickName+'</a>';
+				html += '<div id="head-hideMenu" class="head-hideMenu"><ul>'
+					    	+'<li onclick="window.location.href=\'/member/msgcenter\'"><i class="glyphicon youjian"></i><span>消息中心';
+				if(hasMsgCount){
+					html += '<a class="round-dot"></a>';
+				}
+				html += '</span></li>'
+						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1">&nbsp;</i>用户中心</li>'
+						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu">&nbsp;</i>退出</li>';
+						+'</ul></div>';
+				$("#loginStatus").html(html)
+				.mouseover(function(){
+					$("#head-hideMenu").show();
+				}).mouseleave(function(){
+					$("#head-hideMenu").hide();
+				});
+				$("#head-hideMenu").mouseover(function(){
+					$(this).show();
+				}).mouseleave(function(){
+					$(this).hide();
+				});
+				//立即体验
+				$("#experience").click(function(){
+					window.location.href = "/member/swordfish/rssset";
+				});
+				$("#goToRssset").click(function(){
+					window.location.href = "/member/swordfish/rssset";
+				});
+				$("#goToInfolist").click(function(){
+					window.location.href = "/member/swordfish/infolist";
+				});
+				//处理公用底部扫码登录按钮
+				$("#bottom-bar>li:first").addClass("invisible");
+				//处理认证完之后第一次登录弹出提示框
+				if(result.auditType == "y"){
+					afterAutheFirstLogin(result);
+				}
+			}else{
+				isLogined = false;
+				var html = '<a onclick="loginModalShow();">登录/注册</a>';
+				$("#loginStatus").html(html);
+				//立即体验
+				$("#experience").click(function(){
+					loginModalShow();
+				});
+				$("#goToRssset").click(function(){
+					loginModalShow(10);
+				});
+				$("#goToInfolist").click(function(){
+					loginModalShow(11);
+				});
+				$("#bottom-bar>li").removeClass("invisible");
+				//登录
+				$("body").append('{{include "/common/login.html"}}');
+			}
+		},
+		error: function(e){
+			topLoadOver = true;
+		}
+	});
+}
+function setNavbarActive(index,type){
+	var searchBtnText = null;
+	var action = null;
+	var value = null;
+	switch(index){
+		case 0:
+			{{if .T.querymap}}
+				value = '{{index .T.querymap "query"}}';
+			{{end}}
+			var hideUl = '<ul class="dropdown-menu f_searchtype">'
+				            +'<li value="service"><a >服务</a></li>'
+				          	+'<li value="demand"><a >需求</a></li>'
+				        +'</ul>';
+			var hideUlObj = $(hideUl);
+			hideUlObj.children("li").click(function(){
+				$("#header-searchBtn font").text($(this).text());
+				try{
+					$("#c_searchtype").val($(this).attr("value"));
+					//changeSearchType($(this).index==0?"service":"demand");
+				}catch(e){}
+			});
+			if(type==2){
+				$("#header-searchBtn font").text("需求");
+				$("#c_searchtype").val("demand");
+			}
+			var c_fwtype={{.T.querymap.c_fwtype}};
+			if (c_fwtype==""){c_fwtype="0"}
+			action = "/market/"+c_fwtype+"/list.html";
+			//设置即时下拉
+			/**
+			$("#header-searchInput,#words").attr("autocomplete","off").keyup(function(){
+				imFind(this)
+			}).focus(function(){
+				imFind(this)
+			})
+			**/
+			$("#header-searchBtn").after(hideUlObj).children(".caret").removeClass("hide");
+			break;
+		case 1:
+			break;
+		case 2:
+			{{if .T.querymap}}
+				value = '{{index .T.querymap "query"}}';
+				$("#city").val('{{index .T.querymap "city"}}')
+				$("#cityNo").val('{{index .T.querymap "cityNo"}}')
+				$("#cityNo").val('{{index .T.querymap "cityNo"}}')
+				$("#hauthor").val('{{index .T.querymap "c_author"}}')
+				$("#hfl").val('{{index .T.querymap "c_hfl"}}')
+				$("#zb").val('{{index .T.querymap "c_zb"}}')
+			{{end}}
+			searchBtnText = "企业社区";
+			//action = "{{.T.uri}}";
+			action = "/search/enterprise/ent.html";
+			//设置即时下拉
+			$("#header-searchInput,#words").attr("autocomplete","off").keyup(function(){
+				imFind(this)
+			}).focus(function(){
+				imFind(this)
+			})
+			$("body").mouseout(function(e){
+				e=e||window.event
+				if(e.target == this){
+					$("#immediately").hide();
+				}
+			});
+			$("body").addClass("qysqPage");
+			break;
+		case 3:
+			searchBtnText = "政策法规";
+			action = "/front/content_zcfg_list.html"	
+			break;
+		case 4:
+			searchBtnText = "新闻资讯";
+			action = "/front/content_qykb_list.html"
+			break;
+	}
+	if(index == 3 || index == 4){
+		$("#header-searchInput").attr("name","query");
+		{{if .T.querymap}}
+			action = '/front/content_{{index .T.querymap "contentType"}}_list.html';
+			value = '{{index .T.querymap "query"}}';
+		{{end}}
+	}
+	if(searchBtnText != null){
+		$("#header-searchBtn font").text(searchBtnText);
+	}
+	if(action != null){
+		$("form#searchForm").attr("action",action);
+	}
+	if(value != null){
+		$("#header-searchInput").val(value);
+	}
+	$("#head-navbar-ul li:first").removeClass("a-com-active");
+	$("#head-navbar-ul li:eq("+index+")").addClass("a-com-active");
+}
+$(function(){
+	reLoadTop();
+});
+</script>

+ 95 - 68
core/src/web/templates/index.html

@@ -5,16 +5,17 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{Msg "seo" "qfw.homepage.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
+
 </head>
 <body>
-{{include "/common/head.html"}}
-<div class="a-content a-index">
+{{include "/common/indexhead.html"}}
+<div class="a-content a-index">	
 	<div class="a-index-head">
-		<div class="a-i-h-left hidden-xs">
-			<div>全部服务分类</div>
+		<div class="a-i-h-left hidden-xs index-new-left">
+			<div class="text-center">全部服务分类</div>
 			<ul id="one-levelClassify">
 			{{range $k, $v := .T.serviceClassify}}
-				<li data-code="{{$v.code}}"><img src="/images/{{$v.image}}" onerror="this.src='/images/u166.png'">{{$v.name}}</li>
+				<li data-code="{{$v.code}}"><img id="index-new-qztb" src="/images/{{$v.image}}" onerror="this.src='/images/u166.png'"> {{$v.name}}<img class="index-new-zb hide" src="/images/u0107.png"/></li>
 			{{end}}
 			</ul>
 		</div>
@@ -49,8 +50,9 @@
 			{{end}}
 		</div>
 		<div class="a-i-h-right">
-			<ul class="a-index-want border-b-0">
+			<ul class="a-index-want">
 				<li class="a-com-title hidden-xs"><b>我要</b></li>
+				<li class="a-com-title-line hidden-xs"></li>
 				<li class="font-size-12 a-com-last" id="iWant">
 					<div>
 						<img src="/images/zcgs.png">
@@ -78,70 +80,49 @@
 					</div>
 				</li>
 			</ul>
-			<ul class="a-index-fwxq">
-				<li class="text-center">
-					<a class="btn btn-primary a-com-first" id="releaseService">发服务</a>
-					<a class="btn btn-primary a-com-last margin-l-15" href="/market/demand/add.html">发需求</a>
-				</li>
-			</ul>
 			<div class="a-index-hd">
 				<b>活动</b>
 			</div>
 		</div>
 	</div>
+	<!--
 	<div class="a-transverse-advert hidden-xs">
 	{{$s:=(Ad "index-center-09" 1)}}
 	{{range $k,$v := $s}}
 		<a{{if $v.s_link}} href="{{$v.s_link}}"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}{{if $v.s_pic}} src="{{$v.s_pic}}"{{end}}></a>
 	{{end}}
 	</div>
-	<div class="a-panel a-rmfw">
-		<div class="a-com-title"><font><a href="/market/0/list.html" target="_blank">热门服务</a></font><span class="hidden-xs">一对一服务,迅速,高效的响应你的需求</span></div>
-		<div class="a-cols row" id="hotService">
+	-->
+	<div class="a-panel a-rmfw" style="margin-bottom:0px;">
+		<div class="a-com-title index-new-rmfw-title" style="margin-bottom:0px;"><font><a href="/market/0/list.html" target="_blank">热门服务</a></font><span class="hidden-xs">一对一服务,迅速,高效的响应你的需求</span><span style="float:right;margin-top:10px;"><a class="index-new-fbfw-a" id="releaseService">发布服务</a>|<a  href="/market/0/list.html" class="index-new-fbfw-a">更多>></a></span></div>
+		<div class="a-cols row index-new-rmfw-list" id="hotService">
 			{{$s:=(Ad "index-center-04" 4)}}
 			{{range $k,$v := $s}}
 			<ul class="a-com-ul-block{{if ge $k 3}} a-com-last{{end}}{{if ge $k 2}} hidden-xs{{end}}" data-id="{{$v.s_id}}">
-				<li class="a-com-first"><a target="_blank"  href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{$v.s_pic}}" onerror="this.src='/images/u166.png'"></a></li>
-				<li class="a-com-title"><div><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
-				<li class="a-com-name"><div>{{$v.o_extend.entName}}</div></li>
-				<li class="a-com-last">评价<font>0</font></li>
+				<li class="a-com-first" 
+				style="background-image:url(/images/u46.png),url(/images/u166.png);background-repeat:no-repeat;background-position:0px 186px,2px 0px;">
+				<a target="_blank"  href="{{$v.s_link}}"></a>
+				</li>
+				<li class="a-com-title index-new-rmfw-remark"><div><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
+				<li class="a-com-name index-new-rmfw-name"><div style="color:#fff;">{{$v.o_extend.entName}}</div></li>
+				<li class="index-new-rmfw-fgx"></li>
 			</ul>
 			{{end}}
 		</div>
 	</div>
-	<div class="row a-rmfw-nav hidden-xs">
-		<div class="col-xs-4">
-			<a target="_blank" class="text-primary" href="/market/010101/list.html"><img src="/images/gs.jpg" onerror="this.src='/images/u206.png'"></a>
-			<span>
-				<div class="a-com-first"><a></a>工商服务</div>
-				<div class="a-com-last"><a target="_blank" class="text-primary" href="/market/010101/list.html">公司注册</a><a target="_blank" class="text-primary" href="/market/010102/list.html" >工商年报</a><a  target="_blank" href="/market/010103/list.html">公司注销</a><a href="/market/010104/list.html">公司变更</a></div>
-			</span>
-		</div>
-		<div class="col-xs-4">
-			<a target="_blank" class="text-primary" href="/market/010201/list.html" ><img src="/images/cw.jpg" onerror="this.src='/images/u206.png'"></a>
-			<span>
-				<div class="a-com-first"><a></a>财务服务</div>
-				<div class="a-com-last"><a target="_blank" class="text-primary" href="/market/010201/list.html" >代理记账</a><a target="_blank" class="text-primary" href="/market/010202/list.html" >财务咨询</a><a target="_blank" class="text-primary"  href="/market/010203/list.html">会计服务</a><a href="/market/010204/list.html">其他咨询</a></div>
-			</span>
-		</div>
-		<div class="col-xs-4 border-r-0">
-			<a target="_blank" href="/market/010301/list.html"><img src="/images/jcrz.jpg" onerror="this.src='/images/u206.png'"></a>
-			<span>
-				<div class="a-com-first"><a></a>检测认证</div>
-				<div class="a-com-last"><a target="_blank" href="/market/010301/list.html">检测服务</a><a class="text-primary" href="/market/010302/list.html">认证</a></div>
-			</span>
-		</div>
-	</div>
+	
 	<div class="a-panel a-rmxq">
-		<div class="a-com-title"><font><a id="indexHotDemand">热门需求</a></font></div>
-		<div class="a-cols row" id="hotDemand">
+		<div class="a-com-title index-new-rmxq-title" style="margin-bottom:0px;border-top:0px;"><font><a id="indexHotDemand">热门需求</a></font><span class="hidden-xs">成为服务商,立刻抢单</span><span style="float:right;margin-top:10px;"><a href="/market/demand/add.html" class="index-new-fbfw-a">发布需求</a>|<a  href="/market/0/list.html" class="index-new-fbfw-a">更多>></a></span></div>
+		<div class="a-cols row index-new-rmxq-list" id="hotDemand">
 			{{$s:=(Ad "index-center-05" 4)}}
 			{{range $k,$v := $s}}
 			<ul class="a-com-ul-block{{if ge $k 3}} a-com-last{{end}}{{if ge $k 2}} hidden-xs{{end}}" data-id="{{$v.s_id}}">
 				<li class="a-com-first"><a target="_blank" href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'"></a></li>
-				<li class="a-com-title"><div><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
-				<li class="a-com-name"><div>{{$v.o_extend.entName}}</div></li>
+				<li class="a-com-title index-new-rmxq-remark"><div><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
+				<li class="a-com-servcename"><div>{{$v.o_extend.type}}</div></li>
 				<li class="a-com-last"></li>
+				<li class="a-com-name index-new-rmxq-name"><div>{{$v.o_extend.entName}}</div></li>
+				
 			</ul>
 			{{end}}
 		</div>
@@ -160,37 +141,53 @@
 	</div>
 	-->
 	<div class="a-panel a-qysq">
-		<div class="a-com-title"><font><a target="_blank" href="/search/enterprise/ent.html">企业社区</a></font><span class="hidden-xs">官方数据来源,提供详尽企业信息,及时掌握企业社会关系情报</span></div>
-		<div class="a-cols row">
+		<div class="a-com-title text-center index-new-title"><font><a target="_blank" href="/search/enterprise/ent.html">企业社区</a></font><br/><span class="hidden-xs">官方数据来源,提供详尽企业信息,及时掌握企业社会关系情报</span></div>
+		<div class="a-cols row index-new-qysq-con">
 			{{$s:=(Ad "index-center-06" 4)}}
 			{{range $k,$v := $s}}
-			<a target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'"></a>
+			<a  target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'"></a>
 			{{end}}
 		</div>
 	</div>
-	<div class="a-panel hidden-xs">
-		<div class="a-com-title"><font><a target="_blank" href="/front/wsite.html">微官网</a></font><span>助力互联网时代,免费打造个性十足炫酷无比的微官网</span></div>
-		<div class="a-cols row">
-			{{$s:=(Ad "index-center-07" 4)}}
+			
+	<div class="a-panel hidden-xs index-new-wgw">
+		<div class="a-com-title text-center index-new-title">
+		<font><a target="_blank" href="/front/wsite.html">微官网</a></font><br/>
+		<span>助力互联网时代,免费打造个性十足炫酷无比的微官网</span></div>
+		<div class="index-new-wgw-fgx text-center">
+		<span> <img src="/images/u4171.png"/></span>
+		<span>案例展示</span>
+		<span><img src="/images/u4171.png"/></span>
+		</div>
+		<div class="a-cols row index-new-wgwcon">
+			{{$s:=(Ad "index-center-07" 6)}}
 			{{range $k,$v := $s}}
 			<ul class="a-com-ul-block{{if ge $k 3}} a-com-last{{end}}">
-				<li class="a-com-first"><a target="_blank" href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'"></a></li>
-				<li class="a-com-title"><div><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
+				<li class="a-com-first" 
+				style="background-image:url(/images/u46.png),url({{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}});background-repeat:no-repeat;background-position:0px 200px,0px 0px;">
+				<a target="_blank"  href="{{$v.s_link}}"></a>
+				</li>
+				<li class="a-com-title index-new-wgw-remark"><div><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
+				<li class="index-new-wgw-fgx2"></li>
+				
 			</ul>
+			{{if ge $k 2}}{{if lt $k 3}}</div><div class="a-cols row index-new-wgwcon">{{end}}{{end}}
 			{{end}}
 		</div>
 	</div>
 	
-	<div class="a-panel a-xwzx">
-		<div class="a-com-title"><font><a target="_blank" href="/front/content_qykb_list.html">新闻资讯</a></font></div>
-		<div class="a-cols row">
+	<div class="a-panel a-xwzx index-new-xwzx">
+		<div class="a-com-title  text-center index-new-title">
+		<font><a target="_blank" href="/front/content_qykb_list.html">新闻资讯</a></font>
+		</div>
+		<div class="a-cols row index-new-xwzx-con">
  			{{range $k,$v:=.T.data}}
- 			{{ if lt $k 4}}
-			<ul class="a-wrap a-com-ul-block{{if ge $k 3}} a-com-last{{end}}{{if ge $k 2}} hidden-xs{{end}}">
-				<li class="a-com-first"><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html"><img  src="{{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}}"  onerror="this.src='/images/u166.png'"></a></li>
-				<li class="a-com-title"><a target="_blank" title="{{index $v "s_title"}}" href="/front/webcontent/{{index $v "_id"}}.html">{{index $v "s_shorttitle"}}</a></li>
-				<li class="a-com-content">{{index $v "s_shortdescription"}}</li>
-				<li class="a-com-date"><span class="pull-right">{{if eq (index $v "releasetime") ""}}{{index $v "l_createdate"}}{{else}}{{index $v "releasetime"}}{{end}}</span></li>
+ 			{{ 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}}>
+				<li class="index-new-first"><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html"><img  src="{{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}}"  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>
+				<li class="index-new-xwzx-date"><span>{{if eq (index $v "releasetime") ""}}{{index $v "l_createdate"}}{{else}}{{index $v "releasetime"}}{{end}}</span></li>
 			</ul>
 			{{end}}
  			{{end}}
@@ -203,6 +200,32 @@ function gomarket(code){
 	$("#c_fwtype").val(code);
 	$("form#searchForm").submit();
 }
+function qysqjj(index){
+	if (index == 0){
+		$("#qysq-con-0").removeClass("hide");
+		$("#qysq-con-1").addClass("hide");
+		$("#qysq-con-2").addClass("hide");
+		$("#qysq-con-3").addClass("hide");
+	}else if(index == 1){
+		$("#qysq-con-0").addClass("hide");
+		$("#qysq-con-1").removeClass("hide");
+		$("#qysq-con-2").addClass("hide");
+		$("#qysq-con-3").addClass("hide");
+		
+	}else if(index == 2){
+		$("#qysq-con-0").addClass("hide");
+		$("#qysq-con-1").addClass("hide");
+		$("#qysq-con-2").removeClass("hide");
+		$("#qysq-con-3").addClass("hide");
+		
+	}else if(index == 3){
+		$("#qysq-con-0").addClass("hide");
+		$("#qysq-con-1").addClass("hide");
+		$("#qysq-con-2").addClass("hide");
+		$("#qysq-con-3").removeClass("hide");
+		
+	}
+}
 $(function(){
 	if(isMobile){
 		var qysqImgMargin = $("#iWant").width()-4;
@@ -288,21 +311,25 @@ $(function(){
 		}
 		activeChildObj.addClass("hide");
 		activeObj = $(this);
-		$(this).removeClass("a-hover");
+		$(this).removeClass("a-new-hover");
+		$(this).find(".index-new-zb").addClass("hide");
 	}).mouseover(function(){
 		var html= '';
 		var code = $(this).attr('data-code');
 		activeChildObj = $("#"+code);
 		activeChildObj.removeClass("hide");
 		activeObj = $(this);
-		$(this).addClass("a-hover");
+		$(this).addClass("a-new-hover");
+		$(this).find(".index-new-zb").removeClass("hide");
 	});
 	$(".a-i-h-middle>ul").mouseleave(function(){
 		$(this).addClass("hide");
-		activeObj.removeClass("a-hover");
+		activeObj.removeClass("a-new-hover");
+		$(this).find(".index-new-zb").addClass("hide");
 	}).mouseover(function(){
 		$(this).removeClass("hide");
-		activeObj.addClass("a-hover");
+		activeObj.addClass("a-new-hover");
+		$(this).find(".index-new-zb").removeClass("hide");
 	});
 	//
 	adjustLayout();