修改样式缺陷

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/change_area.css

@@ -123,13 +123,13 @@
 .tips_btn .btns .reset-btn {
   background: #fff;
   color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
   background: #2cb7ca;
   color: #fff;
-  border-top: 1px solid #2cb7ca;
+  /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -423,7 +423,19 @@
   display: inline-block !important;
   transform: rotate(-180deg);
 }
-
+#choose_area .result-purchased{
+  position: relative;
+}
+#choose_area .result-purchased::after{
+  position: absolute;
+  content: '';
+  left: .32rem;
+  bottom: 0;
+  width: calc(100% - 0.32rem);
+  right: 0;
+  height: 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+}
 #choose_area .result-selected {
   /* margin: .2rem 0; */
   box-shadow: 0px 2px 8px rgba(54, 147, 179, 0.051);
@@ -674,11 +686,12 @@
 
 #choose_area .select-area-box .index {
   padding: 0 0.3rem;
-  font-size: 0.32rem;
+  font-size: 0.28rem;
   height: .48rem;
   line-height: .48rem;
   /* border-bottom: 1px solid #E5E5E5; */
   background-color: #F5F6F7;
+  color: #5F5E64;
 }
 
 #choose_area .slide {

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/change_industry.css

@@ -123,13 +123,13 @@
 .tips_btn .btns .reset-btn {
   background: #fff;
   color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
   background: #2cb7ca;
   color: #fff;
-  border-top: 1px solid #2cb7ca;
+  /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -433,6 +433,7 @@
 }
 
 .choose_industry .result {
+  z-index: 99;
   padding: .2rem .32rem;
   background-color: #fff;
   /* margin-bottom: 0.2rem; */
@@ -448,7 +449,10 @@
   height: 0;
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
-.choose_industry .result:nth-child(2)::after{
+.choose_industry .result:nth-child(2){
+  box-shadow: 0px 2px 8px rgba(54, 147, 179, 0.051);
+}
+/* .choose_industry .result:nth-child(2)::after{
   position: absolute;
   content: '';
   left: .0;
@@ -456,7 +460,7 @@
   width: 100%;
   height: 0;
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-}
+} */
 
 .choose_industry .result .label {
   color: #1d1d1d;
@@ -534,7 +538,7 @@
 .choose_industry .list .list_item {
   /* display: flex; */
   /* align-items: baseline; */
-  border-bottom: 1px solid #e0e0e0;
+  /* border-bottom: 1px solid #e0e0e0; */
 }
 
 .choose_industry .list .list_item:last-of-type {

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/change_time.css

@@ -123,13 +123,13 @@
 .tips_btn .btns .reset-btn {
   background: #fff;
   color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
   background: #2cb7ca;
   color: #fff;
-  border-top: 1px solid #2cb7ca;
+  /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -432,7 +432,7 @@
   background: #fff;
   /* margin-top: .2rem; */
   padding: .32rem .3rem;
-  border-top: 1px solid #CECECE;
+  /* border-top: 1px solid #CECECE; */
 }
 
 .vip_extend_cycle .extend_content .extend_item:after {
@@ -475,7 +475,7 @@
 }
 
 .vip_extend_cycle .extend_content .extend_item .item_bottom {
-  margin-top: .16rem;
+  /* margin-top: .16rem; */
   color: #686868;
   font-size: .26rem;
   line-height: .4rem;

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/choose_area.css

@@ -82,7 +82,7 @@
   padding: 0 .4rem;
   height: .64rem;
   line-height: .64rem;
-  color: #2CB7CA;
+  color: #FB483D;
   font-size: .32rem;
   background-color: #fff;
   border-radius: .32rem;
@@ -439,7 +439,7 @@
 
 #choose_area .result {
   position: relative;
-  padding: .16rem .3rem .32rem;
+  padding: .16rem .3rem .12rem;
   font-size: .26rem;
   text-align: justify;
   background-color: #fff;
@@ -506,9 +506,11 @@
 
 #choose_area .select-area-box {
   padding-bottom: .94rem;
+  overflow-x: hidden;
 }
 
 #choose_area .select-area-box .tab {
+  position: relative;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -516,10 +518,21 @@
   background: #fff;
   font-size: .3rem;
   padding: .2rem .5rem;
-  border-bottom: 1px solid #e0e0e0;
+  /* border-bottom: 1px solid #e0e0e0; */
   box-sizing: border-box;
 }
 
+#choose_area .select-area-box .tab::after{
+  position: absolute;
+  content: '';
+  width: 100%;
+  /* width: calc(100% - 52px); */
+  height: 0;
+  left: 1.04rem;
+  bottom: 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+}
+
 #choose_area .select-area-box .tab .province {
   display: flex;
   align-items: center;
@@ -621,8 +634,13 @@
 }
 
 #choose_area .select-area-box .index {
-  padding: .3rem .3rem .1rem .3rem;
-  font-size: .32rem;
+  padding: 0 0.3rem;
+  font-size: 0.28rem;
+  height: .48rem;
+  line-height: .48rem;
+  /* border-bottom: 1px solid #E5E5E5; */
+  background-color: #F5F6F7;
+  color: #5F5E64;
 }
 
 #choose_area .slide {

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/choose_industry.css

@@ -83,7 +83,7 @@
   padding: 0 .4rem;
   height: .64rem;
   line-height: .64rem;
-  color: #2CB7CA;
+  color: #FB483D;
   font-size: .32rem;
   background-color: #fff;
   border-radius: .32rem;
@@ -125,13 +125,13 @@
 .tips_btn .btns .reset-btn {
   background: #fff;
   color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
   background: #2cb7ca;
   color: #fff;
-  border-top: 1px solid #2cb7ca;
+  /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -430,7 +430,7 @@
 }
 
 .choose_industry .result {
-  padding: .16rem .3rem .32rem;
+  padding: .16rem .3rem .16rem;
   background:#fff;
   width:100%;	 
 }

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/messageType.css

