Merge branch 'dev/v4.8.90_zsy' of qmx/jy into release/v4.8.90

src/web/staticres/serviceSystem/css/serviceSystem.css

@@ -181,6 +181,9 @@
     border-radius: 20px;
     margin-bottom: 48px;
 }
+.supplier_item  .recommend-circle-text:nth-of-type(3){
+    border-radius: 38px;
+}
 .supplier_item .recommend-gold{
     border: 1px solid #C98F37;
     background: rgba(201, 143, 55, 0.08);
@@ -439,17 +442,18 @@
 
 .table_header_new .long_cell {
     /*flex: 4.7;*/
+    border-left:1px solid #ececec;
     height: 90px;
     background-color: #EFFDFF;
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 336px;
+    width: 312px;
     box-sizing: border-box;
 }
 
 .table_header_new .sort_cell {
-    width: 160px;
+    width: 166px;
     /*flex: 1;*/
     height: 90px;
     border-left: 1px solid #ececec;
@@ -462,20 +466,19 @@
 
 .serve_table .table_header_new .long_cell {
     /*flex: 4 !important;*/
-    width: 336px;
+    width: 312px;
     height: 90px;
     background-color: #EFFDFF;
     display: flex;
     align-items: center;
     justify-content: center;
-}
-.serve_table .bl {
-    border-left: 1px solid #ececec;
+    box-sizing: border-box;
+    border-left:1px solid #ececec;
 }
 
 .serve_table .table_header_new .sort_cell {
     /*flex: 1 !important;*/
-    width: 160px;
+    width: 166px;
     height: 90px;
     border-left: 1px solid #ececec;
     display: flex;
@@ -490,7 +493,7 @@
     width:120px;
 }
 .table_header_new .sort_cell_block {
-    width:160px;
+    width:166px;
     padding-top: 16px;
     box-sizing: border-box;
     /*flex: 1;*/
@@ -499,7 +502,7 @@
 }
 
 .table_header_new .sort_cell_block_nob {
-    width:160px;
+    width:166px;
     padding-top: 16px;
     box-sizing: border-box;
     /*flex: 1;*/
@@ -511,25 +514,26 @@
     padding-top: 16px;
     box-sizing: border-box;
     /*flex: 1;*/
-    width:160px;
+    width:166px;
     height: 90px;
     border-left: 1px solid #ececec;
-
 }
 
 .table_header .long_cell {
     /*flex: 4.5;*/
-    width:336px;
+    width:312px;
     height: 90px;
     background-color: #F5F5FB;
     display: flex;
     align-items: center;
     justify-content: center;
+    box-sizing: border-box;
+    border-left:1px solid #ececec;
 }
 
 .table_header .sort_cell {
     /*flex: 1;*/
-    width: 160px;
+    width: 166px;
     height: 90px;
     border-left: 1px solid #ececec;
     display: flex;
@@ -540,18 +544,19 @@
 
 .serve_table .table_header .long_cell {
     /*flex: 4 !important;*/
-    width:336px;
+    width:312px;
     height: 90px;
     background-color: #EFFDFF;
     display: flex;
     align-items: center;
     justify-content: center;
     box-sizing: border-box;
+    border-left:1px solid #ececec;
 }
 
 .serve_table .table_header .sort_cell {
     /*flex: 1 !important;*/
-    width:160px;
+    width:166px;
     height: 90px;
     border-left: 1px solid #ececec;
     display: flex;
@@ -573,13 +578,13 @@
     /*flex: 1;*/
     height: 90px;
     border-left: 1px solid #ececec;
-    width:160px;
+    width:166px;
 }
 
 .table_serve_head_text {
     font-style: normal;
     font-weight: 400;
-    font-size: 20px;
+    font-size: 18px;
     height: 52px;
     line-height: 52px;
     color: #171826;
@@ -609,11 +614,11 @@
     height: 110px !important;
 
 }
-.he-148 {
-    height: 148px !important;
+.he-118 {
+    height: 118px !important;
 }
-.he-150 {
-    height: 150px !important;
+.he-120 {
+    height: 120px !important;
 }
 .serve_bg_blue {
     background: linear-gradient(180deg, rgba(223, 251, 255, 0.96) 0%, #F7FEFF 102.37%);
@@ -697,7 +702,7 @@
 .table_head_tit {
     font-style: normal;
     font-weight: 400;
-    font-size: 20px;
+    font-size: 18px;
     line-height: 32px;
     color: #1d1d1d;
     text-align: center;
@@ -812,17 +817,17 @@
 }
 
 .table_content_longcell {
-    padding: 13px 16px;
+    padding: 13px 12px;
     box-sizing: border-box;
     border-left: 1px solid #ECECEC;
-    width: 336px;
+    width: 312px;
     box-sizing: border-box;
 
 }
 
 .table_content_sortcell {
     border-left: 1px solid #ECECEC;
-     width: 160px;
+     width: 166px;
     /*flex: 1;*/
     display: flex;
     align-items: center;
@@ -867,19 +872,19 @@
 }
 
 .serve_table .table_content_longcell {
-    padding: 13px 16px;
+    padding: 13px 12px;
     box-sizing: border-box;
     border-left: 1px solid #ECECEC;
     /*flex: 3.75 !important;*/
     box-sizing: border-box;
     display: flex;
     align-items: center;
-    width:336px;
+    width:312px;
 }
 
 .serve_table .table_content_sortcell {
     border-left: 1px solid #ECECEC;
-     width: 160px;
+     width: 166px;
     /*flex: 1 !important;*/
     display: flex;
     align-items: center;
@@ -918,7 +923,7 @@
     line-height: 22px;
     color: #1D1D1D;
     text-align: center;
-    margin: 15px;
+    margin: 12px;
 }
 .table_content_sortcell .tit.mt0{
     margin-top:0;

src/web/templates/frontRouter/pc/serviceSystem/free/index.html

@@ -88,63 +88,59 @@
                 <div class="foot_con_table serve_table">
                     <p class="middle_title">剑鱼标讯服务权益列表</p>
                     <div class="foot_table auto-w-1200">
-                        <div class="table_header_new he-150">
-                            <div class="sort_cell free_wite he-148">
+                        <div class="table_header_new he-120">
+                            <div class="sort_cell free_wite he-118">
                                 <span class="table_head_tit">服务分类</span>
                             </div>
-                            <div class="sort_cell free_wite he-148">
+                            <div class="sort_cell free_wite he-118">
                                 <span class="table_head_tit">服务项目</span>
                             </div>
-                            <div class="long_cell free_wite bl he-148 ">
+                            <div class="long_cell free_wite he-118 ">
                                 <span class="table_head_tit">服务说明</span>
                             </div>
-                            <div class="sort_cell free_wite he-148">
+                            <div class="sort_cell free_wite he-118">
                                 <span class="table_head_tit">免费</span>
                             </div>
-                            <div class="sort_cell_block serve_bg_blue he-148">
+                            <div class="sort_cell_block serve_bg_blue he-118">
                                 <span class="table_serve_head_text">超级订阅</span>
                                 <div class="cell_blue_btn" @click="goOpen('vip')">立即开通</div>
                             </div>
-                            <div class="sort_cell_block_nob  serve_bg_yellow he-148">
+                            <div class="sort_cell_block_nob  serve_bg_yellow he-118">
                                 <span class="table_serve_head_text2">大会员</span>
                                 <span class="table_head_tit_s">商机版2.0</span>
-                                <span class="table_head_tit_s">7999元/年</span>
                                 <div class="cell_blue_btn cell_btn_black" @click="consultation('0','商机版')">立即咨询</div>
                             </div>
-                            <div class="sort_cell_block_nob  serve_bg_yellow2 he-148">
+                            <div class="sort_cell_block_nob  serve_bg_yellow2 he-118">
                                 <span class="table_serve_head_text2">大会员</span>
                                 <span class="table_head_tit_s">专家版2.0</span>
-                                <span class="table_head_tit_s">19999元/年</span>
                                 <div class="cell_blue_btn cell_btn_black" @click="consultation('0','专家版')">立即咨询</div>
                             </div>
                         </div>
-                        <div class="table_header he-150">
-                            <div class="sort_cell free_wite he-148">
+                        <div class="table_header he-120">
+                            <div class="sort_cell free_wite he-118">
                                 <span class="table_head_tit">服务分类</span>
                             </div>
-                            <div class="sort_cell free_wite he-148">
+                            <div class="sort_cell free_wite he-118">
                                 <span class="table_head_tit">服务项目</span>
                             </div>
-                            <div class="long_cell free_wite bl he-148">
+                            <div class="long_cell free_wite he-118">
                                 <span class="table_head_tit">服务说明</span>
                             </div>
-                            <div class="sort_cell free_wite he-148">
+                            <div class="sort_cell free_wite he-118">
                                 <span class="table_head_tit">免费</span>
                             </div>
-                            <div class="sort_cell_block serve_bg_blue he-148">
+                            <div class="sort_cell_block serve_bg_blue he-118">
                                 <span class="table_serve_head_text">超级订阅</span>
                                 <div class="cell_blue_btn" @click="goOpen('vip')">立即开通</div>
                             </div>
-                            <div class="sort_cell_block_nob  serve_bg_yellow he-148">
+                            <div class="sort_cell_block_nob  serve_bg_yellow he-118">
                                 <span class="table_serve_head_text2">大会员</span>
                                 <span class="table_head_tit_s">商机版2.0</span>
-                                <span class="table_head_tit_s">7999元/年</span>
                                 <div class="cell_blue_btn cell_btn_black" @click="consultation('0','商机版')">立即咨询</div>
                             </div>
-                            <div class="sort_cell_block_nob  serve_bg_yellow2 he-148">
+                            <div class="sort_cell_block_nob  serve_bg_yellow2 he-118">
                                 <span class="table_serve_head_text2">大会员</span>
                                 <span class="table_head_tit_s">专家版2.0</span>
-                                <span class="table_head_tit_s">19999元/年</span>
                                 <div class="cell_blue_btn cell_btn_black" @click="consultation('0','专家版')">立即咨询</div>
                             </div>
                         </div>