From 5b03ea87a72eb92739914e71df7c0a609b0bb29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Thu, 12 Nov 2020 13:14:59 +0800
Subject: [PATCH] 1

---
 .../service-list/commodity-card.vue           | 14 ++++++++++++-
 .../service-list/commodity-cell.vue           | 14 ++++++++++++-
 src/components/service-list/service_list.vue  | 20 +++++++++++--------
 .../service-tab-specification.vue             | 16 +--------------
 src/components/service-tabs/service-tabs.vue  |  8 ++++----
 src/pages/service_shop/sjfwDetail.vue         |  1 +
 6 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/src/components/service-list/commodity-card.vue b/src/components/service-list/commodity-card.vue
index f1ac687..f369fd8 100644
--- a/src/components/service-list/commodity-card.vue
+++ b/src/components/service-list/commodity-card.vue
@@ -195,7 +195,8 @@ export default {
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   overflow: hidden;
-  height: 50px;
+  height: 42px;
+  margin-bottom: 8px;
 }
 .com_other {
   color: #58617a;
@@ -208,4 +209,15 @@ export default {
 .name_title {
   color: #8890a7;
 }
+</style>
+<style>
+.com_cell .el-rate__item .el-rate__icon {
+  font-size: 20px;
+  margin-right: 0;
+}
+.com_cell .el-rate__text {
+  margin-left: 4px;
+  position: relative;
+  top: 1px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/service-list/commodity-cell.vue b/src/components/service-list/commodity-cell.vue
index 8e1dab4..3346760 100644
--- a/src/components/service-list/commodity-cell.vue
+++ b/src/components/service-list/commodity-cell.vue
@@ -206,7 +206,8 @@ export default {
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   overflow: hidden;
-  height: 50px;
+  height: 42px;
+  margin-bottom: 8px;
 }
 .com_other {
   color: #58617a;
@@ -219,4 +220,15 @@ export default {
 .name_title {
   color: #8890a7;
 }
+</style>
+<style>
+.com_cell .el-rate__item .el-rate__icon {
+  font-size: 20px;
+  margin-right: 0;
+}
+.com_cell .el-rate__text {
+  margin-left: 4px;
+  position: relative;
+  top: 1px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list.vue
index 44bca2f..3bf7b06 100644
--- a/src/components/service-list/service_list.vue
+++ b/src/components/service-list/service_list.vue
@@ -23,7 +23,7 @@
         ></el-input>
       </div>
     </div>
-    <block-radius :borRadius="12">
+    <block-radius :borRadius="12" :paddingNum="0">
       <!-- filter -->
       <div v-if="urlFilter" class="classification">
         <div
@@ -656,6 +656,9 @@ export default {
   height: 1px;
   background-color: #e9ecf3;
 }
+.classification {
+  padding: 12px 16px 12px 32px;
+}
 .classification_line {
   width: 100%;
 }
@@ -667,19 +670,19 @@ export default {
 .classification_line_title {
   display: inline-block;
   width: 90px;
-  padding: 15px 0;
+  padding: 12px 0;
   text-align: left;
   color: #8890a7;
   font-size: 12px;
 }
 .classification_line_items {
-  width: calc(100% - 130px);
+  width: calc(100% - 90px);
 }
 .classification_line_items_border {
   border-bottom: 1px #e9ecf3 solid;
 }
 .classification_line_hid {
-  height: 46px;
+  height: 40px;
   width: 100%;
   overflow: hidden;
   display: inline-flex;
@@ -692,12 +695,12 @@ export default {
 }
 .classification_line_items_ul {
   display: inline-block;
-  width: calc(100% - 50px);
+  width: calc(100% - 30px);
   font-size: 0;
 }
 .classification_line_items_li {
   display: inline-block;
-  padding: 15px 20px;
+  padding: 12px 18px;
   font-size: 12px;
 }
 .classification_line_items_li_act {
@@ -729,9 +732,10 @@ export default {
 .classification_line_items_open {
   display: inline-block;
   width: 60px;
-  padding: 15px 0;
+  padding: 12px 0;
   cursor: pointer;
   font-size: 12px;
+  text-align: right;
 }
 .classification_children_ul {
   display: inline-block;
@@ -741,7 +745,7 @@ export default {
 }
 .classification_children_li {
   display: inline-block;
-  padding: 15px 20px;
+  padding: 12px 18px;
   color: #58617a;
 }
 .button_filter {
diff --git a/src/components/service-tabs/service-tab-specification.vue b/src/components/service-tabs/service-tab-specification.vue
index 55afa63..47d688e 100644
--- a/src/components/service-tabs/service-tab-specification.vue
+++ b/src/components/service-tabs/service-tab-specification.vue
@@ -1,9 +1,5 @@
 <template>
   <div class="service_tab-specification" v-if="data">
-    <div class="specification_header">
-      <p>申请方式：</p>
-      <type-group v-model="type" :types="types"></type-group>
-    </div>
     <el-table class="specification_table" :data="tableData" :border="false">
       <el-table-column width="30"></el-table-column>
       <el-table-column prop="name" label="规格" width="360"></el-table-column>
@@ -21,22 +17,12 @@ export default {
   },
   props: {
     data: {
-      type: Array,
+      type: Object,
       required: true,
     },
   },
   data: () => ({
     type: 1,
-    types: [
-      {
-        name: "按月",
-        value: 1,
-      },
-      {
-        name: "按年",
-        value: 2,
-      },
-    ],
   }),
   computed: {
     tableData() {
diff --git a/src/components/service-tabs/service-tabs.vue b/src/components/service-tabs/service-tabs.vue
index 30a7505..93093f4 100644
--- a/src/components/service-tabs/service-tabs.vue
+++ b/src/components/service-tabs/service-tabs.vue
@@ -17,11 +17,11 @@
     <el-tab-pane
       :label="specificationTitle"
       name="specification"
-      v-if="specificationData"
+      v-if="serviceRequestSpcs"
     >
       <service-tab-specification
         class="service_info"
-        :data="specificationData"
+        :data="serviceRequestSpcs"
       ></service-tab-specification>
     </el-tab-pane>
 
@@ -78,8 +78,8 @@ export default {
     detailData: {
       type: Array,
     },
-    specificationData: {
-      type: Array,
+    serviceRequestSpcs: {
+      type: Object,
     },
     providerData: {
       type: Object,
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 13032e0..623a94b 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -16,6 +16,7 @@
       :detail-data="detailData"
       :provider-data="providerData"
       :comments-data="commentsData"
+      :serviceRequestSpcs="serviceRequestSpcs"
       :comments-url="commentsUrl"
     ></service-tabs>
   </div>
-- 
2.26.0