@@ -21,7 +21,7 @@ body .industry .content {
 body .industry .all {
   margin: 0 0.3rem;
   padding: 0.3rem 0;
-  border-bottom: 1px solid #E0E0E0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
 body .industry .all span {
@@ -32,7 +32,7 @@ body .industry .all span {
   border-radius: 3px;
   text-align: center;
   line-height: .7rem;
-  font-weight: bold;
+  /* font-weight: bold; */
 }
 
 body .industry .all span.active {
@@ -46,7 +46,7 @@ body .industry .all span.active {
 body .industry .list ul li {
   margin: 0 0.3rem;
   padding: 0.3rem 0;
-  border-bottom: 1px solid #E0E0E0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
     width: 100%;
 }
 
@@ -58,7 +58,7 @@ body .industry .list ul li dt {
   border-radius: 3px;
   text-align: center;
   line-height: .7rem;
-  font-weight: bold;
+  /* font-weight: bold; */
   margin-bottom: 0.2rem;
 }
 
@@ -133,7 +133,7 @@ body .industry .resetOne button:first-child {
     font-size: .26rem;
     text-align: justify;
     width: 100%;
-    background: rgba(245,244,249,1);
+    background: #fff;
     z-index: 999;
 /*	    top: 1.2rem;*/
 }

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_index_new.css

@@ -7,8 +7,8 @@
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-  background:url(../image/vip-index-bg.png) no-repeat center top #fff;
-  background-size: 100% 5.42rem;
+  /* background:url(../image/vip-index-bg.png) no-repeat center top #fff;
+  background-size: 100% 5.42rem; */
 }
 .icon-chahao {
   position: relative;
@@ -38,6 +38,7 @@
 .icon-chahao:after {
   transform: translate(-50%,-50%) rotate(-45deg);
 }
+
 .custom-header{
   background-color: transparent;
   position: relative;
@@ -108,7 +109,7 @@
   flex-direction: column;
   flex: 1;
   overflow-y: scroll;
-  padding: 0.24rem 0 .96rem;
+  padding: 0 0 .96rem;
   overflow-x: hidden
 }
 
@@ -123,28 +124,25 @@
   right: 0;
   bottom: 0;
   width: 100%;
-  /* -webkit-transform: scaleY(0.5); */
-  /* transform: scaleY(0.5); */
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
   border-bottom: solid 1px rgba(0, 0, 0, 0.05);
   box-sizing:border-box;
 }
-.vip-upgrade .vip-body .body-item:nth-child(odd){
-  /* content: "";
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  width: 100%;
-  height: 8px;
-  background-color: #F5F6F7; */
-  /* box-shadow: 0px 8px 0px #F5F6F7; */
+.vip-upgrade .vip-body .body-item:last-child{
+  display: none;
+}
+.sub-box{
+  background: url(../image/vip-index-bg.png) no-repeat center top #fff;
+  background-size: 100% 5.42rem;
+  padding-top: 21.33333vw;
 }
 .sub-info{
   border-radius: 8px;
   background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%);
   box-shadow: 0px 12px 16px rgba(250, 231, 202, 0.32);
   padding: .16rem .32rem;
-  margin: 0 .24rem;
+  margin: 0.24rem .24rem;
 }
 .sub-info .item-label{
   font-size: .3rem;
@@ -326,13 +324,13 @@
 
 .vip-body .body-item .item .leading {
   margin-right: 0.24rem;
-  width: 0.4rem;
-  height: 0.4rem;
+  width: 0.48rem;
+  height: 0.48rem;
 }
 
 .vip-body .body-item .item .iconfont {
   margin-left: 0.12rem;
-  color: #c2c2c2;
+  color: #C0C4CC;
   font-size: 0.32rem;
 }
 
@@ -351,7 +349,7 @@
 .vip-body .industry,
 .vip-body .cycle {
   padding: 0.16rem 0;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.04);
 }
 
 .vip-body .cycle {
@@ -359,9 +357,8 @@
   border: 0;
 }
 
-.vip-body .keywords {
-  margin-top: .32rem;
-  /* border-top: 1px solid #cecece; */
+.vip-body .keywords-text,.vip-body .info-type-text {
+  color: #9B9CA3;
 }
 .vip-body .info-type,.vip-body .other{
   box-shadow:  0px 8px 0px #F5F6F7;
@@ -795,7 +792,7 @@
   display: flex;
   align-items: center;
   height: 0.79rem;
-  border-bottom: 1px solid #e0e0e0;
+  border-bottom: 1px solid rgba(0,0,0,.05);
 }
 
 .va-list-container .list-item .item-header .header-content {
@@ -859,7 +856,7 @@
   justify-content: space-between;
   padding: 0 0.3rem;
   height: 0.84rem;
-  border-top: 1px solid #e0e0e0;
+  border-top: 1px solid rgba(0,0,0,.05);
 }
 
 .va-total-container {
@@ -884,7 +881,7 @@
 
 .va-total-container {
   height: .94rem;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .jy-toast .weui-toast {
@@ -1222,3 +1219,13 @@
   font-size: .24rem;
   color: #5F5E64;
 }
+
+.jy-app-header.app-layout-header .app-layout-content-a, .app-layout-content-b{
+  top: 0!important;
+}
+.weui-actionsheet__title:before{
+  display: none;
+}
+.weui-actionsheet__cell:before{
+  left: .32rem;
+}

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_pay_success.css

@@ -25,28 +25,31 @@
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  height: .94rem;
+  padding: 0 .32rem;
+  height: 1.12rem;
   position: fixed;
   bottom: 0;
+  box-shadow: 0px -2px 8px rgba(54, 147, 179, 0.051);
 }
 
 .bottom_button .left_btn,
 .bottom_button .right_btn {
   flex: 1;
-  height: 100%;
+  height: .8rem;
+  line-height: .8rem;
   font-size: .34rem;
+  border-radius: 4px;
 }
 
 .bottom_button .left_btn {
-  color: #2cb7ca;
-  background-color: #fff;
-  border-top: 1px solid #e0e0e0;
+  margin-right: .26rem;
+  color: #5F5E64;
+  background-color: #EDEFF2;
 }
 
 .bottom_button .right_btn {
-  color: #fff;
-  background-color: #2cb7ca;
-  border-top: 1px solid #2cb7ca;
+  color: #F1D090;
+  background-color: #1B1A2A;
 }
 
 .bottom_button button[disabled] {
@@ -233,34 +236,72 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  height: 4rem;
-  color: #2cb7ca;
+  height: 5.04rem;
+  background-color: #fff;
 }
 
-.layou_top .icon_box i.icon {
-  font-size: 1.6rem;
+.layou_top .icon_box img {
+  width:1.6rem;
+  height: 1.6rem;
 }
 
-.layou_top .icon_box p {
+.layou_top .icon_box .success-text {
+  margin-top: 0.16rem;
+  font-size: .36rem;
+  color: #2ABED1;
+}
+.layou_top .icon_box .success-price{
+  margin-top: 0.08rem;
+  color: #171826;
+  font-size: .32rem;
+}
+.layou_top .icon_box .success-price em{
+  color: #171826;
   font-size: .48rem;
+  font-weight: bold;
 }
-
 .layou_top .info_box {
-  padding: 0 .4rem;
-  border-top: 1px solid #e0e0e0;
-  border-bottom: 1px solid #e0e0e0;
+  height: calc(100% - 252px);
+  margin-top: 0.16rem;
+  background-color: #fff;
+  /* border-top: 1px solid #e0e0e0; */
+  /* border-bottom: 1px solid #e0e0e0; */
 }
 
 .layou_top .info_box > div {
+  position: relative;
+  padding: 0 .4rem;
   display: flex;
   justify-content: space-between;
   align-items: center;
   height: .88rem;
   color: #666;
   font-size: .28rem;
-  border-bottom: 1px solid #e0e0e0;
+  /* border-bottom: 1px solid #e0e0e0; */
+}
+.layou_top .info_box > div:after{
+  position: absolute;
+  left: 20px;
+  right: 0;
+  bottom: 0;
+  content: '';
+  height: 0;
+  width: calc(100 - 20px);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.04);
 }
 
 .layou_top .info_box > div:last-of-type {
   border-bottom: 0;
 }
+.pay_mode span:nth-child(1),
+.pay_time span:nth-child(1),
+.pay_id span:nth-child(1){
+  color: #171826; 
+  font-size: .32rem;
+}
+.pay_mode span:nth-child(2),
+.pay_time span:nth-child(2),
+.pay_id span:nth-child(2){
+  color: #9B9CA3; 
+  font-size: .28rem;
+}

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_renew.css

@@ -52,6 +52,13 @@
     background-color: #fff;
     /* border-bottom: 1px solid #cecece; */
 }
+.vip-body .body-item.area{
+  border-radius: 8px 8px 0 0;
+}
+
+.vip-body .body-item.select_cycle{
+  border-radius: 0 0 8px 8px;
+}
 
 .vip-body .body-item .item-container {
     display: block;

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/change_area.js

@@ -407,6 +407,7 @@ $(function () {
             }
         }
         $('.checkbox').prop('checked', false).removeAttr('disabled');
+        $('.all-country').removeClass('active')
         $('.city').removeClass('active');
         $('input').removeClass('opt')
         $('.tab_content').slideUp();

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/choose_area.js

@@ -374,6 +374,7 @@ var AreaChoose = {
           "disabled": false,
           "checked": false
       })
+      $('.all-country').removeClass('active')
       AreaChoose.getResult()
   },
   buyset: undefined,

src/jfw/modules/app/src/web/templates/vipsubscribe/change_area.html

@@ -23,8 +23,10 @@
         }
 
         #choose_area .result {
+            z-index: 99;
             padding: 0;
-            border-bottom: 1px solid #e5e5e5;
+            box-shadow: 0px 2px 8px rgba(54, 147, 179, 0.051);
+            /* border-bottom: 1px solid #e5e5e5; */
         }
     </style>
 </head>

src/jfw/modules/app/src/web/templates/vipsubscribe/messageType.html

@@ -45,12 +45,12 @@
 		.tips_btn .btns .reset-btn {
 		    background: #fff;
 		    color: #2cb7ca;
-		    border-top: 1px solid #e0e0e0;
+		    /* border-top: 1px solid #e0e0e0; */
 		}
 		.tips_btn .btns .save-btn {
 		    background: #2cb7ca;
 		    color: #fff;
-		    border-top: 1px solid #2cb7ca;
+		    /* border-top: 1px solid #2cb7ca; */
 		}
 		.tips_btn .btns .save-btn, .tips_btn .btns .reset-btn {
 		    flex: 1;

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -69,11 +69,16 @@
   .app-layout-header {
       z-index: 999;
   }
+    .custom-header{
+      background: url('image/vip-index-bg.png') no-repeat;
+      background-size: cover;
+      border: 0;
+    }
   </style>
 </head>
 
 <body class="no-touch">
-  <div class="app-layout-header jy-app-header custom-header" style="background: transparent;border: 0;">
+  <div class="app-layout-header jy-app-header custom-header">
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou" style="color: #fff;"></span>
     <div class="custom-header-title">
       <span class="title-text"><em class="title-vip-logo"></em>超级订阅</span>
@@ -111,8 +116,9 @@
           </div>
         </div>
         <ul class="vip-body">
-          <li class="sub-info">
-            <ul>
+
+          <li class="sub-box">
+            <ul class="sub-info">
               <li class="area">
                 <a class="item-container" href="/jyapp/vipsubscribe/toChangeArea">
                   <div class="item">

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_pay_success.html

@@ -22,8 +22,13 @@
     <div class="vip_pay_success layout_top-bottom">
         <div class="layou_top">
             <div class="icon_box">
-                <i class="icon iconfont">&#xe612;</i>
-                <p>支付成功</p>
+                <img src="image/choose.png" alt="">
+                <!-- <i class="icon iconfont">&#xe612;</i> -->
+                <p class="success-text">支付成功</p>
+                <p class="success-price">
+                  &yen;
+                  <em></em>
+                </p>
             </div>
             <div class="info_box">
                 <div class="pay_mode">
@@ -42,7 +47,7 @@
         </div>
         <div class="bottom_button">
             <button class="left_btn">查看订单</button>
-            <button class="right_btn">VIP设置</button>
+            <button class="right_btn">去设置</button>
         </div>
     </div>
 </div>

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_renew.html

@@ -355,7 +355,11 @@
 	        if (event.originalEvent.persisted) {
 	            window.location.reload();
 	        }
-	    });
+      });
+      function toRead() {
+        sessionStorage.setItem("pay_read_cache", "0");
+        window.location.href = "/jyapp/front/staticPage/wx-serviceterms.html";
+      }
 	</script>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/vip_renew.js?v={{Msg "seo" "version"}}"></script>
 </div>

