pc

src/jfw/front/structedData.go

@@ -52,7 +52,7 @@ func (t *StructedData) VerifyCode() {
 					status = true
 					SMVerifySucess := t.GetSession("SMVerifySucess")
 					//需验证邮箱
-					if !SMVerifySucess.(bool) {
+					if SMVerifySucess != nil && !SMVerifySucess.(bool) {
 						//验证码
 						verifyStr := t.GetSession("DataSMVerify")
 						//是否超时
@@ -93,7 +93,7 @@ func (t *StructedData) FreeSamples() error {
 			phone_num := t.GetString("phone_num")            //手机号
 			s_email := t.GetString("s_email")                //邮箱
 			SMVerifySucess := t.GetSession("SMVerifySucess") //邮箱是否验证成功
-			if name != "" && phone_num != "" && s_email != "" && SMVerifySucess.(bool) {
+			if name != "" && phone_num != "" && s_email != "" && SMVerifySucess != nil && SMVerifySucess.(bool) {
 				count := public.Mysql.Count("structed_data", map[string]interface{}{
 					"name":  name,
 					"phone": phone_num,
@@ -150,6 +150,7 @@ func (t *StructedData) Pc_info() error {
 			t.T["s_myemail"] = (*nums)["s_myemail"].(string)
 			//验证是否是绑定的邮箱
 			t.SetSession("DataSMVerifyEmail", (*nums)["s_myemail"].(string))
+			t.SetSession("SMVerifySucess", true)
 		}
 		return t.Render("/structuredata/pc/info.html", &t.T)
 	} else {
@@ -164,20 +165,20 @@ func (t *StructedData) Pc_index() error {
 }
 func (t *StructedData) Index() error {
 	t.T["source"] = "wx_sy_dh_4"
-	return t.Render("/structuredata/marketing_wx.html", &t.T)
+	return t.Render("/structuredata/mobile/marketing_wx.html", &t.T)
 }
 
 //信息填写
 func (t *StructedData) WriteInfo() error {
-	return t.Render("/structuredata/write_info.html")
+	return t.Render("/structuredata/mobile/write_info.html")
 }
 
 //结构化数据预览
 func (t *StructedData) GetPreview() error {
-	return t.Render("/structuredata/preview.html")
+	return t.Render("/structuredata/mobile/preview.html")
 }
 func (t *StructedData) Success() error {
-	return t.Render("/structuredata/write_result.html")
+	return t.Render("/structuredata/mobile/write_result.html")
 }
 func (t *StructedData) CheckUser() error {
 	userId := util.ObjToString(t.GetSession("userId"))
@@ -193,8 +194,9 @@ func (t *StructedData) CheckUser() error {
 			t.T["s_myemail"] = (*nums)["s_myemail"].(string)
 			//验证是否是绑定的邮箱
 			t.SetSession("DataSMVerifyEmail", (*nums)["s_myemail"].(string))
+			t.SetSession("SMVerifySucess", true)
 		}
-		return t.Render("/structuredata/write_infor_wx.html", &t.T)
+		return t.Render("/structuredata/mobile/write_infor_wx.html", &t.T)
 	} else {
 		return t.Redirect("/swordfish/about?source=open_infocontent&o=-130")
 	}

src/jfw/modules/app/src/app/front/login.go

@@ -713,11 +713,16 @@ func (l *Login) AfterPageLoadToCheck() {
 		updateflag = false
 		userid, _ := l.GetSession("userId").(string)
 		if userid != "" {
-			channel, _ := mongodb.FindOne("jyapp_channel", `{"s_userid":"`+userid+`"}`)
-			gray_str := redis.GetStr("session", "grayusers_"+userid)
-			if channel != nil && qutil.ObjToString((*channel)["s_channel"]) == gray_str {
-				updateflag = true
+			gray_str, err := redis.Exists("session", "grayusers_"+userid)
+			if err == nil {
+				updateflag = gray_str
 			}
+			//不再验证下载渠道（因为渠道更新不及时，导致灰色发布人数有差异）
+			// channel, _ := mongodb.FindOne("jyapp_channel", `{"s_userid":"`+userid+`"}`)
+			// gray_str := redis.GetStr("session", "grayusers_"+userid)
+			// if channel != nil && qutil.ObjToString((*channel)["s_channel"]) == gray_str {
+			// 	updateflag = true
+			// }
 		}
 	}
 	l.ServeJson(map[string]interface{}{

src/jfw/modules/app/src/app/front/me.go

@@ -205,6 +205,7 @@ func (l *Me) CheckUpdate() error {
 		updata["userflag"] = false
 		u, s := analySign("", usertoken)
 		if s == 1 {
+			//不再验证下载渠道（因为渠道更新不及时，导致灰色发布人数有差异）
 			gray_str, err := redis.Exists("session", "grayusers_"+u.UserId)
 			if err == nil {
 				updata["userflag"] = gray_str

src/jfw/modules/app/src/app/front/structedData.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/go-xweb/xweb"
+	"gopkg.in/mgo.v2/bson"
 )
 
 type StructedData struct {
@@ -49,7 +50,7 @@ func (t *StructedData) VerifyCode() {
 					status = true
 					SMVerifySucess := t.GetSession("SMVerifySucess")
 					//需验证邮箱
-					if !SMVerifySucess.(bool) {
+					if SMVerifySucess != nil && !SMVerifySucess.(bool) {
 						//验证码
 						verifyStr := t.GetSession("DataSMVerify")
 						//是否超时
@@ -90,7 +91,7 @@ func (t *StructedData) FreeSamples() error {
 			phone_num := t.GetString("phone_num")            //手机号
 			s_email := t.GetString("s_email")                //邮箱
 			SMVerifySucess := t.GetSession("SMVerifySucess") //邮箱是否验证成功
-			if name != "" && phone_num != "" && s_email != "" && SMVerifySucess.(bool) {
+			if name != "" && phone_num != "" && s_email != "" && SMVerifySucess != nil && SMVerifySucess.(bool) {
 				count := public.Mysql.Count("structed_data", map[string]interface{}{
 					"name":  name,
 					"phone": phone_num,
@@ -225,7 +226,25 @@ func (t *StructedData) Index() error {
 
 //信息填写
 func (t *StructedData) WriteInfo() error {
-	return t.Render("/structeddata/write_infor.html")
+	userId := util.ObjToString(t.GetSession("userId"))
+	if userId != "" {
+		nums, ok := public.MQFW.FindOne("user", bson.M{"_id": bson.ObjectIdHex(userId)})
+		if !ok {
+			return t.Redirect("/jyapp/free/swordfish/about", 302)
+		}
+		if _, ok := (*nums)["s_phone"]; ok {
+			t.T["phone_num"] = (*nums)["s_phone"].(string)
+		}
+		if _, ok := (*nums)["s_myemail"]; ok {
+			t.T["s_myemail"] = (*nums)["s_myemail"].(string)
+			//验证是否是绑定的邮箱
+			t.SetSession("DataSMVerifyEmail", (*nums)["s_myemail"].(string))
+			t.SetSession("SMVerifySucess", true)
+		}
+		return t.Render("/structeddata/write_infor.html", &t.T)
+	} else {
+		return t.Redirect("/jyapp/free/swordfish/about", 302)
+	}
 }
 
 func (t *StructedData) Success() error {

src/jfw/modules/app/src/web/staticres/jyapp/structuredata/css/base.css

@@ -123,7 +123,8 @@ em,i{
   .jy-app-header .fanhui {
     width: 0.48rem;
     height: 0.48rem;
-    font-size: 0.36rem;
+/*    font-size: 0.36rem;*/
+font-size:19.5px;
   }
   
   .jy-app-header .subreport_title {

src/jfw/modules/app/src/web/staticres/jyapp/structuredata/css/marketing.css

@@ -547,8 +547,9 @@ body {
 .jy-app-header.header-transparent .fanhui {
   width: 0.96rem;
   height: 0.96rem;
-  font-size: 0.36rem;
+/*  font-size: 0.36rem;*/
   color: #fff;
+font-size:19.5px;
 }
 
 #app .j-button-group .j-button-confirm,

src/jfw/modules/app/src/web/templates/structeddata/marketing.html

@@ -11,19 +11,37 @@
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<title>结构化招标数据</title>
+	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
+  <link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	<link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/css/base.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/css/weui.min.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/css/marketing.css?v={{Msg "seo" "version"}}">
+  <style>
+    .app-layout-header{
+      border-bottom: 0px!important;
+    }
+    .header-transparent>.app-back{
+      color:#fff !important;
+    }
+    .jy-app-header .subreport_title{
+      font-size:17px;
+    }
+  </style>
 </head>
 
 <body>
+<div class="app-layout-header jy-app-header header-transparent">
+	<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+  <span class="subreport_title">结构化招标数据</span>
+</div>
+<div class="app-layout-content-b">
 	<div id="app">
 		<!-- 头部 -->
-		<header class="jy-app-header header-transparent">
+<!--		<header class="jy-app-header header-transparent">
 			<div class="iconfont icon-fanhui fanhui"></div>
 			<div class="subreport_title">结构化招标数据</div>
-		</header>
+		</header>-->
 		<div class="j-main">
 			<div class="structured_top">
 				<div class="str_title">
@@ -193,6 +211,7 @@
 			<button class="j-button-confirm" id="j_confirm" onclick="learn_more()">深入了解</button>
 		</div>
 	</div>
+</div>
 </body>
 <script src="/jyapp/structuredata/js/jquery.min.js"></script>
 <script src="/jyapp/structuredata/js/weui.min.js"></script>

src/jfw/modules/app/src/web/templates/structeddata/write_infor.html

@@ -9,19 +9,31 @@
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
         <title>结构化招标数据</title>
+        <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
+        <link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
         <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/js/rem.js?v={{Msg "seo" "version"}}"></script>
         <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/css/base.css?v={{Msg "seo" "version"}}">
         <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/css/weui.min.css?v={{Msg "seo" "version"}}">
         <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
         <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/structuredata/css/write_infor.css?v={{Msg "seo" "version"}}111">
+        <style>
+          .jy-app-header .subreport_title{
+            font-size:17px;
+          }
+        </style>
     </head>
 <body>
+<div class="app-layout-header jy-app-header">
+	<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+  <span class="subreport_title">深入了解</span>
+</div>
+<div class="app-layout-content-b">
     <div id="writeInfo">
-        <div class="j-header jy-app-header">
-            <i class="header-left iconfont icon-fanhui" style="font-size: 0.36rem" onclick="fanhui()"></i>
+<!--        <div class="j-header jy-app-header">
+            <i class="header-left iconfont icon-fanhui" style="font-size:19.5px;" onclick="fanhui()"></i>
             <span class="header-title">结构化招标数据</span>
             <span class="header-right"></span>
-        </div>
+        </div>-->
         <div class="weui-tab" id="tab">
             <div class="weui-navbar">
                 <div class="weui-navbar__item">免费样例
@@ -58,7 +70,7 @@
                             <div class="write_phone">
                                 <div class="write_phone_ipt">
                                     <span class="label_phone">手机号</span>
-                                    <input class="ipt_phone" type="text" placeholder="输入手机号">
+                                    <input class="ipt_phone" type="text" maxlength="11" placeholder="输入手机号" value="{{.T.phone_num}}">
                                 </div>
                                 <div class="phone_tips" style="display: none;">
                                     <span class="label_tips"></span>
@@ -70,7 +82,7 @@
                             <div class="write_email">
                                 <div class="write_phone_ipt">
                                     <span class="label_phone">邮箱地址</span>
-                                    <input class="ipt_email" type="text" placeholder="输入邮箱地址">
+                                    <input class="ipt_email" type="text" placeholder="输入邮箱地址" value="{{.T.s_myemail}}">
                                 </div>
                                 <div class="email_tips" style="display: none;">
                                     <span class="label_tips"></span>
@@ -116,7 +128,7 @@
                             <div class="write_phone">
                                 <div class="write_phone_ipt">
                                     <span class="label_phone">手机号</span>
-                                    <input class="ipt_phone" type="text" placeholder="输入手机号">
+                                    <input class="ipt_phone" type="text" maxlength="11" placeholder="输入手机号" value="{{.T.phone_num}}">
                                 </div>
                                 <div class="phone_tips" style="display: none;">
                                     <span class="label_tips"></span>
@@ -143,14 +155,27 @@
             </div>
         </div>
     </div>
+</div>
 </body>
 <script src="/jyapp/structuredata/js/jquery.min.js"></script>
 <script src="/jyapp/structuredata/js/weui.min.js"></script>
+{{include "/common/js.html"}}
 <script>
 var issubmit = ["false","false"]
 var isfreesubmit = ["false","false","false","false"]
 
 $(function(){
+  if ({{.T.s_myemail}}!=""&&{{.T.s_myemail}}!=null){
+      $('.email_code').slideUp();
+      isfreesubmit[2] = 'true';
+      isfreesubmit[3] = 'true';
+      freesubmit();
+  }
+  if ({{.T.phone_num}}!=""&&{{.T.phone_num}}!=null){
+      isfreesubmit[1] = 'true';
+      issubmit[1]="true"
+      freesubmit();
+  }
   $(".write_run_now").on("click",function(){
     window.location.href="/jyapp/front/dataExport/toSieve?from=structed"
   })
@@ -165,14 +190,11 @@ $(function(){
   $('.mf .ipt_name').on('input', function() {
       var namerule =  isname(this.value)
       if(namerule){
-          issubmit[0] = "false"
           isfreesubmit[0] = 'false'
       }else{
-          issubmit[0] = "true"
           isfreesubmit[0] = 'true'
       }
       console.log(issubmit)
-      submit()
       freesubmit()
   })
   
@@ -181,14 +203,11 @@ $(function(){
       var phonerule = isPoneAvailable(this.value)
       if(phonerule){
           $('.phone_tips').css('display','none')
-          issubmit[1] = "true"
           isfreesubmit[1] = 'true'
       }else{
           $('.phone_tips').css('display','flex')
-          issubmit[1] = "false"
           isfreesubmit[1] = 'false'
       }
-      submit()
       freesubmit()
   })
 
@@ -196,9 +215,14 @@ $(function(){
   $('.mf .ipt_email').on('input', function() {
       var emailrule = isAvailableEmail(this.value)
       if(emailrule){
+          if (this.value=={{.T.s_myemail}}){
+            $('.email_code').slideUp()
+            isfreesubmit[3] = 'true'
+          }else{
+            $('.email_code').slideDown()
+          }
           $('.email_tips').hide()
           isfreesubmit[2] = 'true'
-          $('.email_code').slideDown()
       }else{
           $('.email_tips').css('display','flex')
           isfreesubmit[2] = 'false'
@@ -261,7 +285,7 @@ $(function(){
                   weui.toast('保存成功', {
                     duration: 1500,
                     callback:function(){
-                        history.go(-1)
+                         window.location.href = "/jyapp/structed/success"
                     }
                   });
               }else{
@@ -279,14 +303,10 @@ $(function(){
       var namerule =  isname(this.value)
       if(namerule){
           issubmit[0] = "false"
-          isfreesubmit[0] = 'false'
       }else{
           issubmit[0] = "true"
-          isfreesubmit[0] = 'true'
       }
-      console.log(issubmit)
       submit()
-      freesubmit()
   })
   
   // 手机号输入事件
@@ -295,14 +315,11 @@ $(function(){
       if(phonerule){
           $('.phone_tips').css('display','none')
           issubmit[1] = "true"
-          isfreesubmit[1] = 'true'
       }else{
           $('.phone_tips').css('display','flex')
           issubmit[1] = "false"
-          isfreesubmit[1] = 'false'
       }
       submit()
-      freesubmit()
   })
   // 立即提交
   $('.run_button').on('click', function() {
@@ -321,7 +338,7 @@ $(function(){
                 weui.toast('保存成功', {
                     duration: 1500,
                     callback:function(){
-                        history.go(-1)
+                         window.location.href = "/jyapp/structed/success"
                     }
                 });
               }else{

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -430,7 +430,7 @@
 								</li>
 								<li>
 									<div id="dqbtn" style="width:7em;position:relative;float:left;" data-value="拟建">拟建项目</div>
-									<div class="jy_sprite_main sprite_q-mark q-mark" style="float:left;"></div>
+									<div class="jy_sprite_main sprite_q-mark q-mark" style=""></div>
 <!--									<img style="float:left;" class="q-mark" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wx/q-mark.png?v={{Msg "seo" "version"}}"/>-->
 									<button class="btn hidden" style="clear:both;">拟建</button>
 								</li>

src/jfw/public/structed.go

@@ -10,7 +10,7 @@ import (
 
 func SendStructedDataByEmail(email string, auth []*mail.GmailAuth) bool {
 	var uploadAddress = config.Sysconfig["webdomain"].(string) + config.Seoconfig["structedUploadA"].(string)
-	var imagesAddress = config.Sysconfig["webdomain"].(string) + "/structuredata/image/emaillogo.png"
+	var imagesAddress = config.Sysconfig["webdomain"].(string) + "/structuredata/mobile/image/emaillogo.png"
 	var feedbackAddress = "mailto:bd@topnet.net.cn"
 
 	if isEmail(email) {

src/web/staticres/js/public-nav.js

@@ -9,7 +9,7 @@ $(function () {
 		    $thisWidth = $(this).width(),
 		    //当前宽度
 		$thisIndex = $(this).index();
-		if((typeof(myPageNavIsNormal)!="undefined"&&myPageNavIsNormal==true)||$href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("article/mailprivate")>-1||$href.indexOf("article/bdcontent")>-1||$href.indexOf("/jypc/toPushView")>-1||$href.indexOf("/jyblog")>-1||$href.indexOf("/dataExport")>-1||$href.indexOf("/front/dataService.html")>-1||$href.indexOf("/front/course")>-1||$href.indexOf("/front/dataexport")>-1||$href.indexOf("/orderPay")>-1){
+		if((typeof(myPageNavIsNormal)!="undefined"&&myPageNavIsNormal==true)||$href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("article/mailprivate")>-1||$href.indexOf("article/bdcontent")>-1||$href.indexOf("/jypc/toPushView")>-1||$href.indexOf("/jyblog")>-1||$href.indexOf("/dataExport")>-1||$href.indexOf("/front/dataService.html")>-1||$href.indexOf("/front/course")>-1||$href.indexOf("/front/dataexport")>-1||$href.indexOf("/orderPay")>-1||$href.indexOf("structed/")>-1){
             $navLi.find("a:not(.link)").css({"color":"#252627"});
 		}else{
 			$navLi.find("a:not(.link)").css({"color":"#fff"});
@@ -54,7 +54,7 @@ function seclectNavLi(el, $index) {
 	var $slider = $(".public-nav .jynav .slider");
 	/*获取当前这个元素的css*/
 	var $thisCss = el.eq($index).width();
-	if((typeof(myPageNavIsNormal)!="undefined"&&myPageNavIsNormal==true)||$href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("article/mailprivate")>-1||$href.indexOf("article/bdcontent")>-1||$href.indexOf("/jyblog")>-1||$href.indexOf("/dataExport")>-1||$href.indexOf("/front/dataService.html")>-1||$href.indexOf("/front/course")>-1||$href.indexOf("/front/dataexport")>-1||$href.indexOf("/orderPay")>-1){
+	if((typeof(myPageNavIsNormal)!="undefined"&&myPageNavIsNormal==true)||$href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("article/mailprivate")>-1||$href.indexOf("article/bdcontent")>-1||$href.indexOf("/jyblog")>-1||$href.indexOf("/dataExport")>-1||$href.indexOf("/front/dataService.html")>-1||$href.indexOf("/front/course")>-1||$href.indexOf("/front/dataexport")>-1||$href.indexOf("/orderPay")>-1||$href.indexOf("structed/")>-1){
         el.find("a:not(.link)").css({"color":"#252627"});
 	}else{
 		el.find("a:not(.link)").css({"color":"#fff"});

src/web/staticres/structuredata/pc/css/reset_pc.css

@@ -0,0 +1,76 @@
+html, body, div, span, applet, object, iframe, 
+h1, h2, h3, h4, h5, h6, p, blockquote, pre, 
+a, abbr, acronym, address, big, cite, code, 
+del, dfn, em, font, img, ins, kbd, q, s, samp, 
+small, strike, strong, sub, sup, tt, var, 
+dl, dt, dd, ol, ul, li, 
+fieldset, form, label, legend, 
+table, caption, tbody, tfoot, thead, tr, th, td { 
+margin: 0; 
+padding: 0; 
+border: 0; 
+outline: 0; 
+font-weight: inherit; 
+font-style: inherit; 
+font-size: 100%; 
+font-family: inherit; 
+vertical-align: baseline; 
+-webkit-tap-highlight-color: transparent;
+} 
+:focus { 
+outline: 0; 
+} 
+body { 
+/*line-height: 1; */
+/*color: black; 
+background: white; */
+font-family: "Microsoft YaHei",sans-serif;
+font-size: 16px;
+-webkit-font-smoothing: antialiased;
+} 
+input{
+	font-family: "Microsoft YaHei",sans-serif;
+	-webkit-appearance: none;
+}
+ol, ul { 
+list-style: none; 
+} 
+button{ 
+	outline: none;border: none;
+	}
+table { 
+border-collapse: separate; 
+border-spacing: 0; 
+} 
+caption, th, td { 
+text-align: left; 
+font-weight: normal; 
+} 
+textarea { resize:none;-webkit-appearance: none; }
+img{border:0;}
+a{
+	text-decoration:none;
+	color: #000;
+	font-size: 14px;
+}
+/*selet 下拉三角改变*/
+/*select {border: none;border-radius: 0;appearance:none;-moz-appearance:none;-webkit-appearance:none;background:#ffffff url(../images/public-img/pub-Xsj.png) no-repeat 95% center;}*/
+/*清除ie的默认选择框样式清除，隐藏下拉箭头*/
+/*select::-ms-expand { display: none;}
+html{-webkit-text-size-adjust: none;}	*/	
+	
+/*a:link {color:#606060;} 
+a:visited {color:#606060;} 
+a:hover{color:#8cb91e;	text-decoration: underline;}
+a:active {color:#606060;}*/
+address,caption,cite,code,dfn,em,th,b,i {font-weight: normal;font-style: normal;}
+
+.clearfix:after {visibility: hidden; display: block; font-size: 0; content: " "; clear: both; height: 0; }
+.clearfix {*zoom:1; }
+.fl {float:left; }
+.fr {float: right; }
+.w {width: 1200px; margin: 0 auto;}
+/*去除下拉框*/
+/*input[type="search"]::-webkit-search-cancel-button{
+  display: none;
+}*/