From 7a87dd1efc1f3db64070862cb4f9c9e28f62849d Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Fri, 28 Aug 2020 15:08:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1cell?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service-list/commodity-cell.vue           | 92 +++++++++++--------
 src/pages/user/order/order_detail.vue         |  4 +-
 2 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/src/components/service-list/commodity-cell.vue b/src/components/service-list/commodity-cell.vue
index ad081ad..559a728 100644
--- a/src/components/service-list/commodity-cell.vue
+++ b/src/components/service-list/commodity-cell.vue
@@ -1,40 +1,37 @@
 <template>
   <div class="com_cell">
     <div class="com_cell_img_box">
-      <img
-        :src="cellData.cover"
-        class="com_cell_img"
-      />
+      <img :src="cellData.cover" class="com_cell_img" />
     </div>
     <div class="com_cell_message">
       <div class="com_cell_msg_title">
         {{ cellData.name }}
-        <span v-if="cellData.data_service_type1 == 6" class="tags map_service">mapService</span>
+        <span
+          v-if="cellData.data_service_type1 == 6"
+          class="tags map_service"
+        >mapService</span>
         <span v-if="cellData.openness == 1" class="tags shared">共享</span>
         <span v-else-if="cellData.openness ==  2" class="tags restricted">受限</span>
         <span v-else class="tags sensitive">敏感</span>
       </div>
-      <div class="com_cell_item">
-        <span class="com_cell_item_title">资源摘要：</span>
-        <span class="com_cell_data">{{ cellData.descript }}</span>
-      </div>
-      <div class="com_cell_item">
-        <span class="com_cell_item_title">提供机构：</span>
-        <span class="com_cell_data">{{ cellData.organization_name }}</span>
-      </div>
-      <div class="com_cell_item">
-        <span class="com_cell_item_title">数据领域：</span>
-        <span class="com_cell_data">{{ cellData.sectors_name }}</span>
-      </div>
-      <div class="com_cell_item">
-        <span class="com_cell_item_title">服务类型：</span>
-        <span
-          class="com_cell_data"
-        >{{ cellData.data_service_type1_name }}&nbsp;&nbsp;{{ cellData.data_service_type2_name }}&nbsp;&nbsp;{{ cellData.data_service_type3_name }}</span>
-      </div>
-      <div class="com_cell_item">
-        <span class="com_cell_item_title">更新时间：</span>
-        <span class="com_cell_data">{{ helper.dateStringTransform(cellData.update_date) }}</span>
+      <div class="message_block">
+        <div class="com_cell_item">
+          <div class="com_cell_data_detail">
+            <span class="detail_span">{{ cellData.descript }}</span>
+          </div>
+        </div>
+        <div class="com_cell_item">
+          <span class="com_cell_item_title">服务类型：</span>
+          <span
+            class="com_cell_data"
+          >{{ cellData.data_service_type1_name }}&nbsp;&nbsp;{{ cellData.data_service_type2_name }}&nbsp;&nbsp;{{ cellData.data_service_type3_name }}</span>
+          <span class="com_cell_item_title left_blank">数据领域：</span>
+          <span class="com_cell_data">{{ cellData.sectors_name }}</span>
+        </div>
+        <div class="com_cell_item">
+          <span class="com_cell_item_title">更新时间：</span>
+          <span class="com_cell_data">{{ helper.dateStringTransform(cellData.update_date) }}</span>
+        </div>
       </div>
     </div>
     <div class="com_cell_right">
@@ -61,7 +58,7 @@ export default {
   components: {},
   props: {
     url: { type: String, default: "" },
-    cellData: { type: Object, default: {} }
+    cellData: { type: Object, default: {} },
   },
   data: () => ({ helper: helper }),
   computed: {},
@@ -71,9 +68,9 @@ export default {
       if (this.url != "") {
         this.$router.push(this.url + "/" + parame);
       }
-    }
+    },
   },
-  mounted() {}
+  mounted() {},
 };
 </script>
 
@@ -85,8 +82,8 @@ export default {
   border-bottom: 2px #f4f7fc solid;
 }
 .com_cell_img_box {
-  width: 166px;
-  height: 166px;
+  width: 200px;
+  height: 200px;
   border-radius: 12px;
   overflow: hidden;
   border: 4px #f4f7fc solid;
@@ -97,34 +94,44 @@ export default {
 }
 .com_cell_message {
   padding-left: 20px;
-  width: calc(100% - 470px);
+  width: calc(100% - 500px);
 }
 .com_cell_msg_title {
   color: #0d1847;
   font-size: 18px;
   line-height: 30px;
   font-weight: 700;
-  margin-bottom: 6px;
+  margin-bottom: 10px;
 }
 .com_cell_item {
   font-size: 14px;
-  line-height: 26px;
+  line-height: 28px;
   margin-top: 1px;
   color: #8890a7;
   display: flex;
   align-self: start;
 }
 .com_cell_item_title {
-  width: 80px;
+  /* width: 80px; */
 }
 .com_cell_data {
   display: inline-block;
-  width: calc(100% - 90px);
   color: #242c43;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.com_cell_data_detail {
+  color: #242c43;
+  height: 78px;
+  font-size: 16px;
+}
+.detail_span {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+}
 .com_cell_right {
   width: 300px;
   padding: 25px 0 0 50px;
@@ -150,13 +157,13 @@ export default {
 .tags {
   display: inline-block;
   margin-left: 10px;
-  padding: 1px 8px 2px;
+  padding: 2px 10px 3px;
   font-size: 12px;
   font-weight: 500;
   line-height: 12px;
   border-radius: 4px;
   position: relative;
-  top: -2px;
+  top: -1px;
 }
 .map_service {
   background-color: #626de9;
@@ -178,6 +185,15 @@ export default {
   border: solid 1px #d7a4a9;
   color: #e15260;
 }
+.message_block {
+  width: 80%;
+  padding: 10px 20px;
+  background-color: #f8f9fd;
+  border-radius: 10px;
+}
+.left_blank {
+  margin-left: 20px;
+}
 </style>
 <style>
 .com_cell_right .el-rate__text {
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index 44b69a3..762723c 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -172,13 +172,13 @@
             <div v-else-if="orderDetail.order_type == 2">
               <div>
                 <span class="detail_service_specification_gg">规格：</span>
-                <span class="detail_service_specification_val">申请获取应用镜像部署权限</span>
+                <span class="detail_service_specification_val">{{ orderDetail.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}</span>
               </div>
             </div>
             <div v-else-if="orderDetail.order_type == 3">
               <div>
                 <span class="detail_service_specification_gg">类型：</span>
-                <span class="detail_service_specification_val">申请新的工作区域</span>
+                <span class="detail_service_specification_val">{{ orderDetail.apply_type == 0 ? "申请新的工作区域" : "升级现有工作区域" }}</span>
               </div>
             </div>
           </el-col>
-- 
2.26.0