src/web/staticres/course/css/course.css

@@ -106,6 +106,11 @@
 
 .course .course_main .tab_content .tab_content_list a:hover {
   background: none;
+  color: #2CB7CA;
+}
+
+.course .course_main .tab_content .tab_content_list:hover .c_title {
+  color: #2CB7CA;
 }
 
 .course .course_main .tab_content .list_left {

src/web/staticres/css/dev2/biddingSearch.css

@@ -301,7 +301,8 @@ margin-left: 176px;
   margin: 0 2px 4px 0;
 }
 
-#searchInner .searchControl .searchTender .industry span.active {
+#searchInner .searchControl .searchTender .industry span.active,
+#searchInner .searchControl .searchTender .industry span:hover {
   color: #FFFFFF;
   background-color: #2cb7ca;
   border-radius:2px;
@@ -314,7 +315,9 @@ margin-left: 176px;
   margin: 0 2px 8px 0;
 }
 #searchInner .searchControl .searchTender .industry font:hover{
-  color: #2cb7ca;
+  color: #FFFFFF;
+  background-color: #2cb7ca;
+  border-radius:2px;
 }
 
 #searchInner .searchControl .searchTender .industry font.active {
@@ -452,7 +455,11 @@ margin-left: 176px;
   cursor: pointer;
   margin: 0 10px 4px 0;
 }
-
+#searchInner .searchControl .searchTender .release-time .timer li:hover{
+  color: #FFFFFF;
+  background-color: #2cb7ca;
+  border-radius:2px;
+}
 #searchInner .searchControl .searchTender .release-time .timer li.active {
   color: #FFFFFF;
   background-color: #2cb7ca;
@@ -515,8 +522,10 @@ border-radius:2px;
   cursor: pointer;
   margin: 0 8px 4px 0;
 }
-#searchInner .searchControl .searchTender .region .region-content font:hover{
-  color: #2cb7ca;
+#searchInner .searchControl .searchTender .region .region-content font:hover,#regionBtn:hover{
+  color: #FFFFFF;
+  background-color: #2cb7ca;
+  border-radius:2px;
 }
 #searchInner .searchControl .searchTender .region .region-content span.active{
   margin-right: 8px;
@@ -586,6 +595,7 @@ border-radius:2px;
 #searchInner .searchControl .searchTender .information .info-content span{
   margin-right: 7px;
 }
+#searchInner .searchControl .searchTender .information .info-content span:hover,
 #searchInner .searchControl .searchTender .information .info-content span.active {
   color: #FFFFFF;
   background-color: #2cb7ca;
@@ -605,7 +615,12 @@ border-radius:2px;
   border-radius:2px;
 }
 #searchInner .searchControl .searchTender .information .info-content font:hover{
-  color: #2cb7ca;
+  color: #FFFFFF;
+  background-color: #2cb7ca;
+  border-radius:2px;
+}
+#searchInner .searchControl .searchTender .information .info-content font.active:hover{
+  color: #fff;
 }
 
 #searchInner .searchControl .searchTender .information .info-content .diver {
