فهرست منبع

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

wangchuanjin 9 سال پیش
والد
کامیت
54b7e1600a
3فایلهای تغییر یافته به همراه30 افزوده شده و 21 حذف شده
  1. 4 0
      core/src/seo.json
  2. 1 2
      core/src/timetask.json
  3. 25 19
      core/src/web/templates/index.html

+ 4 - 0
core/src/seo.json

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

+ 1 - 2
core/src/timetask.json

@@ -1,2 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-01 14:14:58"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-01 14:14:58"}},"marketisstart":true,"marketrate":300}
-
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-29 17:31:40"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-29 17:31:40"}},"marketisstart":true,"marketrate":300}

+ 25 - 19
core/src/web/templates/index.html

@@ -5,8 +5,14 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{Msg "seo" "qfw.homepage.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
+<<<<<<< HEAD
+<link href="{{Msg "seo" "cdn"}}/css/index-new.css" rel="stylesheet">
+<script src="{{Msg "seo" "cdn"}}/js/jquery.lazyload.min.js"></script>
+
+=======
 <link href="/css/index-new.css" rel="stylesheet">
 <script src="/js/jquery.lazyload.min.js"></script>
+>>>>>>> c5f3e54ed147936d13ef9e733fff8e006b11d01f
 </head>
 <body>
 {{include "/common/indexhead.html"}}
@@ -16,7 +22,7 @@
 			<div class="text-center">全部服务分类</div>
 			<ul id="one-levelClassify">
 			{{range $k, $v := .T.serviceClassify}}
-				<li data-code="{{$v.code}}"><img class="lazy" data-original="/images/{{$v.image}}" id="index-new-qztb" onerror="this.src='/images/u166.png'"> {{$v.name}}<img  data-original='/images/u0107.png' class="lazy index-new-zb hide" /></li>
+				<li data-code="{{$v.code}}"><img class="lazy" data-original="{{Msg "seo" "cdn"}}/images/{{$v.image}}" id="index-new-qztb" onerror="this.src='{{Msg "seo" "cdn"}}/images/u166.png'"> {{$v.name}}<img  data-original='{{Msg "seo" "cdn"}}/images/u0107.png' class="lazy index-new-zb hide" /></li>
 			{{end}}
 			</ul>
 		</div>
@@ -35,7 +41,7 @@
 					{{range $k,$v := $s}}
 					 <div class="item{{if eq $k 0}} active{{end}}">
 					{{if $v.s_link}}<a href="{{$v.s_link}}">{{end}}
-				         <img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}   src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" class="img-responsive"   onerror="this.src='/images/u166.png'">
+				         <img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}   src="{{Msg "seo" "cdn"}}{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" class="img-responsive"   onerror="this.src='{{Msg "seo" "cdn"}}/images/u166.png'">
 					{{if $v.s_link}}</a>{{end}}
 					</div>
 					{{end}}
@@ -122,7 +128,7 @@
 			{{range $k,$v := $s}}
 			<div class="index-new-rmxq-listcon" style="{{if gt $k 0}} border-left:1px solid #E5E6E9; {{end}}"  data-id="{{$v.s_id}}">
 			<a target="_blank"  href="{{$v.s_link}}"></a>
-			<div class="index-new-rmxq-listimg text-center"><a target="_blank" href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"   onerror="this.src='/images/u166.png'"></a></div>
+			<div class="index-new-rmxq-listimg text-center"><a target="_blank" href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{Msg "seo" "cdn"}}{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"   onerror="this.src='{{Msg "seo" "cdn"}}/images/u166.png'"></a></div>
 			<div class="text-center index-new-rmxq-remark"><span><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></span></div>
 			<div class="index-new-rmxq-listtype text-center"><span><a class="a-com-servcename">{{$v.o_extend.type}}</a></span></div>
 			<div class="index-new-rmxq-listas text-center "><span><a class="a-com-last" ></a></span></div>
@@ -135,7 +141,7 @@
 	<div class="a-transverse-advert hidden-xs">
 	{{$s:=(Ad "index-center-10" 1)}}
 	{{range $k,$v := $s}}
-		<a target="_blank" {{if $v.s_link}} href="{{$v.s_link}}"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}{{if $v.s_pic}} data-original="{{$v.s_pic}}" class="lazy" {{end}}></a>
+		<a target="_blank" {{if $v.s_link}} href="{{$v.s_link}}"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}{{if $v.s_pic}} data-original="{{Msg "seo" "cdn"}}{{$v.s_pic}}" class="lazy" {{end}}></a>
 	{{end}}
 	</div>
 <!--
@@ -151,7 +157,7 @@
 			{{$s:=(Ad "index-center-06" 4)}}
 			{{range $k,$v := $s}}
 			<div class="index-new-qysqlist text-center"  style="{{if gt $k 0}} border-left:1px solid #E5E6E9; {{end}}">
-			<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}}  data-original="{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"  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}}  data-original="{{Msg "seo" "cdn"}}{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"  onerror="this.src='{{Msg "seo" "cdn"}}/images/u166.png'"></a>
 			</div>
 			{{end}}
 		</div>
@@ -162,9 +168,9 @@
 		<font><a target="_blank" href="/front/wsite.html">微官网</a></font><br/>
 		<span>助力互联网时代,免费打造个性十足炫酷无比的微官网</span></div>
 		<div class="index-new-wgw-fgx text-center">
-		<span> <img  data-original="/images/u4171.png" class="lazy" /></span>
+		<span> <img  data-original="{{Msg "seo" "cdn"}}/images/u4171.png" class="lazy" /></span>
 		<span>案例展示</span>
