1.调整我的订单页面样式

src/views/assets/myOrder.vue

@@ -5,27 +5,28 @@
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
       <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getMyOrder()">
         <div class="card" v-for="item in listData" :key="item.id" @click="toDetail(item)">
-          <h3>
+          <div class="businessTitle">
             <van-icon name="link-o" />
-            &nbsp;{{ item.orderId }}
-          </h3>
-          <p class="productionNo" v-if="item.statementNo || item.reportNo">
+            {{ item.orderId }}
+          </div>
+          <div class="productionNo" v-if="item.statementNo || item.reportNo">
             <van-icon name="coupon-o" />
-            &nbsp;
             {{ item.statementNo }}
             <!-- 产品号都不为空才显示中间的分割空格, 以保持页面间距统一 -->
             <span v-if="item.statementNo && item.reportNo">&nbsp;&nbsp;</span>
             {{ item.reportNo }}
-          </p>
-          <p class="projectName">
-            <van-icon name="location-o" />
-            &nbsp;{{ item.reportName || item.statementName || item.name }}
-          </p>
-          <p>
+          </div>
+          <div class="projectName">
+            <div>
+              <van-icon name="location-o" />
+              {{ item.reportName || item.statementName || item.name }}
+            </div>
+          </div>
+          <div>
             <van-tag type="primary" size="medium" class="van-tag">{{ item.currentNodeName }}</van-tag>
             <van-tag type="success" size="medium" class="van-tag">{{ item.clientManagerName }}</van-tag>
             <van-tag color="#969799" size="medium" class="van-tag">{{ item.created }}</van-tag>
-          </p>
+          </div>
         </div>
       </van-list>
     </van-pull-refresh>