@@ -784,7 +799,7 @@ width:1200px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li .liLuceneList {
-	padding: 0px 15px 15px;
+	padding: 0px 15px 0;
 }
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left {
   float: left;
@@ -810,6 +825,7 @@ width:1200px;
   font-size: 16px;
   display: inline-block;
   width: 100%;
+  padding-bottom: 15px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left .left-title a:hover {

src/web/staticres/dataExport/css/conditions.css

@@ -1,9 +1,15 @@
 @charset "UTF-8";
+
 /* 居中 */
-.center, .conditions-box .err-box > img, .conditions-box .err-box > span, .conditions-box .err-box > button, .conditions-box .line-box {
+.center,
+.conditions-box .err-box>img,
+.conditions-box .err-box>span,
+.conditions-box .err-box>button,
+.conditions-box .line-box {
   display: block;
   margin: 0 auto;
-  text-align: center; }
+  text-align: center;
+}
 
 button {
   cursor: pointer;
@@ -13,159 +19,224 @@ button {
   background: white;
   color: #1D1D1D;
   border: 1px solid #e0e0e0;
-  margin-right: 15px; }
-  button.sussecc, .conditions-box .err-box button {
-    margin-right: 15px;
-	border: 1px solid #2CB7CA;
-    background: #2cb7ca;
-    color: white; }
-  button.u-select {
-    width: 94px;
-    height: 36px;
-    border: 1px solid #E0E0E0;
-    border-radius: 4px;
-    color: #1D1D1D;
-    font-size: 14px; }
-    button.u-select.select {
-      border-color: #2CB7CA;
-      color: #2CB7CA; }
-  button.w100 {
-    width: 100px;
-    height: 36px;
-    border-radius: 4px;
-    margin-left: 6px; }
+  margin-right: 15px;
+}
+
+button.sussecc,
+.conditions-box .err-box button {
+  margin-right: 15px;
+  border: 1px solid #2CB7CA;
+  background: #2cb7ca;
+  color: white;
+}
+
+button.u-select {
+  width: 94px;
+  height: 36px;
+  border: 1px solid #E0E0E0;
+  border-radius: 4px;
+  color: #1D1D1D;
+  font-size: 14px;
+}
+
+button.u-select.select {
+  border-color: #2CB7CA;
+  color: #2CB7CA;
+}
+button.u-select:hover{
+  border-color: #2CB7CA;
+  color: #2CB7CA;
+}
+
+button.w100 {
+  width: 100px;
+  height: 36px;
+  border-radius: 4px;
+  margin-left: 6px;
+}
 
 .conditions-box {
   padding: 106px 0px 30px 0px;
   font-family: MicrosoftYaHei;
-  font-size: 16px; }
-  .conditions-box .progress_ {
-    width: 1200px;
-    display: inline-block;
-    padding-left: 95px;
-    margin-bottom: 30px;
-    box-sizing: border-box; }
-    .conditions-box .progress_  div.pro {
-      width: 300px;
-      height: 38px;
-      line-height: 38px;
-      text-align: center;
-      background-color: #BFBFBF;
-      color: white;
-      float: left;
-      margin-right: 8px; }
-      .conditions-box .progress_ div.a1 {
-        background-color: #BFBFBF;
-        color: #fff; }
-      .conditions-box .progress_ div.b2 {
-        background-color: #72DAE8;
-        color: #fff; }
-      .conditions-box .progress_ div.c3 {
-        background-color: #2CB7CA;
-        color: #fff; }
-    .conditions-box .progress_ .l {
-      position: relative;
-      z-index: 3; }
-      .conditions-box .progress_ .l:after {
-        content: "";
-        position: absolute;
-        right: -23px;
-        top: 0;
-        width: 0;
-        height: 0;
-        border-top: 19px solid transparent;
-        border-left: 23px solid #2CB7CA;
-        border-bottom: 19px solid transparent; }
-    .conditions-box .progress_ .c {
-      z-index: 2;
-      position: relative; }
-      .conditions-box .progress_ .c:before {
-        content: "";
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 0;
-        height: 0;
-        border-top: 19px solid transparent;
-        border-left: 23px solid #fff;
-        border-bottom: 19px solid transparent; }
-      .conditions-box .progress_ .c:after {
-        content: "";
-        position: absolute;
-        right: -23px;
-        top: 0;
-        width: 0;
-        height: 0;
-        border-top: 19px solid transparent;
-        border-left: 23px solid #BFBFBF;
-        border-bottom: 19px solid transparent; }
-    .conditions-box .progress_ .r {
-      position: relative; }
-      .conditions-box .progress_ .r:before {
-        content: "";
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 0;
-        height: 0;
-        border-top: 19px solid transparent;
-        border-left: 23px solid #fff;
-        border-bottom: 19px solid transparent; }
-  .conditions-box .inner {
-    background-color: #fff;
-    border-top: 2px solid #2CB7CA;
-    padding: 30px; }
-  .conditions-box .err-box {
-    box-sizing: border-box;
-    padding: 147px 0 207px 0;
-    font-size: 16px; }
-    .conditions-box .err-box img {
-      width: 211px;
-      height: 169px; }
-    .conditions-box .err-box span {
-      color: #686868;
-      margin: 30px 0 34px 0; }
-    .conditions-box .err-box button {
-		margin:0 auto;
-      width: 130px; }
-  .conditions-box .line-box {
-    width: 1140px;
-    /*border-bottom: 1px solid #E0E0E0;*/
-    padding-bottom: 20px;
-    box-sizing: border-box; }
-    .conditions-box .line-box.p20 {
-      padding: 20px 0; }
-    .conditions-box .line-box .left {
-      width: 114px;
-      line-height: 36px;
-      text-align: right;
-      color: #1D1D1D;
-      }
-      .conditions-box .line-box .left > i {
-        margin-left: -4px;
-        font-size: 20px;
-        line-height: 36px;
-        color: #2cb7ca; }
-    .conditions-box .line-box .right {
-      width: 1047px;
-      margin-left: 15px; }
-  .conditions-box .button-box {
-    margin: 15px 0 -5px 84px; }
-    .conditions-box .button-box.sm {
-      width: 100%;
-      margin-left: 0; }
-      .conditions-box .button-box.sm > button {
-        width: 60px;
-        height: 26px;
-        border-radius: 2px; }
+  font-size: 16px;
+}
+
+.conditions-box .progress_ {
+  width: 1200px;
+  display: inline-block;
+  padding-left: 95px;
+  margin-bottom: 30px;
+  box-sizing: border-box;
+}
+
+.conditions-box .progress_ div.pro {
+  width: 300px;
+  height: 38px;
+  line-height: 38px;
+  text-align: center;
+  background-color: #BFBFBF;
+  color: white;
+  float: left;
+  margin-right: 8px;
+}
+
+.conditions-box .progress_ div.a1 {
+  background-color: #BFBFBF;
+  color: #fff;
+}
+
+.conditions-box .progress_ div.b2 {
+  background-color: #72DAE8;
+  color: #fff;
+}
+
+.conditions-box .progress_ div.c3 {
+  background-color: #2CB7CA;
+  color: #fff;
+}
+
+.conditions-box .progress_ .l {
+  position: relative;
+  z-index: 3;
+}
+
+.conditions-box .progress_ .l:after {
+  content: "";
+  position: absolute;
+  right: -23px;
+  top: 0;
+  width: 0;
+  height: 0;
+  border-top: 19px solid transparent;
+  border-left: 23px solid #2CB7CA;
+  border-bottom: 19px solid transparent;
+}
+
+.conditions-box .progress_ .c {
+  z-index: 2;
+  position: relative;
+}
+
+.conditions-box .progress_ .c:before {
+  content: "";
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 0;
+  height: 0;
+  border-top: 19px solid transparent;
+  border-left: 23px solid #fff;
+  border-bottom: 19px solid transparent;
+}
+
+.conditions-box .progress_ .c:after {
+  content: "";
+  position: absolute;
+  right: -23px;
+  top: 0;
+  width: 0;
+  height: 0;
+  border-top: 19px solid transparent;
+  border-left: 23px solid #BFBFBF;
+  border-bottom: 19px solid transparent;
+}
+
+.conditions-box .progress_ .r {
+  position: relative;
+}
+
+.conditions-box .progress_ .r:before {
+  content: "";
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 0;
+  height: 0;
+  border-top: 19px solid transparent;
+  border-left: 23px solid #fff;
+  border-bottom: 19px solid transparent;
+}
+
+.conditions-box .inner {
+  background-color: #fff;
+  border-top: 2px solid #2CB7CA;
+  padding: 30px;
+}
+
+.conditions-box .err-box {
+  box-sizing: border-box;
+  padding: 147px 0 207px 0;
+  font-size: 16px;
+}
+
+.conditions-box .err-box img {
+  width: 211px;
+  height: 169px;
+}
+
+.conditions-box .err-box span {
+  color: #686868;
+  margin: 30px 0 34px 0;
+}
+
+.conditions-box .err-box button {
+  margin: 0 auto;
+  width: 130px;
+}
+
+.conditions-box .line-box {
+  width: 1140px;
+  /*border-bottom: 1px solid #E0E0E0;*/
+  padding-bottom: 20px;
+  box-sizing: border-box;
+}
+
+.conditions-box .line-box.p20 {
+  padding: 20px 0;
+}
+
+.conditions-box .line-box .left {
+  width: 114px;
+  line-height: 36px;
+  text-align: right;
+  color: #1D1D1D;
+}
+
+.conditions-box .line-box .left>i {
+  margin-left: -4px;
+  font-size: 20px;
+  line-height: 36px;
+  color: #2cb7ca;
+}
+
+.conditions-box .line-box .right {
+  width: 1047px;
+  margin-left: 15px;
+}
+
+.conditions-box .button-box {
+  margin: 15px 0 -5px 84px;
+}
+
+.conditions-box .button-box.sm {
+  width: 100%;
+  margin-left: 0;
+}
+
+.conditions-box .button-box.sm>button {
+  width: 60px;
+  height: 26px;
+  border-radius: 2px;
+}
 
 .split-line {
   color: #000;
   padding: 0 8px;
   line-height: 34px;
-  font-weight: bold;}
+  font-weight: bold;
+}
 
-.select-area-box > span {
+.select-area-box>span {
   font-size: 14px;
   color: #1D1D1D;
   margin-right: 3px;
@@ -173,32 +244,47 @@ button {
   height: 24px;
   line-height: 22px;
   border: 1px solid transparent;
-  box-sizing: border-box; }
-  .select-area-box > span.select-area {
-    cursor: pointer;
-    padding: 0 6.9px;
-    /*margin-right: 10px;*/}
-    .select-area-box > span.select-area.click {
-      background: #F5F5FB;
-      border: 1px solid #e0e0e0;
-      border-bottom: none;
-      position: relative;
-      border-radius: 4px 4px 0px 0px; }
-      .select-area-box > span.select-area.click::after {
-        content: "";
-        width: 100%;
-        height: 2px;
-        position: absolute;
-        bottom: -1px;
-        left: -0.5px;
-        border: 1px solid #e0e0e0;
-        border-width: 0 1px;
-        background-color: #F5F5FB;
-        z-index: 4; }
-    .select-area-box > span.select-area.select {
-      background: #2CB7CA;
-      border-radius: 2px;
-      color: white; }
+  box-sizing: border-box;
+}
+
+.select-area-box>span.select-area {
+  cursor: pointer;
+  padding: 0 6.9px;
+  /*margin-right: 10px;*/
+}
+
+.select-area-box>span.select-area:hover{
+  background-color: #2CB7CA;
+  color: #fff;
+  border-radius: 3px;
+}
+
+.select-area-box>span.select-area.click {
+  background: #F5F5FB;
+  border: 1px solid #e0e0e0;
+  border-bottom: none;
+  position: relative;
+  border-radius: 4px 4px 0px 0px;
+}
+
+.select-area-box>span.select-area.click::after {
+  content: "";
+  width: 100%;
+  height: 2px;
+  position: absolute;
+  bottom: -1px;
+  left: -0.5px;
+  border: 1px solid #e0e0e0;
+  border-width: 0 1px;
+  background-color: #F5F5FB;
+  z-index: 4;
+}
+
+.select-area-box>span.select-area.select {
+  background: #2CB7CA;
+  border-radius: 2px;
+  color: white;
+}
 
 .select-date {
   width: 170px;
@@ -211,35 +297,50 @@ button {
   line-height: 36px;
   box-sizing: border-box;
   position: relative;
-  cursor: pointer; }
-  .select-date::before {
-    content: attr(data-text);
-    position: absolute;
-    left: 15px; }
-  .select-date::after {
-    content: "\e603";
-    position: absolute;
-    right: 10px;
-    top:0;
-    font-family: "iconfont" !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    pointer-events: none;}
+  cursor: pointer;
+}
+
+.select-date::before {
+  content: attr(data-text);
+  position: absolute;
+  left: 15px;
+}
+
+.select-date::after {
+  content: "\e603";
+  position: absolute;
+  right: 10px;
+  top: 0;
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  pointer-events: none;
+}
 
 .float-box {
-  *zoom: 1; }
-  .float-box::after {
-    visibility: hidden;
-    display: block;
-    font-size: 0;
-    content: " ";
-    clear: both;
-    height: 0; }
-  .float-box > * {
-    float: left; }
-  .float-box > div, .float-box > button, .float-box > sapn {
-    float: left; }
+  *zoom: 1;
+}
+
+.float-box::after {
+  visibility: hidden;
+  display: block;
+  font-size: 0;
+  content: " ";
+  clear: both;
+  height: 0;
+}
+
+.float-box>* {
+  float: left;
+}
+
+.float-box>div,
+.float-box>button,
+.float-box>sapn {
+  float: left;
+}
+
 input {
   width: 100%;
   height: 36px;
@@ -248,14 +349,25 @@ input {
   padding: 0 16px;
   border: 1px solid #e0e0e0;
   border-radius: 4px;
-  margin-top: 15px; }
-  input:focus {
-    outline: 1px solid #2cb7ca; }
-  input.w {
-	font-size:14px;
-    width: 590px; }
-  input.sm {
-    width: 288px; }
+  margin-top: 15px;
+}
+
+input:focus {
+  outline: 1px solid #2cb7ca;
+}
+
+input.w {
+  font-size: 14px;
+  width: 590px;
+}
+
+input.w:focus{
+  border: 1px solid #2cb7ca;
+}
+
+input.sm {
+  width: 288px;
+}
 
 .add-w {
   position: relative;
@@ -266,28 +378,39 @@ input {
   border: 1px dashed #e0e0e0;
   border-radius: 4px;
   cursor: pointer;
-  transition: all 0.6s; }
-  .add-w:hover {
-    border-color: #2CB7CA; }
-    .add-w:hover::before {
-      color: #2CB7CA; }
-    .add-w:hover::after {
-      color: #2CB7CA; }
-  .add-w::after {
-    content: attr(data-text);
-    position: absolute;
-    right: 98px;
-    font-size: 14px;
-    color: #888888; }
-  .add-w::before {
-    content: "\e631";
-    position: absolute;
-    color: #AAAAAA;
-    left: 100px;
-    font-family: "iconfont" !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased; }
+  transition: all 0.6s;
+}
+
+.add-w:hover {
+  border-color: #2CB7CA;
+}
+
+.add-w:hover::before {
+  color: #2CB7CA;
+}
+
+.add-w:hover::after {
+  color: #2CB7CA;
+}
+
+.add-w::after {
+  content: attr(data-text);
+  position: absolute;
+  right: 98px;
+  font-size: 14px;
+  color: #888888;
+}
+
+.add-w::before {
+  content: "\e631";
+  position: absolute;
+  color: #AAAAAA;
+  left: 100px;
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+}
 
 .dialog {
   width: 1010px;
@@ -296,11 +419,14 @@ input {
   box-sizing: border-box;
   background: #f5f5fb;
   border: 1px solid #e0e0e0;
-  border-radius: 4px; }
-  .dialog.top {
-    top: -38px;
-    position: relative;
-    margin-bottom: -37px;}
+  border-radius: 4px;
+}
+
+.dialog.top {
+  top: -38px;
+  position: relative;
+  margin-bottom: -37px;
+}
 
 .del-box .delete-close {
   cursor: pointer;
@@ -313,148 +439,204 @@ input {
   box-sizing: border-box;
   padding-left: 15px;
   margin-top: 20px;
-  margin-right: 8px; }
-  .del-box .delete-close > i {
-    font-size: 10px;
-    padding: 8px 17px; }
+  margin-right: 8px;
+}
+
+.del-box .delete-close>i {
+  font-size: 10px;
+  padding: 8px 17px;
+}
 
 /*辅色*/
 .industry {
   /*行业*/
   overflow: hidden;
   padding: 14px 0;
-  position: relative; }
-  .industry span {
-    float: left;
-    padding: 4px 7px;
-    cursor: pointer;
-    margin: 0 2px 4px 0; }
-    .industry span.active {
-      color: #FFFFFF;
-      background-color: #2cb7ca; }
-  .industry font {
-    float: left;
-    padding: 4px 7px;
-    cursor: pointer;
-    margin: 0 2px 8px 0; }
-  .industry font.active {
-    color: #FFFFFF;
-    background-color: #2cb7ca; }
-  .industry .diver {
-    float: left;
-    width: 1px;
-    height: 16px;
-    background-color: #e0e0e0;
-    margin: 3px 8px 0; }
-  .industry .parent-node {
-    color: #2cb7ca;
-    margin-right: 11px; }
-  .industry .parent-node.secondActice {
-    background-color: #ffffff;
-    padding: 3px 6px;
-    border: 1px dashed #2cb7ca;
-    color: #2cb7ca; }
-  .industry .industry-content {
-    float: left;
-    width: 100%; }
-  .industry .stop {
-    position: absolute;
-    right: 4px;
-    top: 18px;
-    padding-right: 15px;
-    color: #686868;
-    cursor: pointer; }
-    .industry .stop::after {
-      content: "\e625";
-      position: absolute;
-      color: #AAAAAA;
-      right: 0;
-      top: 3px;
-      font-family: "iconfont" !important;
-      font-size: 12px;
-      font-style: normal;
-      -webkit-font-smoothing: antialiased; }
-    .industry .stop.up::after {
-      content: "\e623";
-      position: absolute;
-      color: #AAAAAA;
-      right: 0;
-      top: 3px;
-      font-family: "iconfont" !important;
-      font-size: 12px;
-      font-style: normal;
-      -webkit-font-smoothing: antialiased; }
+  position: relative;
+}
+
+.industry span {
+  float: left;
+  padding: 4px 7px;
+  cursor: pointer;
+  margin: 0 2px 4px 0;
+}
+
+.industry span.active {
+  color: #FFFFFF;
+  background-color: #2cb7ca;
+}
+
+.industry font {
+  float: left;
+  padding: 4px 7px;
+  cursor: pointer;
+  margin: 0 2px 8px 0;
+}
+
+.industry font.active {
+  color: #FFFFFF;
+  background-color: #2cb7ca;
+}
+
+.industry .diver {
+  float: left;
+  width: 1px;
+  height: 16px;
+  background-color: #e0e0e0;
+  margin: 3px 8px 0;
+}
+
+.industry .parent-node {
+  color: #2cb7ca;
+  margin-right: 11px;
+}
+
+.industry .parent-node.secondActice {
+  background-color: #ffffff;
+  padding: 3px 6px;
+  border: 1px dashed #2cb7ca;
+  color: #2cb7ca;
+}
+
+.industry .industry-content {
+  float: left;
+  width: 100%;
+}
+
+.industry .stop {
+  position: absolute;
+  right: 4px;
+  top: 18px;
+  padding-right: 15px;
+  color: #686868;
+  cursor: pointer;
+}
+
+.industry .stop::after {
+  content: "\e625";
+  position: absolute;
+  color: #AAAAAA;
+  right: 0;
+  top: 3px;
+  font-family: "iconfont" !important;
+  font-size: 12px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+}
+
+.industry .stop.up::after {
+  content: "\e623";
+  position: absolute;
+  color: #AAAAAA;
+  right: 0;
+  top: 3px;
+  font-family: "iconfont" !important;
+  font-size: 12px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+}
 
 .user-input {
   width: 100%;
-  text-align: left; }
+  text-align: left;
+}
 
 .add-input-w {
   margin-top: 15px;
-  width: 590px; }
-  .add-input-w .sm {
-    margin-top: 0;
-    margin-bottom: 15px; }
-  .add-input-w .r, .add-input-w .l {
-    width: 288px; }
-  .add-input-w > .r {
-    margin-left: 14px; }
-
-#inputDel_1, #inputDel_2 {
-  width: 100%; }
-  #inputDel_1 > .delete-close, #inputDel_2 > .delete-close {
-    width: 336px;
-    text-align: left;
-    position: relative;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    padding-right: 50px;
-    margin: 8px;
-    margin-left: 0;
-    margin-top: 0px;
-  }
-    #inputDel_1 > .delete-close > i, #inputDel_2 > .delete-close > i {
-      right: 0;
-      position: absolute;
-      top: 0;
-      padding: 0 17px; }
+  width: 590px;
+}
+
+.add-input-w .sm {
+  margin-top: 0;
+  margin-bottom: 15px;
+}
+
+.add-input-w .r,
+.add-input-w .l {
+  width: 288px;
+}
+
+.add-input-w>.r {
+  margin-left: 14px;
+}
+
+#inputDel_1,
+#inputDel_2 {
+  width: 100%;
+}
+
+#inputDel_1>.delete-close,
+#inputDel_2>.delete-close {
+  width: 336px;
+  text-align: left;
+  position: relative;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  padding-right: 50px;
+  margin: 8px;
+  margin-left: 0;
+  margin-top: 0px;
+}
+
+#inputDel_1>.delete-close>i,
+#inputDel_2>.delete-close>i {
+  right: 0;
+  position: absolute;
+  top: 0;
+  padding: 0 17px;
+}
 
 #inputDel_0 {
-  width: 100%; }
-  #inputDel_0 .column {
-    width: 336px;
-    margin-left: 8px; }
-    #inputDel_0 .column:nth-child(1) {
-      margin-left: 0; }
-  #inputDel_0 .delete-close {
-    float: left;
-    height: auto;
-    width: 324px;
-    text-align: left;
-    line-height: 22px;
-    padding: 8px 25px 9px 15px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    word-break: break-all;
-    margin: 0;
-    margin-bottom: 8px;
-    margin-right: 8px;
-    position: relative; }
-    #inputDel_0 .delete-close > i {
-      right: 0;
-      position: absolute;
-      top: 0;
-      padding: 8px 15px; }
+  width: 100%;
+}
+
+#inputDel_0 .column {
+  width: 336px;
+  margin-left: 8px;
+}
+
+#inputDel_0 .column:nth-child(1) {
+  margin-left: 0;
+}
+
+#inputDel_0 .delete-close {
+  float: left;
+  height: auto;
+  width: 324px;
+  text-align: left;
+  line-height: 22px;
+  padding: 8px 25px 9px 15px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  word-break: break-all;
+  margin: 0;
+  margin-bottom: 8px;
+  margin-right: 8px;
+  position: relative;
+}
+
+#inputDel_0 .delete-close>i {
+  right: 0;
+  position: absolute;
+  top: 0;
+  padding: 8px 15px;
+}
 
 .text-box {
-  width: 100%; }
-  .text-box .title-other {
-    width: 230px;
-    white-space:pre-wrap }
-    .text-box .title-other > span {
-      margin-left: 8px; }
+  width: 100%;
+}
+
+.text-box .title-other {
+  width: 230px;
+  white-space: pre-wrap
+}
+
+.text-box .title-other>span {
+  margin-left: 8px;
+}
 
 .edit-user-input {
   user-select: none;
@@ -466,54 +648,71 @@ input {
   box-sizing: border-box;
   padding: 15px;
   position: relative;
-  position: absolute; }
-  .edit-user-input .sm {
-    margin-top: 0; }
-  .edit-user-input .up-icon {
-    top: 0;
-    position: absolute;
-    left: 0; }
-    .edit-user-input .up-icon::before {
-      content: "";
-      position: absolute;
-      top: -8px;
-      left: 20px;
-      width: 0;
-      height: 0;
-      border-left: 10px solid transparent;
-      border-right: 10px solid transparent;
-      border-bottom: 9px solid #FFFFFF;
-      z-index: 3; }
-    .edit-user-input .up-icon::after {
-      content: "";
-      position: absolute;
-      top: -11px;
-      left: 16px;
-      width: 0;
-      height: 0;
-      z-index: 2;
-      border-left: 14px solid transparent;
-      border-right: 14px solid transparent;
-      border-bottom: 12px solid rgba(0, 0, 0, 0.05); }
-.float-box button{
-	margin-right:15px !important;
-}	
-#reset{
-	border: 1px solid #e0e0e0;
-}
-.call{
-	width:120px;
-	float: left;
-    margin-left: 30px;
-    margin-right: 30px;
-    color: #686868;
-    font-size: 14px;
-	text-align:center;
-}
-.callNum:before{
-	content:"";
-	background-image:url("../image/call.png");
-	background-size: 20px 20px;
-	background-repeat: no-repeat;
-	padding-left: 25px;
+  position: absolute;
+}
+
+.edit-user-input .sm {
+  margin-top: 0;
+}
+
+.edit-user-input .up-icon {
+  top: 0;
+  position: absolute;
+  left: 0;
+}
+
+.edit-user-input .up-icon::before {
+  content: "";
+  position: absolute;
+  top: -8px;
+  left: 20px;
+  width: 0;
+  height: 0;
+  border-left: 10px solid transparent;
+  border-right: 10px solid transparent;
+  border-bottom: 9px solid #FFFFFF;
+  z-index: 3;
+}
+
+.edit-user-input .up-icon::after {
+  content: "";
+  position: absolute;
+  top: -11px;
+  left: 16px;
+  width: 0;
+  height: 0;
+  z-index: 2;
+  border-left: 14px solid transparent;
+  border-right: 14px solid transparent;
+  border-bottom: 12px solid rgba(0, 0, 0, 0.05);
+}
+
+.float-box button {
+  margin-right: 15px !important;
+}
+
+#reset {
+  border: 1px solid #e0e0e0;
+}
+#reset:hover{
+  border: 1px solid #2CB7CA;
+  color: #2CB7CA;
+}
+
+.call {
+  width: 120px;
+  float: left;
+  margin-left: 30px;
+  margin-right: 30px;
+  color: #686868;
+  font-size: 14px;
+  text-align: center;
+}
+
+.callNum:before {
+  content: "";
+  background-image: url("../image/call.png");
+  background-size: 20px 20px;
+  background-repeat: no-repeat;
+  padding-left: 25px;
 }