-		<span><img  data-original="/images/u4171.png" class="lazy" /></span>
+		<span><img  data-original="{{Msg "seo" "cdn"}}/images/u4171.png" class="lazy" /></span>
 		</div>
 		<div class="row index-new-wgwcon text-center">
 			{{$s:=(Ad "index-center-07" 6)}}
@@ -192,7 +198,7 @@
  			{{range $k,$v:=.T.data}}
  			{{ if lt $k 3}}
 			<ul class="a-wrap a-com-ul-block{{if ge $k 3}} a-com-last{{end}}{{if ge $k 2}} hidden-xs{{end}}" {{if lt $k 2}} style="border-right:1px solid #e5e6e9;padding-bottom:0px;"{{end}}>
-				<li class="index-new-first"><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html"><img  data-original="{{if $v.s_pic1}}{{if eq (index $v "s_pic1") ""}}{{index $v "s_pic"}}{{else}}{{index $v "s_pic1"}}{{end}}{{else}}{{index $v "s_pic"}}{{end}}" class="lazy"   onerror="this.src='/images/u166.png'"></a></li>
+				<li class="index-new-first"><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html"><img  data-original="{{Msg "seo" "cdn"}}{{if $v.s_pic1}}{{if eq (index $v "s_pic1") ""}}{{index $v "s_pic"}}{{else}}{{index $v "s_pic1"}}{{end}}{{else}}{{index $v "s_pic"}}{{end}}" class="lazy"   onerror="this.src='{{Msg "seo" "cdn"}}/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>
@@ -206,9 +212,9 @@
 		<div class="col-sm-1 index-new-tg-tb">
 		<ul>
 		<li>
-		<div class="bmzhsk"><img src="/images/u0115.png"/></div>
-		<div class="bmjy"><img src="/images/u0117.png"/></div>
-		<div class="bmrzqy"><img src="/images/u0119.png"/></div>
+		<div class="bmzhsk"><img src="{{Msg "seo" "cdn"}}/images/u0115.png"/></div>
+		<div class="bmjy"><img src="{{Msg "seo" "cdn"}}/images/u0117.png"/></div>
+		<div class="bmrzqy"><img src="{{Msg "seo" "cdn"}}/images/u0119.png"/></div>
 		</li>
 		<li class="index-new-mingcheng"><div class="text-center" style="height: 119px;">知识库</div></li>
 		</ul>
@@ -241,9 +247,9 @@
 		<div class="col-sm-1 index-new-tg-tb">
 		<ul>
 		<li>
-		<div class="bmzhsk"><img src="/images/u0116.png"/></div>
-		<div class="bmjy"><img src="/images/u0118.png"/></div>
-		<div class="bmrzqy"><img src="/images/u0119.png"/></div>
+		<div class="bmzhsk"><img src="{{Msg "seo" "cdn"}}/images/u0116.png"/></div>
+		<div class="bmjy"><img src="{{Msg "seo" "cdn"}}/images/u0118.png"/></div>
+		<div class="bmrzqy"><img src="{{Msg "seo" "cdn"}}/images/u0119.png"/></div>
 		</li>
 		<li class="index-new-mingcheng1"><div class="text-center" style="padding-top:35px;">剑鱼</div></li>
 		</ul>
@@ -276,9 +282,9 @@
 		<div class="col-sm-1 index-new-tg-tb">
 		<ul>
 		<li>
-		<div class="bmzhsk"><img src="/images/u0116.png"/></div>
-		<div class="bmjy"><img src="/images/u0117.png"/></div>
-		<div class="bmrzqy"><img src="/images/u0120.png"/></div>
+		<div class="bmzhsk"><img src="{{Msg "seo" "cdn"}}/images/u0116.png"/></div>
+		<div class="bmjy"><img src="{{Msg "seo" "cdn"}}/images/u0117.png"/></div>
+		<div class="bmrzqy"><img src="{{Msg "seo" "cdn"}}/images/u0120.png"/></div>
 		</li>
 		<li class="index-new-mingcheng2"><div class="text-center" style="padding-top:15px;">认证企业</div></li>
 		</ul>
@@ -407,7 +413,7 @@ $(function(){
 	}else{
 		//活动处理
 		if(hasNewActive){
-			$(".a-index-hd").append('<img src="/images/activeimages/chjhd.png" onclick="window.open(\'/front/webactivitycontent/56986e31af53740ecf000001.html\')" class="cursor-pointer">');
+			$(".a-index-hd").append('<img src="{{Msg "seo" "cdn"}}/images/activeimages/chjhd.png" onclick="window.open(\'/front/webactivitycontent/56986e31af53740ecf000001.html\')" class="cursor-pointer">');
 			/*扫码送红包活动
 			$(".a-index-hd").append('<img src="/images/smshb.png" onclick="window.open(\'/p\')" class="cursor-pointer"><div class="smshb"><ul id="hd-smshb" class="text-center"></ul></div>');
 			$.post("/front/showAmount",null,function(r){
@@ -432,7 +438,7 @@ $(function(){
 				},4000);
 			});*/
 		}else{
-			$(".a-index-hd").append('<a href="http://3.ihenan.com" target="_blank"><img src="/images/hlwdh.png"></a>');
+			$(".a-index-hd").append('<a href="http://3.ihenan.com" target="_blank"><img src="{{Msg "seo" "cdn"}}/images/hlwdh.png"></a>');
 		}
 		var oldImgSrc = null;
 		$("#iWant>div").mouseover(function(){