@@ -131,7 +132,7 @@ export default {
 .card {
   background-color: white;
   border-radius: 5px;
-  padding: 16px;
+  padding: 10px;
   margin: 10px;
 }
 
@@ -142,9 +143,20 @@ export default {
 
 .projectName {
   width: 100%;
+  margin-bottom: 5px;
+  display: flex;
 }
 
 .van-tag {
   margin: 2px;
 }
+
+.businessTitle {
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+/deep/ .van-tabs__wrap {
+  width: 100%;
+}
 </style>

src/views/home/components/Tabbar.vue

@@ -31,7 +31,6 @@ export default {
   methods: {
     // 导航切换
     onChange() {
-      console.log(this.active);
       this.tabStore.setTabInfo(this.active);
       switch (this.active) {
         case 'home':

src/views/land/myOrder.vue

@@ -5,19 +5,21 @@
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
       <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getMyOrder()">
         <div class="card" v-for="item in listData" :key="item.id" @click="toDetail(item)">
-          <h3>
+          <div class="businessTitle">
             <van-icon name="link-o" />
-            &nbsp;{{ item.businessNo }}
-          </h3>
-          <p class="projectName">
-            <van-icon name="location-o" />
-            &nbsp;{{ item.name }}
-          </p>
-          <p>
+            {{ item.businessNo }}
+          </div>
+          <div class="projectName">
+            <div>
+              <van-icon name="location-o" />
+              {{ item.name }}
+            </div>
+          </div>
+          <div>
             <van-tag type="primary" size="medium" class="van-tag">{{ item.cateName }}</van-tag>
-            <van-tag type="success" size="medium" class="van-tag">{{ item.businessSourceName     }}</van-tag>
+            <van-tag type="success" size="medium" class="van-tag">{{ item.businessSourceName }}</van-tag>
             <van-tag color="#969799" size="medium" class="van-tag">{{ item.clientUnit }}</van-tag>
-          </p>
+          </div>
         </div>
       </van-list>
     </van-pull-refresh>
@@ -80,9 +82,7 @@ export default {
         this.loading = false;
       });
     },
-    toDetail(item) {
-      
-    },
+    toDetail(item) {},
   },
 };
 </script>
@@ -91,20 +91,26 @@ export default {
 .card {
   background-color: white;
   border-radius: 5px;
-  padding: 16px;
+  padding: 10px;
   margin: 10px;
 }
 
-.productionNo {
-  width: 100%;
-  font-size: 14px;
-}
-
 .projectName {
   width: 100%;
+  margin-bottom: 5px;
+  display: flex;
 }
 
 .van-tag {
   margin: 2px;
 }
+
+.businessTitle {
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+/deep/ .van-tabs__wrap {
+  width: 100%;
+}
 </style>

src/views/major/myOrder.vue

@@ -5,20 +5,21 @@
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
       <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getMyOrder()">
         <div class="card" v-for="item in listData" :key="item.id" @click="toDetail(item)">
-          <h3>
+          <div class="businessTitle">
             <van-icon name="link-o" />
-            &nbsp;{{ item.orderId }}
-          </h3>
-          <p class="productionNo" v-if="item.productionNo">
+            {{ item.orderId }}
+          </div>
+          <div class="productionNo" v-if="item.productionNo">
             <van-icon name="coupon-o" />
-            &nbsp;
             {{ item.productionNo }}
-          </p>
-          <p class="projectName">
-            <van-icon name="location-o" />
-            &nbsp;{{ item.orderName }}
-          </p>
-          <p>
+          </div>
+          <div class="projectName">
+            <div>
+              <van-icon name="location-o" />
+              {{ item.orderName }}
+            </div>
+          </div>
+          <div>
             <van-tag type="primary" size="medium" class="van-tag">
               {{ item.production ? (item.production === 'REPORT' ? '报告' : (item.production === 'STATEMENT' ? '意见书' :
               '复评函'
@@ -29,7 +30,7 @@
             <van-tag type="success" :color="item.repertoryState === '未入库' ? '#969799' : ''" size="medium" class="van-tag">{{ item.repertoryState }}</van-tag>
             <van-tag type="success" :color="!item.delivery ? '#969799' : ''" size="medium" class="van-tag">{{ item.delivery ? '已送达' : '未送达' }}</van-tag>
             <van-tag type="success" :color="item.edeclareResult === null ? '#969799' : ''" size="medium" class="van-tag">{{ item.edeclareResult==null ? '未申报' : item.edeclareResult }}</van-tag>
-          </p>
+          </div>
         </div>
       </van-list>
     </van-pull-refresh>
@@ -96,7 +97,7 @@ export default {
       const detailInfo = {
         orderId: item.orderId,
         name: item.orderName,
-        productionType: item.production ? (item.production === 'REPORT' ? '报告' : (item.production === 'STATEMENT' ? '意见书' : '复评函' )) : '订单',
+        productionType: item.production ? (item.production === 'REPORT' ? '报告' : item.production === 'STATEMENT' ? '意见书' : '复评函') : '订单',
         productionNo: item.productionNo,
         nodeName: item.currentNodeName,
         clientManager: item.clientManager,
@@ -111,9 +112,9 @@ export default {
         repertoryState: item.repertoryState,
         delivery: item.delivery ? '已送达' : '未送达',
         deliveryDate: item.deliveryDate,
-        mdeclareResult: item.mdeclareResult==null ? '未申报' : item.mdeclareResult,
-        edeclareResult: item.edeclareResult==null ? '未申报' : item.edeclareResult,
-      }
+        mdeclareResult: item.mdeclareResult == null ? '未申报' : item.mdeclareResult,
+        edeclareResult: item.edeclareResult == null ? '未申报' : item.edeclareResult,
+      };
       this.$router.push({
         path: `/index/major/detail`,
         query: {
@@ -129,7 +130,7 @@ export default {
 .card {
   background-color: white;
   border-radius: 5px;
-  padding: 16px;
+  padding: 10px;
   margin: 10px;
 }
 
@@ -140,12 +141,20 @@ export default {
 
 .projectName {
   width: 100%;
-  /* overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis; */
+  margin-bottom: 5px;
+  display: flex;
 }
 
 .van-tag {
   margin: 2px;
 }
+
+.businessTitle {
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+/deep/ .van-tabs__wrap {
+  width: 100%;
+}
 </style>

src/views/personal/myOrder.vue

@@ -5,23 +5,25 @@
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
       <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getMyOrder()">
         <div class="card" v-for="item in listData" :key="item.id" @click="toDetail(item)">
-          <h3>
+          <div class="businessTitle">
             <van-icon name="link-o" />
-            &nbsp;{{ item.orderId }}
-          </h3>
-          <p class="projectName">
-            <van-icon name="location-o" />
-            &nbsp;{{ item.orderName }}
-          </p>
-          <p>
+            {{ item.orderId }}
+          </div>
+          <div class="projectName">
+            <div>
+              <van-icon name="location-o" />
+              {{ item.orderName }}
+            </div>
+          </div>
+          <div>
             <van-icon name="contact-o" />
-            &nbsp;{{ item.clientName }}-{{ item.clientSubName}}
-          </p>
-          <p>
+            {{ item.clientName }}-{{ item.clientSubName}}
+          </div>
+          <div>
             <van-tag type="primary" size="medium" class="van-tag">{{ item.acreage ? item.acreage : '-' }} 平</van-tag>
             <van-tag type="success" size="medium" class="van-tag">{{ item.price ? item.price : '-' }} 元/平</van-tag>
             <van-tag color="#969799" size="medium" class="van-tag">{{ item.amount ? item.amount / 10000 : '-' }} 万元</van-tag>
-          </p>
+          </div>
         </div>
       </van-list>
     </van-pull-refresh>
@@ -101,7 +103,7 @@ export default {
         realAmount: item.realAmount,
         shouldAmount: item.shouldAmount,
         invoiceAmount: item.invoiceAmount,
-        created: item.created
+        created: item.created,
       };
       this.$router.push({
         path: `/index/personal/detail`,
@@ -118,20 +120,26 @@ export default {
 .card {
   background-color: white;
   border-radius: 5px;
-  padding: 16px;
+  padding: 10px;
   margin: 10px;
 }
 
-.productionNo {
-  width: 100%;
-  font-size: 14px;
-}
-
 .projectName {
   width: 100%;
+  margin-bottom: 5px;
+  display: flex;
 }
 
 .van-tag {
   margin: 2px;
 }
+
+.businessTitle {
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+/deep/ .van-tabs__wrap {
+  width: 100%;
+}
 </style>