Merge branch 'zj' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/components/table-um.vue

@@ -184,7 +184,7 @@
               {{ [1,2,3].indexOf(scope.row[item.prop])!==-1?'':scope.row[item.prop] }}
             </span>
             <!-- 服务添加图标 -->
-            <span v-else-if="item.type === 'hot'" :style="scope.row['hot']?{marginLeft:'-12px'}:{}">
+            <span v-else-if="item.type === 'hot'" :style="scope.row['hot']?{marginLeft:'-10px'}:{paddingLeft:'2px'}">
               <img src="../assets/imgs/list_ic_hot.png" alt="" v-if="scope.row['hot']">
               {{ scope.row[item.prop] }}
             </span>

src/pages/apply_app_detail.vue

@@ -23,6 +23,7 @@
         </div>
         <div class="type_box_select">
           <info-list
+          @download="download"
             :list_arr="
               now_service == 0
                 ? list_arr
@@ -226,7 +227,7 @@ export default {
         {
           title: "申请文件：",
           info: "",
-          url:"",
+          url:"1111",
           type:"down"
         },
         {
@@ -261,6 +262,9 @@ export default {
   },
   mounted() {},
   methods: {
+    download(val){
+        console.log(val);
+    },
     getServiceapplyInfo() {
       this.$http
         .get("/static/applyappdetail.json")
@@ -330,7 +334,7 @@ export default {
 .detail_contain {
   width: 100%;
   padding: 0 20px;
-  margin-bottom: 20px;
+  height: calc(100% - 55px);
 }
 .info_contain {
   padding: 25px 20px;
@@ -338,6 +342,8 @@ export default {
   width: 100%;
   box-shadow: 0px 3px 6px 0px #f4f7fc;
   border-radius: 12px;
+  min-height: calc(100% - 20px);
+  margin-bottom: 20px;
 }
 .now_page_title {
   margin: 15px 0;

src/pages/approval_app_detail.vue

@@ -17,7 +17,7 @@
           >{{item}}</div>
         </div>
         <div class="type_box_select">
-          <info-list :list_arr="now_service==0?list_arr:servicead_arr[now_user]">
+          <info-list @download="download" :list_arr="now_service==0?list_arr:servicead_arr[now_user]">
             <table-um :headers="header_arr" url="params_arr" slot="zd_table"></table-um>
             <process-card type="approval" :data="approval_arr[now_user]" slot="sp_card"></process-card>
             <div class="info_contain1" slot="sp_result">
@@ -232,6 +232,9 @@ export default {
   },
   mounted() {},
   methods: {
+      download(val){
+          console.log(val);
+      },
       getapplyinfo(){
         this.$http
         .get("/static/approvalappdetail.json")