Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master

queenwuli

2020-12-24 c25e12565ad5c737692f9af61ffd1f965f4491bd

 hive-app/pages/workbench/orderList.vue

@@ -18,7 +18,7 @@
            }"
         />
         <view class="list">
            <view class="list-item" v-for="item in 4">
            <navigator url="./orderDetail" class="list-item" v-for="item in 4">
               <view class="list-header">
                  <text>订单号: N202012123556</text>
                  <text class="blue">待付款</text>
@@ -42,7 +42,7 @@
               <view class="list-footer">
                  <text class="blue-btn small-btn">取消订单</text>
               </view>
            </view>
            </navigator>
         </view>
      </view>
   </view>
@@ -86,7 +86,7 @@
      background: #F6F6F8;
   }
   .header{
      padding: 10px;
      padding: 10px 10px 5px;
      background: #FFFFFF;
   }
   .tab{
@@ -99,25 +99,26 @@
      margin: 10px;
      color: #3a3f3f;
      border: 1px solid #EDEAF4;
      padding: 0 10px;
   }
   .list-header{
      display: flex;
      justify-content: space-between;
      padding: 12px 15px;
      padding: 12px 0;
      font-size: 15px;
      border-bottom: 1px solid #EDEAF4;
   }
   .list-content{
      display: flex;
      justify-content: space-between;
      padding: 12px 15px;
      padding: 12px 0;
      font-size: 14px;
      line-height: 28px;
   }
   .list-footer{
      display: flex;
      justify-content: flex-end;
      padding: 10px 15px;
      padding: 10px 0;
      border-top: 1px solid #EDEAF4;
   }
</style>