Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/capacitySquare/components/application.vue

@@ -32,7 +32,11 @@
             {{ val }}
           </div>
         </div>
+        
       </div>
+      <div class="bottom1">
+          共{{total}}项
+        </div>
     </div>
     <div class="item-box">
       <div class="item" v-for="item in data.list" :key="item.id">
@@ -64,6 +68,7 @@
   const area = ref(null)
   const typeName = ref('全市')
   const typeName2 = ref('全部')
+  const total = ref(0)
   if (selectArea && selectArea !== '全部') {
     typeName2.value = selectArea
     area.value = selectArea
@@ -131,6 +136,7 @@
       if (res.data.data.total.length < 9) {
         dom.removeEventListener('scroll', viewMonitor, true)
       }
+      total.value= res.data.data.total
       // appList
       res.data.data.appList.map((val) => {
         if (!val.pic) {
@@ -198,6 +204,12 @@
   }
   .application {
     padding: 0 0.15rem;
+    .bottom1 {
+      margin-top: 67px;
+      margin-left: 928px;
+      color: #fff;
+      font-size: 0.2rem;
+      }
     .select {
       margin: 0.1rem 0 0.1rem 0.2rem;
       color: #fff;
@@ -225,6 +237,7 @@
           background-size: 100%;
         }
       }
+     
       .bottom {
         cursor: pointer;
         position: absolute;

front/src/views/demandCenter/index.vue

@@ -175,6 +175,7 @@ const showDetail = (item) => {
     path: '/demandDetails',
     query: {
       id: item.id,
+      showKey:selectedKeys.value,
     },
   })
 }