Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

front/src/router/index.js

@@ -453,6 +453,15 @@ export const constantRoutes = [
       icon: 'error-warning-line',
     },
   },
+  {
+    path: '/packagingDetails',
+    name: 'packagingDetails',
+    component: () => import('@/views/home/packagingDetails'),
+    meta: {
+      title: '打包模式详情',
+      icon: 'error-warning-line',
+    },
+  },
   {
     path: '/integrationServices',
     name: 'integrationServices',

front/src/views/home/components/searchResultList.vue

@@ -11,75 +11,42 @@
       </div>
       <div class="condition" :key="showKey">
         <ul v-if="selectCardsname === '融合服务'">
-          <li
+          <li v-for="(item, i) in orderList" :key="item.value" @click="changeOrder(i, item.value, item.orderType)">
-            v-for="(item, i) in orderList"
-            :key="item.value"
-            @click="changeOrder(i, item.value, item.orderType)"
-          >
             {{ item.name }}
-            <span
+            <span class="arrow" :class="item.orderType == 'ASC' ? 'down' : ''"></span>
-              class="arrow"
-              :class="item.orderType == 'ASC' ? 'down' : ''"
-            ></span>
           </li>
         </ul>
         <ul v-else>
-          <li
+          <li v-for="item in selList" :key="item.value" @click="changeCondition(item.value)" v-show="
-            v-for="item in selList"
-            :key="item.value"
-            @click="changeCondition(item.value)"
-            v-show="
             item.show &&
             item.name !== '评分' &&
             selectCardsname !== '数据资源'
-            "
+          ">
-          >
             {{ item.name }}
-            <span
+            <span class="arrow" :class="item.value == selData ? 'down' : ''"></span>
-              class="arrow"
-              :class="item.value == selData ? 'down' : ''"
-            ></span>
           </li>
         </ul>
       </div>
     </div>
-    <div
+    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
-      class="result-list"
-      v-for="(item, index) in resourceList.data"
-      :key="item.index"
-    >
       <div class="item" :key="showKey">
-        <div
+        <div class="left" style="display: flex; align-items: center" v-if="
-          class="left"
-          style="display: flex; align-items: center"
-          v-if="
           item.type === '应用资源' &&
           item.infoList &&
           item.infoList.filter((val) => val.attrType == '应用图片')[0]
-          "
+        ">
-        >
+          <a-image :width="106" :preview="false" :src="
-          <a-image
-            :width="106"
-            :preview="false"
-            :src="
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
               .attrValue
-            "
+          " />
-          />
         </div>
-        <div class="left"
+        <div class="left" style="display: flex;
-          style="display: flex;
           align-items: center"
           v-else-if="selectCardsname === '融合服务' && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
-            <a-image
+          <a-image :width="106" :preview="false"
-              :width="106"
+            :src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue" />
-              :preview="false"
-              :src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue"
-            />
         </div>
-        <div
+        <div class="left" :class="
-          class="left"
-          :class="
           item.type == '应用资源'
             ? 'yyzy'
             : !item.type
@@ -104,55 +71,36 @@
                           .attrValue == '业务组件'
                         ? 'ywzj'
                         : ''
-          "
+        " v-else-if="
-          v-else-if="
   selectCardsname !== '基础设施' && selectCardsname !== '融合服务'
-          "
+"></div>
-        ></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
         <div class="left rhfw" v-else-if="selectCardsname === '融合服务'"></div>
         <div class="right">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
-              <svg
+              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
-                t="1652322568870"
+                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="item.applyState == '通过'"
-                class="icon"
+                style="margin-left: 10px">
-                viewBox="0 0 3072 1024"
-                version="1.1"
-                xmlns="http://www.w3.org/2000/svg"
-                p-id="3062"
-                width="40"
-                height="40"
-                v-if="item.applyState == '通过'"
-                style="margin-left: 10px"
-              >
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06"
+                  fill="#d81e06" p-id="3063"></path>
-                  p-id="3063"
-                ></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06"
+                  fill="#d81e06" p-id="3064"></path>
-                  p-id="3064"
-                ></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06"
+                  fill="#d81e06" p-id="3065"></path>
-                  p-id="3065"
-                ></path>
               </svg>
             </span>
             <div class="header-right">
-              <div v-if="selectCardsname === '融合服务'"
+              <div v-if="selectCardsname === '融合服务'" class="label-content">
-                class="label-content">
+                <template v-if="item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0]">
-                <template v-if="item.fuseAttrList && item.fuseAttrList.filter((val)=>val.attrType=='应用领域')[0]">
                   <span class="label"
-                    v-for="(data, index) in item.fuseAttrList.filter((val)=>val.attrType=='应用领域')[0].attrValue.split(';')"
+                    v-for="(data, index) in item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0].attrValue.split(';')"
-                    :key="index"
+                    :key="index">
-                  >
+                    {{ data }}
-                    {{data}}
                   </span>
                 </template>
               </div>
@@ -183,19 +131,13 @@
             >
               <span>{{ item.shareType || '--' }}</span>
             </div> -->
-            <div
+            <div v-if="
-              v-if="
               selectCardsname !== '融合服务' && selectCardsname !== '基础设施'
-              "
+            ">
-            >
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div
+          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
-            v-if="selectCardsname !== '基础设施'"
-            style="margin-top: 0.1rem"
-            class="description"
-          >
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -204,29 +146,23 @@
           <div class="btn">
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
-                <div
+                <div v-if="
-                  v-if="
                   selectCardsname !== '数据资源' &&
                   selectCardsname !== '融合服务'
-                  "
+                ">
-                >
                   浏览量：{{ item.visits || 0 }}次
                 </div>
-                <div
+                <div v-if="
-                  v-if="
                   selectCardsname !== '数据资源' &&
                   selectCardsname !== '融合服务' &&
                   (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                  "
+                ">
-                >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div
+                <div v-if="
-                  v-if="
                   selectCardsname === '数据资源' &&
                   selectCardsname !== '融合服务'
-                  "
+                ">
-                >
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -245,56 +181,28 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template
+                <template v-if="
-                  v-if="
                   selectCardsname == '组件服务' ||
                   (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                  "
+                ">
-                >
+                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
-                  <span
+                  <span class="shopping-on" v-else @click="addShoppingCart(item, index)"></span>
-                    class="shopping-down"
-                    v-if="item.isInShoppingCart"
-                  ></span>
-                  <span
-                    class="shopping-on"
-                    v-else
-                    @click="addShoppingCart(item, index)"
-                  ></span>
                 </template>
               </div>
               <div class="sc">
-                <span
+                <span class="sc-down" v-if="item.isCollect == 'false'" @click="addCollect(item)"></span>
-                  class="sc-down"
+                <span class="sc-on" v-if="item.isCollect == 'true'" @click="addCollect(item)"></span>
-                  v-if="item.isCollect == 'false'"
-                  @click="addCollect(item)"
-                ></span>
-                <span
-                  class="sc-on"
-                  v-if="item.isCollect == 'true'"
-                  @click="addCollect(item)"
-                ></span>
               </div>
-              <div
+              <div class="shopping pk" :key="pk" v-show="
-                class="shopping pk"
-                :key="pk"
-                v-show="
                 cardType == '组件服务' && findComponentName(item, '智能算法')
-                "
+              ">
-              >
                 <span class="pk-on" @click="goComparePk(item, index)"></span>
               </div>
-              <a-button
+              <a-button type="primary" @click="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
-                type="primary"
-                @click="toView('details', item)"
-                v-if="!whoShow1.itShowBaoTou"
-              >
                 查看详情
               </a-button>
-              <a-button
+              <a-button style="margin-left: 10px" v-show="selectCardsname === '融合服务'"
-                style="margin-left: 10px"
+                @click="handleAKeyApplication(item)">
-                v-show="selectCardsname === '融合服务'"
-                @click="handleAKeyApplication(item)"
-              >
                 一键申请
               </a-button>
               <!-- <a-button
@@ -305,14 +213,10 @@
               >
                 免费试用
               </a-button> -->
-              <a-button
+              <a-button type="primary" @click="toView('apply', item)" v-show="
-                type="primary"
-                @click="toView('apply', item)"
-                v-show="
                 cardType == '组件服务' ||
                 (cardType == '应用资源' && whoShow1.itShowQingDao)
-                "
+              ">
-              >
                 {{
                     item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
@@ -327,12 +231,7 @@
         </div>
       </div>
     </div>
-    <a-modal
+    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
-      v-model:visible="visible"
-      title="视频预览"
-      :width="750"
-      destroyOnClose
-    >
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -343,20 +242,20 @@
   </div>
 </template>
 <script>
-  import { ref, reactive } from 'vue'
+import { ref, reactive } from 'vue'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  import { getUser, sgcInsert } from '@/api/home'
+import { getUser, sgcInsert } from '@/api/home'
-  import { scInsert, scDel } from '@/api/personalCenter'
+import { scInsert, scDel } from '@/api/personalCenter'
-  import mybus from '@/myplugins/mybus'
+import mybus from '@/myplugins/mybus'
-  import { getHls } from '@/api/home.js'
+import { getHls } from '@/api/home.js'
-  export default {
+export default {
   name: '',
   // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
   props: {
     resourceList: {
       type: Object,
-        default: () => {},
+      default: () => { },
     },
     resourceTotal: {
       type: String,
@@ -553,6 +452,14 @@
           )
         }
       } else if (props.selectCardsname === '融合服务') {
+        // 打包模式
+        router.push({
+          path: '/packagingDetails',
+          query: {
+            id: item.id,
+          },
+        })
+      } else if (props.selectCardsname === '赋能场景') {
         router.push({
           path: '/integrationServicesDetails',
           query: {
@@ -683,7 +590,7 @@
     // 融合服务--一键申请
     const handleAKeyApplication = (item) => {
       let _applyList = []
-        ;(item.fuseResourceList || []).map((v) => {
+        ; (item.fuseResourceList || []).map((v) => {
           let resource = v.resource || {}
           let obj = {
             arr: [
@@ -812,13 +719,14 @@
     mybus.off('chongzhi')
     // mybus.emit('changeSelcted')
   },
-  }
+}
 </script>
 <style scoped lang="less">
-  #search-result-list-container {
+#search-result-list-container {
   width: 1088px;
   padding: 0 20px;
   background: #f3f5f9;
+
   .detail-content {
     // 超出
     white-space: nowrap;
@@ -827,6 +735,7 @@
     width: 130px;
     display: inline-block;
   }
+
   .shai-xuan {
     width: 1047px;
     height: 36px;
@@ -836,6 +745,7 @@
     display: flex;
     align-items: center;
     position: relative;
+
     .circle {
       width: 16px;
       height: 16px;
@@ -846,24 +756,30 @@
       line-height: 16px;
       margin-right: 21px;
     }
+
     .result {
       font-size: 14px;
       font-weight: 500;
       color: #212121;
+
       span {
         font-size: 18px;
         color: #0087ff;
       }
     }
+
     .condition {
       position: absolute;
       right: 20px;
       top: 10px;
+
       ul li {
         list-style-type: none;
       }
+
       ul {
         display: flex;
+
         li {
           width: 90px;
           height: 12px;
@@ -872,6 +788,7 @@
           display: flex;
           justify-content: center;
           align-items: center;
+
           .arrow {
             display: inline-block;
             width: 12px;
@@ -879,6 +796,7 @@
             background: url('~@/assets/newHome/arrow.png');
             margin-left: 10px;
           }
+
           .down {
             background: url('~@/assets/newHome/down.png');
             margin-top: 6px;
@@ -887,6 +805,7 @@
       }
     }
   }
+
   .result-list {
     width: 1048px;
     display: flex;
@@ -895,72 +814,89 @@
     border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
     border-top: 1px rgba(150, 144, 144, 0.3) solid;
     padding: 10px 0;
+
     .item {
       width: 100%;
       margin-top: 10px;
       display: flex;
       align-items: center;
+
       .left {
         display: inline-block;
         width: 120px;
         height: 110px;
         margin-right: 16px;
       }
+
       .right {
         width: 100%;
       }
+
       .yyzy {
         background: url('~@/assets/home/yyzy_square.png') no-repeat;
         background-size: 100%;
       }
+
       .sjzy {
         background: url('~@/assets/home/sjzy_square.png') no-repeat;
         background-size: 100%;
       }
+
       .znsf {
         background: url('~@/assets/home/znsf_square.png') no-repeat;
         background-size: 100%;
       }
+
       .tcfw {
         background: url('~@/assets/home/tcfw_square.png') no-repeat;
         background-size: 100%;
       }
+
       .kfzj {
         background: url('~@/assets/home/kfzj_square.png') no-repeat;
         background-size: 100%;
       }
+
       .ywzj {
         background: url('~@/assets/home/ywzj_square.png') no-repeat;
         background-size: 100%;
       }
+
       .rhfw {
         background: url('~@/assets/home/rhfw_square.png') no-repeat;
         background-size: 100%;
       }
+
       .jcss {
         background: url('~@/assets/home/sxt_square.png') no-repeat;
         background-size: 100%;
       }
+
       .header {
         display: flex;
         justify-content: space-between;
         align-items: center;
         margin: 0 10px 0 0;
+
         .header-right {
           display: flex;
           font-size: 14px;
           color: #212121;
+
           span {
             font-size: 14px;
             color: #212121;
           }
+
           div {
             margin-right: 24px;
           }
+
           .label-content {
             flex: 1;
             display: flex;
             justify-content: flex-end;
+
             .label {
               padding: 0.01rem 0.1rem;
               margin-right: 0.1rem;
@@ -969,17 +905,20 @@
             }
           }
         }
+
         .header-right:last-child {
           div {
             margin-right: 16px;
           }
         }
+
         span {
           font-size: 20px;
           font-weight: 600;
           // color: #0087ff;
         }
       }
+
       .dec {
         overflow: hidden;
         text-overflow: ellipsis;
@@ -987,12 +926,14 @@
         color: #0058e1;
         display: flex;
         margin-top: 10px;
+
         div {
           margin-right: 10px;
           background: rgba(0, 88, 225, 0.1);
           padding-left: 10px;
           padding-right: 10px;
         }
+
         div:nth-child(2) {
           max-width: 200px;
           display: -webkit-box;
@@ -1007,11 +948,13 @@
           word-break: break-all;
         }
       }
+
       .btn {
         display: flex;
         justify-content: space-between;
         font-size: 14px;
         margin: 5px 0;
+
         // .left {
         //   width: 600px;
         //   display: flex;
@@ -1031,6 +974,7 @@
           justify-content: flex-end;
           margin: 0 10px;
           align-items: center;
+
           .shopping {
             span {
               display: inline-block;
@@ -1039,14 +983,17 @@
               margin-right: 10px;
               margin-top: 5px;
             }
+
             .shopping-on {
               background: url('~@/assets/newHome/shopping-on.png');
               cursor: pointer;
             }
+
             .shopping-down {
               background: url('~@/assets/newHome/shopping-down.png');
             }
           }
+
           .pk-on {
             display: inline-block;
             height: 32px;
@@ -1057,17 +1004,20 @@
             background: url('~@/assets/newHome/pk-on.png');
             cursor: pointer;
           }
+
           .sc {
             // margin-top: 4px;
             cursor: pointer;
             display: flex;
             align-items: center;
+
             .sc-down {
               display: inline-block;
               height: 32px;
               width: 32px;
               background: url('~@/assets/newHome/sc-down.png');
             }
+
             .sc-on {
               display: inline-block;
               height: 32px;
@@ -1075,6 +1025,7 @@
               background: url('~@/assets/newHome/sc-on.png');
             }
           }
+
           .ant-btn {
             background: transparent;
             background: #0058e1;
@@ -1089,31 +1040,38 @@
             justify-content: center;
             margin-left: 10px;
           }
+
           .ant-btn:last-child {
             background: #0058e1;
             color: white;
           }
         }
       }
+
       .bottom {
         display: flex;
         justify-content: space-between;
         margin-top: 10px;
         align-items: center;
-          & > div {
+
+        &>div {
           display: flex;
           align-items: center;
-            & > div {
+
+          &>div {
             margin: 0 10px;
           }
         }
+
         .pingfen {
           :deep(span) {
             display: flex;
             align-items: center;
+
             :deep(ul) {
               display: flex;
               align-items: center;
+
               :deep(.ant-rate-star:not(:last-child)) {
                 margin-right: 4px;
               }
@@ -1122,12 +1080,14 @@
         }
       }
     }
+
     .item:nth-of-type(1) {
       margin-top: 0;
     }
   }
-  }
+}
-  .description {
+
+.description {
   max-width: 990px;
   height: 52px;
   font-size: 14px;
@@ -1141,5 +1101,5 @@
   /*超出显示为省略号*/
   -webkit-box-orient: vertical;
   word-break: break-all;
-  }
+}
 </style>

front/src/views/home/integrationServices.vue

@@ -5,11 +5,7 @@
     <div class="top">
       <div class="top-title">
         全部：
-        <div 
+        <div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
-          v-for="(item, index) in titleName" 
-          :key="index" 
-          class="tabAll" 
-          @click="changeCards(index)"
           :class="{ sel: index == number }">
           <span>{{ item.name }}</span>
         </div>
@@ -17,44 +13,20 @@
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
-      <searchResultList
+      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
-        v-show="resourceList.data && resourceList.data.length > 0"
+        :resourceList="resourceList" :resourceTotal="resourceTotal" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-        :key="listKey2"
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-        selectCardsname="融合服务"
-      />
       <div class="pagination">
-        <a-pagination
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          v-model:current="currentPage"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
-          v-model:pageSize="currentPageSize"
-          show-size-changer
-          show-less-items
-          show-quick-jumper
-          :total="resourceTotal"
-          :page-size-options="pageSizeOptions"
-          @change="pageChange"
-          @showSizeChange="onShowSizeChange"
-        />
       </div>
-      <div
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
-        v-if="resourceList.data && resourceList.data.length <= 0"
-        style="margin-top: 2rem"
-      >
         <a-empty />
       </div>
     </div>
@@ -62,17 +34,17 @@
   <home-footer></home-footer>
 </template>
 <script>
-  import HomeFooter from '@/views/newHome/components/Footer'
+import HomeFooter from '@/views/newHome/components/Footer'
-  import mybus from '@/myplugins/mybus'
+import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
 
-  import { getIntegrationServicesList } from '@/api/home.js'
+import { getIntegrationServicesList } from '@/api/home.js'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  import HomeHeader from '@/views/home/components/header'
+import HomeHeader from '@/views/home/components/header'
-  import searchResultList from '@/views/home/components/searchResultList.vue'
+import searchResultList from '@/views/home/components/searchResultList.vue'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
 
-  export default defineComponent({
+export default defineComponent({
   setup() {
     // 分页
     const loading = ref(true)
@@ -256,10 +228,10 @@
     mybus.off('refresh')
     mybus.off('changePage')
   },
-  })
+})
 </script>
 <style lang="less" scoped>
-  .resultListSearchInput-father {
+.resultListSearchInput-father {
   background: #f3f5f9;
   padding: 0.2rem;
 
@@ -276,9 +248,9 @@
       margin-top: 0.2rem;
     }
   }
-  }
+}
 
-  .resultListSearchInput {
+.resultListSearchInput {
   margin-left: 0.1rem;
 
   :deep(.ant-input) {
@@ -303,9 +275,9 @@
   :deep(.ant-input-group-addon) {
     left: 0 !important;
   }
-  }
+}
 
-  .button-reset {
+.button-reset {
   border: 0;
   outline: none;
   width: 0.8rem;
@@ -318,9 +290,9 @@
   line-height: 0.34rem;
   margin-left: 2.5rem;
   cursor: pointer;
-  }
+}
 
-  .details-pageconetent {
+.details-pageconetent {
   height: 100%;
   width: 100%;
   display: flex;
@@ -359,16 +331,19 @@
     .top-title {
       padding: 0.2rem;
       display: flex;
-        font-size: 22px;
+      font-size: 18px;
+
       .tabAll {
-          font-size: 22px;
+        font-size: 18px;
         color: #000000;
         margin-right: 35px;
         cursor: pointer;
       }
+
       .tabAll:nth-child(1) {
         margin-left: 20px;
       }
+
       .sel {
         font-weight: 600;
         color: #0087ff;
@@ -376,13 +351,13 @@
       }
     }
   }
-  }
+}
 
-  :deep(.ant-card-grid) {
+:deep(.ant-card-grid) {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
   -webkit-line-clamp: 1;
   word-break: break-all;
-  }
+}
 </style>

front/src/views/home/packagingDetails.vue

@@ -0,0 +1,153 @@
+<template>
+  <!-- 青岛 -->
+  <div class="details-pageconetent">
+    <home-header></home-header>
+    <div></div>
+    <home-footer></home-footer>
+  </div>
+
+</template>
+<script setup>
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+
+import { getIntegrationServicesList } from '@/api/home.js'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import { message } from 'ant-design-vue'
+
+
+</script>
+<style lang="less" scoped>
+.resultListSearchInput-father {
+  background: #f3f5f9;
+  padding: 0.2rem;
+
+  // padding-left: 0.2rem;
+  // padding-top: 0.2rem;
+  .resultListSearchInput-son {
+    background: #fff;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
+
+    .hengxian {
+      width: 100%;
+      height: 0.01rem;
+      background: rgba(150, 144, 144, 0.3);
+      margin-top: 0.2rem;
+    }
+  }
+}
+
+.resultListSearchInput {
+  margin-left: 0.1rem;
+
+  :deep(.ant-input) {
+    width: 4rem;
+    height: 0.36rem;
+    background: #fff;
+    border-radius: 0.04rem;
+  }
+
+  :deep(.ant-input-search-button) {
+    width: 0.8rem;
+    height: 0.36rem;
+    background: #0087ff;
+    border-radius: 0.04rem !important;
+    font-size: 0.14rem;
+    font-weight: 400;
+    color: #fff;
+    line-height: 0.34rem;
+    margin-left: 0.1rem;
+  }
+
+  :deep(.ant-input-group-addon) {
+    left: 0 !important;
+  }
+}
+
+.button-reset {
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
+    position: relative;
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    background: #f3f5f9;
+
+    .pagination {
+      background: #f3f5f9;
+      padding-bottom: 0.6rem;
+    }
+
+    .top-title {
+      padding: 0.2rem;
+      display: flex;
+      font-size: 18px;
+
+      .tabAll {
+        font-size: 18px;
+        color: #000000;
+        margin-right: 35px;
+        cursor: pointer;
+      }
+
+      .tabAll:nth-child(1) {
+        margin-left: 20px;
+      }
+
+      .sel {
+        font-weight: 600;
+        color: #0087ff;
+        border-bottom: 0.02rem solid #0087ff;
+      }
+    }
+  }
+}
+
+:deep(.ant-card-grid) {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+  word-break: break-all;
+}
+</style>