src/web/staticres/js/biddingSearch.js

@@ -29,9 +29,9 @@ $(function() {
 		$screenBtn.on("click", function() {
 			$(this).toggleClass("down");
 			if(!$(this).hasClass("down")) {
-				$searchControl.stop().slideUp(1000);
+				$searchControl.stop().slideUp(300);
 			} else {
-				$searchControl.stop().slideDown(1000);
+				$searchControl.stop().slideDown(300);
 			}
 		})
 	}

src/web/staticres/vipsubscribe/css/change_area.css

@@ -123,13 +123,13 @@
 .tips_btn .btns .reset-btn {
   background: #fff;
   color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
   background: #2cb7ca;
   color: #fff;
-  border-top: 1px solid #2cb7ca;
+  /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -686,8 +686,9 @@
   height: .48rem;
   line-height: .48rem;
   padding: 0 0.3rem;
-  font-size: 0.32rem;
+  font-size: 0.28rem;
   background-color: #F5F6F7;
+  color: #5F5E64;
 }
 
 #choose_area .slide {

src/web/staticres/vipsubscribe/css/change_industry.css

@@ -123,13 +123,13 @@
 .tips_btn .btns .reset-btn {
   background: #fff;
   color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
   background: #2cb7ca;
   color: #fff;
-  border-top: 1px solid #2cb7ca;
+  /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -437,6 +437,7 @@
   line-height: .4rem;
   background-color: #fff;
   /* margin-bottom: 0.2rem; */
+  z-index: 99;
 }
 .choose_industry .result:nth-child(1){
   position: relative;
@@ -451,7 +452,7 @@
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 .choose_industry .result:nth-child(2){
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  /* border-bottom: 1px solid rgba(0, 0, 0, 0.05); */
   box-shadow: 0px 2px 8px rgba(54, 147, 179, 0.051);
 }
 
@@ -498,7 +499,7 @@
 }
 
 .choose_industry .list {
-  padding: 0 .3rem;
+  /* padding: 0 .3rem; */
 }
 
 .choose_industry .list .wenhao {
@@ -528,9 +529,9 @@
 }
 
 .choose_industry .list .list_item {
-  display: flex;
-  align-items: baseline;
-  border-bottom: 1px solid #e0e0e0;
+  /* display: flex;
+  align-items: baseline; */
+  /* border-bottom: 1px solid #e0e0e0; */
 }
 
 .choose_industry .list .list_item:last-of-type {
@@ -538,8 +539,12 @@
 }
 
 .choose_industry .list .list_item .item_label {
-  width: .2rem;
-  text-align: left;
+  padding: 0 .3rem;
+  height: .48rem;
+  line-height: .48rem;
+  background-color: #F5F6F7;
+  color: #5F5E64;
+  font-size: .28rem;
 }
 
 .choose_industry .list .list_item .item_industry_list {
@@ -547,7 +552,7 @@
   flex: 1;
   flex-wrap: wrap;
   justify-content: flex-start;
-  padding-top: .25rem;
+  padding: .25rem .3rem 0;
 }
 
 .choose_industry .list .list_item .item_industry_list .industry_item {

src/web/staticres/vipsubscribe/css/change_time.css

@@ -123,13 +123,13 @@
 .tips_btn .btns .reset-btn {
   background: #fff;
   color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
   background: #2cb7ca;
   color: #fff;
-  border-top: 1px solid #2cb7ca;
+  /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -432,7 +432,7 @@
   background: #fff;
   margin-top: .2rem;
   padding: .32rem .3rem;
-  border-top: 1px solid #CECECE;
+  /* border-top: 1px solid #CECECE; */
 }
 
 .vip_extend_cycle .extend_content .extend_item:after {
@@ -475,7 +475,7 @@
 }
 
 .vip_extend_cycle .extend_content .extend_item .item_bottom {
-  margin-top: .16rem;
+  /* margin-top: .16rem; */
   color: #686868;
   font-size: .26rem;
   line-height: .4rem;

src/web/staticres/vipsubscribe/css/choose_area.css

@@ -82,7 +82,7 @@
   padding: 0 .4rem;
   height: .64rem;
   line-height: .64rem;
-  color: #2CB7CA;
+  color: #FB483D;
   font-size: .32rem;
   background-color: #fff;
   border-radius: .32rem;
@@ -123,13 +123,13 @@
 .tips_btn .btns .reset-btn {
   background: #fff;
   color: #2cb7ca;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
   background: #2cb7ca;
   color: #fff;
-  border-top: 1px solid #2cb7ca;
+  /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -442,6 +442,7 @@
   padding: .2rem .3rem;
   font-size: .26rem;
   text-align: justify;
+  background-color: #fff;
 }
 
 #choose_area .result .result_text {

src/web/staticres/vipsubscribe/css/choose_industry.css

@@ -83,7 +83,7 @@
     padding: 0 .4rem;
     height: .64rem;
     line-height: .64rem;
-    color: #2CB7CA;
+    color: #FB483D;
     font-size: .32rem;
     background-color: #fff;
     border-radius: .32rem;
@@ -125,13 +125,13 @@
 .tips_btn .btns .reset-btn {
     background: #fff;
     color: #2cb7ca;
-    border-top: 1px solid #e0e0e0;
+    /* border-top: 1px solid #e0e0e0; */
 }
 
 .tips_btn .btns .save-btn {
     background: #2cb7ca;
     color: #fff;
-    border-top: 1px solid #2cb7ca;
+    /* border-top: 1px solid #2cb7ca; */
 }
 
 .tips_btn .btns button[disabled] {
@@ -402,13 +402,13 @@
 }
 
 .choose_industry .result {
-    padding: .16rem .3rem .32rem;
+    padding: .16rem .3rem .16rem;
     background: rgba(245, 244, 249, 1);
     z-index: 999;
     position: fixed;
     width: 100%;
     background-color: #fff;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.04);
+    /* border-bottom: 1px solid rgba(0, 0, 0, 0.04); */
 }
 .choose_industry .result .label{
   font-size: .26rem;

src/web/staticres/vipsubscribe/css/messageType.css

@@ -20,7 +20,7 @@ body .industry .content {
 body .industry .all {
   margin: 0 0.3rem;
   padding: 0.3rem 0;
-  border-bottom: 1px solid #E0E0E0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
 body .industry .all span {
@@ -31,7 +31,7 @@ body .industry .all span {
   border-radius: 3px;
   text-align: center;
   line-height: .7rem;
-  font-weight: bold;
+  /* font-weight: bold; */
 }
 
 body .industry .all span.active {
@@ -42,7 +42,7 @@ body .industry .all span.active {
 body .industry .list ul li {
   margin: 0 0.3rem;
   padding: 0.3rem 0;
-  border-bottom: 1px solid #E0E0E0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
 body .industry .list ul li dt {
@@ -53,7 +53,7 @@ body .industry .list ul li dt {
   border-radius: 3px;
   text-align: center;
   line-height: .7rem;
-  font-weight: bold;
+  /* font-weight: bold; */
   margin-bottom: 0.2rem;
 }
 
@@ -70,8 +70,9 @@ body .industry .list ul li dd {
 }
 
 body .industry .list ul li .active {
-  background: #2cb7ca;
-  color: #fff;
+  color: #2ABED1;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHGSURBVHgB7da/T8JAFAfw11aRGNTGkKDRoUhMEBc68Adg4u4/YMRVB3Vz09EN/wQGVyNOJiamOjtUnFg0DA4OJOKvQAz2vHdSQklp77Aw+ab27rhPXrl+U4D/CrBSl2ZahiFV0ihtSCOyIcEQasko7UgEjvF64B2mjNKBjWENtEPEgMBh59jAwGXjPk8I2e0eDxzUzkx1XFXyQEjObT5QkGFTskEv073WBAYmL0xNHmOY5rUuEJAXCwQUwf4MYlRhehAAlfc3fb/4dlSJYH2DGFUygYIXtj4fhdPMIiQjYce4AoLViqojrzXbWgz2ErMQDY1C9asJt7XP9pxQh25R5YZtxWPsuvxRh5OnqmOeu0OMKortZ9QIu39vfvtim+YjvHWt8z2lnVGFWEFfYFjOfKCbNoQwLNkXw6hq5SJuhNjEiELhRPtA8GK07np22OuFRgQxRBG/qr7C2sw0D0afJylIIpgbapcvRsuSrLgsiv1u3mD/oX1weDDsrpzVK44ORaNqLhyClegknD+/eGJ0vwqRrKwDxKhS6LeHaFT5VSeG9+yR8kRVXyWRYl2ydBtjQzzpIVA12lOFfsvcEAuK5VX9unvBD+h28RDMijACAAAAAElFTkSuQmCC) no-repeat bottom right #E8FAFD;
+  background-size: 0.28rem 0.28rem;
 }
 
 body .industry .list ul li .question {
@@ -125,7 +126,8 @@ body .industry .resetOne button:first-child {
     font-size: .26rem;
     text-align: justify;
     width: 100%;
-    background: rgba(245,244,249,1);
+    background: #fff;
     z-index: 999;
-	    top: 0px;
+    top: 0px;
+    color: #9B9CA3;
 }

src/web/staticres/vipsubscribe/css/vip_index_new.css

@@ -53,9 +53,9 @@
 .super-bg{
   /* position: absolute; */
   width: 100%;
-  height: 4.54rem;
-  background: url(../image/vip-index-bg.png) no-repeat center center #fff;
-  background-size: 100% 100%;
+  height: 5.56rem;
+  background: url(../image/vip-index-bg.png) no-repeat center top #fff;
+  background-size: 100% 4.54rem;
   /* z-index: 9; */
 }
 
@@ -113,6 +113,7 @@
   box-sizing: border-box;
   font-size: .26rem;
 }
+
 .sub-info{
   border-radius: 8px;
   background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%);
@@ -148,6 +149,7 @@
   top: 1.04rem;
   z-index: 10;
   width: 100%;
+  overflow-x: hidden;
   /* top: ; */
 }
 
@@ -264,7 +266,23 @@
 
 .vip-body .body-item {
   background-color: #fff;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  position: relative;;
+}
+
+.vip-upgrade .vip-body .body-item::after{
+  content: "";
+  position: absolute;
+  left: .6rem;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  border-bottom: solid 1px rgba(0, 0, 0, 0.05);
+  box-sizing:border-box;
+}
+.vip-upgrade .vip-body .body-item:last-child{
+  display: none;
 }
 
 .vip-body .body-item .item-container {
@@ -307,13 +325,13 @@
 
 .vip-body .body-item .item .leading {
   margin-right: 0.24rem;
-  width: 0.4rem;
-  height: 0.4rem;
+  width: 0.48rem;
+  height: 0.48rem;
 }
 
 .vip-body .body-item .item .iconfont {
   margin-left: 0.12rem;
-  color: #c2c2c2;
+  color: #C0C4CC;
   font-size: 0.32rem;
 }
 
@@ -343,6 +361,10 @@
   /* border-top: 1px solid #cecece; */
 }
 
+.vip-body .keywords-text,.vip-body .info-type-text {
+  color: #9B9CA3;
+}
+
 .vip-body .project-match {
   margin-top: 0.16rem;
   padding-top: 0.2rem !important;
@@ -770,7 +792,7 @@
   display: flex;
   align-items: center;
   height: 0.79rem;
-  border-bottom: 1px solid #e0e0e0;
+  border-bottom: 1px solid rgba(0,0,0,.05);
 }
 
 .va-list-container .list-item .item-header .header-content {
@@ -834,7 +856,7 @@
   justify-content: space-between;
   padding: 0 0.3rem;
   height: 0.84rem;
-  border-top: 1px solid #e0e0e0;
+  border-top: 1px solid rgba(0,0,0,.05);
 }
 
 .va-total-container {
@@ -859,7 +881,7 @@
 
 .va-total-container {
   height: .94rem;
-  border-top: 1px solid #e0e0e0;
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 .jy-toast .weui-toast {
@@ -1196,3 +1218,9 @@
   font-size: .24rem;
   color: #5F5E64;
 }
+.weui-actionsheet__title:before{
+  display: none;
+}
+.weui-actionsheet__cell:before{
+  left: .32rem;
+}

src/web/staticres/vipsubscribe/css/vip_renew.css

@@ -40,6 +40,13 @@
     position: relative;
     background-color: #fff;
 }
+.vip-body .body-item.area{
+  border-radius: 8px 8px 0 0;
+}
+
+.vip-body .body-item.select_cycle{
+  border-radius: 0 0 8px 8px;
+}
 .vip-body .body-item:after{
   position: absolute;
   content: '';

src/web/staticres/vipsubscribe/js/change_area.js

@@ -407,6 +407,7 @@ $(function () {
             }
         }
         $('.checkbox').prop('checked', false).removeAttr('disabled');
+        $('.all-country').removeClass('active')
         $('.city').removeClass('active');
         $('input').removeClass('opt')
         $('.tab_content').slideUp();

src/web/staticres/vipsubscribe/js/choose_area.js

@@ -365,6 +365,7 @@ var AreaChoose = {
           "disabled": false,
           "checked": false
       })
+      $('.all-country').removeClass('active')
       $('input').removeClass('opt')
       AreaChoose.getResult()
   },

src/web/templates/pc/dataExport_sieve.html

@@ -124,14 +124,14 @@
             border-radius: 5px;
         }
         .price_w_sel{
-            background-color: #F8F7FC !important;
-            border: 1px solid #ddd !important;
-            box-shadow: 0 0 10px rgba(0,0,0, .2);
+            /* background-color: #F8F7FC !important; */
+            /* border: 1px solid #ddd !important; */
+            /* box-shadow: 0 0 10px rgba(0,0,0, .2); */
         }
         .price_w_selected{
             background-color: #2CB7CA !important;
-            border: 1px solid #ddd !important;
-            box-shadow: 0 0 10px rgba(0,0,0, .2);
+            /* border: 1px solid #ddd !important; */
+            /* box-shadow: 0 0 10px rgba(0,0,0, .2); */
         }
         .dialog .select-area-box.float-box > .select-area{
             margin-top: 10px;
@@ -166,13 +166,14 @@
             color: #252627;
             font-size: 14px;
             line-height: 30px;
-            padding-right: 16px;
+            /* padding-right: 16px; */
+            padding: 0 8px;
         }
 
         .info-select-box > span.info-select-now {
             color: #252627;
             margin-top: 10px;
-            padding-left: 18px;
+            /* padding-left: 18px; */
             /*border-left: 1px solid #C9CAD0;*/
             font-weight: bold;
         }
@@ -182,7 +183,7 @@
         }
 
         .info-select-box > span.info-select-now.all {
-            padding-left: 0;
+            /* padding-left: 0; */
             border-left: none;
             color: #252627;
             font-weight: normal;
@@ -209,7 +210,7 @@
 
         .class-open {
             position: relative;
-            padding-right: 50px;
+            padding-right: 60px;
         }
 
         .class-open strong {
@@ -244,10 +245,20 @@
         .info-select-box > span{
             display: inline-block;
         }
+        .info-select-box > span:hover{
+          background-color: #2CB7CA;
+          color: #fff;
+          border-radius: 2px;
+        }
         .class-open{width: 100%;}
         .info-select-box > span.info-select-now{
             margin-top: 4px;
         }
+        .info-select-box > span.info-select-now:hover{
+          background-color: #2CB7CA;
+          color: #fff;
+          border-radius: 2px;
+        }
         .info-select-box > span.info-select-now.split{
             border-left: 0;
             padding-left: 0;
@@ -263,7 +274,7 @@
             background: #c9cad0;
             display: inline-block;
             vertical-align: middle;
-            margin-right: 18px;
+            margin-right: 9px;
         }
         body {
             background-color: red;
@@ -317,14 +328,14 @@
             border-color: #2CB7CA;
         }
         .date_w_sel{
-            background-color: #F8F7FC !important;
-            border: 1px solid #ddd !important;
-            box-shadow: 0 0 10px rgba(0,0,0, .2);
+            /* background-color: #F8F7FC !important; */
+            /* border: 1px solid #ddd !important; */
+            /* box-shadow: 0 0 10px rgba(0,0,0, .2); */
         }
         .date_w_selected{
             background-color: #2CB7CA !important;
-            border: 1px solid #ddd !important;
-            box-shadow: 0 0 10px rgba(0,0,0, .2);
+            /* border: 1px solid #ddd !important; */
+            /* box-shadow: 0 0 10px rgba(0,0,0, .2); */
         }
 		.bu-select{
 			width: 94px;
@@ -392,6 +403,10 @@
         .selectType{
         	padding: 0 15px;
         }
+        .selectType>button:hover{
+          border-color: #2CB7CA;
+    		  color: #2CB7CA;
+        }
         .textAll{
         	width:102px;
 			height:36px;
@@ -558,7 +573,7 @@
             <div class="right">
                 <div class="del-box float-box" id="area-del"></div>
                 <div class="select-area-box float-box">
-                    <span class="select-area" style="padding-left: 0">全国</span><span>A</span><span
+                    <span class="select-area">全国</span><span>A</span><span
                         class="select-area">安徽</span><span class="select-area">澳门</span><span>B</span><span
                         class="select-area">北京</span><span>C</span><span
                         class="select-area">重庆</span><span>F</span><span

src/web/templates/weixin/vipsubscribe/change_area.html

@@ -21,8 +21,9 @@
         }
 
         #choose_area .result {
-            padding: 0;
-            border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+          z-index: 99;
+          padding: 0;
+          box-shadow: 0px 2px 8px rgba(54, 147, 179, 0.051);
         }
     </style>
 </head>

src/web/templates/weixin/vipsubscribe/choose_industry.html

@@ -311,7 +311,7 @@
             $('#all button').trigger('click');
         }
         //调整高度
-        $(".select-area-box .list").css("margin-top", $(".result").height() + 20);
+        $(".select-area-box .list").css("margin-top", $(".result").height() + 10);
 
 
     }

src/web/templates/weixin/vipsubscribe/messageType.html

@@ -205,7 +205,7 @@
         }
 
         $(".result").css("visibility", "");
-        $(".industry").css("margin-top", $('.result_text').height() + 25);
+        $(".industry").css("margin-top", $('.result_text').height() + 10);
         $(".industry").css("visibility", "");
     }
 

src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -72,8 +72,8 @@
       </div>
     </div>
     <ul class="vip-body">
-        <li class="sub-info">
-          <ul>
+        <li class="sub-box">
+          <ul class="sub-info">
             <li class="area">
               <a class="item-container" href="/front/vipsubscribe/toChangeArea">
                   <div class="item">