修改

pages/mobile/center/vendor/index.vue

@@ -51,7 +51,7 @@
         </div>-->
         <nuxt-link tag="div" to="/mobile/order?type=saler" class="content-line">
           <img src="/images/mobile/center/user/order.jpg" alt="">
-          <span>采购订单</span>
+          <span>销售订单</span>
           <i class="iconfont icon-xiangyou"></i>
         </nuxt-link>
         <nuxt-link tag="div" to="/mobile/center/vendor/message"  class="content-line" v-if="user.data.enterprise.uu">

pages/mobile/order/details.vue

@@ -130,6 +130,10 @@
           <div class="pull-left">运费：</div>
           <div class="pull-right">¥{{orderList.fare | priceFiter}}</div>
         </div>
+        <div class="clearfix">
+          <div class="pull-left">手续费：</div>
+          <div class="pull-right"><a class="red" style="color:#f43938;">¥0.00</a><span class="del" style="text-decoration: line-through;color: #999;font-size: 0.24rem;">(¥{{parseFloat(orderList.ensurePrice * 0.0045).toFixed(2)}})</span></div>
+        </div>
         <!--<div class="clearfix">-->
           <!--<div class="pull-left">促销优惠：</div>-->
           <!--<div class="pull-right">-¥13212.32132</div>-->
@@ -143,7 +147,7 @@
         <div>共<span>{{orderList.batchQty}}</span>件商品&nbsp;&nbsp;合计：
           <span class="pri"><a class="red">¥</a>{{orderList.ensurePrice}}</span>
           <span class="lab">(含运费：<a class="red">¥</a><a class="red">{{orderList.fare | priceFiter}}</a>)</span></div>
-        <div>手续费：<a class="red">¥0.00</a><span class="del">(¥{{parseFloat(orderList.ensurePrice * 0.0045).toFixed(2)}})</span></div>
+        <!--<div>手续费：<a class="red">¥0.00</a><span class="del">(¥{{parseFloat(orderList.ensurePrice * 0.0045).toFixed(2)}})</span></div>-->
       </div>
       <div class="order-details-info">
         <div class="clearfix">
@@ -436,7 +440,7 @@
         let { data } = await axios.get(`/trade/purchase/purchaseId/${route.query.uuid}`)
         console.log(data)
         data.data.area = JSON.parse(data.data.jsonAddress)
-        data.data.rule = JSON.parse(data.data.jsonRule)
+        data.data.rule = data.data.jsonRule ? JSON.parse(data.data.jsonRule) : ''
         data.data.paytype = route.query.paytype
         data.data.historyS = JSON.parse(data.data.statushistory)
         let invoiceAddress = data.data.invoiceAddress ? JSON.parse(data.data.invoiceAddress) : ''
@@ -884,8 +888,9 @@
   .order-wrapper {
     background: #f1f3f6;
     margin: 0.88rem 0 0.98rem 0;
-    height: calc(100vh - 0.88rem - 0.96rem);
+    height: calc(100vh - 0.88rem);
     overflow-y: scroll;
+    padding-bottom: 0.96rem;
     .order-details-wrap {
       .order-details-top {
         .top-t-wrap {
@@ -911,7 +916,7 @@
             padding: 0 0.1rem;
             overflow: hidden;
             i {
-              font-size: 0.14rem;
+              font-size: 0.26rem;
               margin-left: 0.05rem;
             }
           }
@@ -982,11 +987,12 @@
         .list-wrap-content {
           background: #f9f9f8;
           padding: 0.3rem 0.2rem;
+          padding-right: 0.32rem;
           border-bottom: 1px solid #e4e4e4;
           .list-item {
             font-size: 0.28rem;
             color: #333;
-            line-height: 0.6rem;
+            line-height: 0.5rem;
             .list-wrap-content-brand {
               @include overFlowHidden();
               .spec {
@@ -1000,7 +1006,7 @@
             .lab {
               color: #999;
               font-size: 0.24rem;
-              max-width: 2.2rem;
+              max-width: 2.1rem;
               @include overFlowHidden();
               span {
                 font-size: 0.16rem;
@@ -1167,8 +1173,8 @@
     }
     .sendGoods_Alert {
       background: #fff;
-      position: absolute;
-      bottom: 0;
+      position: fixed;
+      bottom: 0.98rem;
       left: 0;
       width: 100%;
       border-top-left-radius: 5px;
@@ -1218,9 +1224,9 @@
         border-bottom: 1px solid #d9d9d9;
         font-size: 0.32rem;
         color: #333;
-        .ti {
-          font-weight: bold;
-        }
+        /*.ti {*/
+          /*font-weight: bold;*/
+        /*}*/
         .pull-right {
           font-size: 0.28rem;
           color: #999;
@@ -1262,7 +1268,7 @@
     .peisong_Alert {
       background: #f1f3f6;
       position: fixed;
-      bottom: 0;
+      bottom: 0.98rem;
       left: 0;
       right: 0;
       top: 0;

pages/mobile/order/index.vue

@@ -813,9 +813,9 @@
 .order-wrapper {
   background: #f1f3f6;
   margin: 0.88rem 0 0.98rem 0;
-  height: calc(100vh - 0.88rem - 0.96rem);
+  height: calc(100vh - 0.88rem);
   overflow-y: scroll;
-  padding-bottom: 0.2rem;
+  padding-bottom: 0.96rem;
   .order-nav {
     background: #fff;
     div {
@@ -856,11 +856,12 @@
     .list-wrap-content {
       background: #f9f9f8;
       padding: 0.3rem 0.2rem;
+      padding-right: 0.32rem;
       border-bottom: 1px solid #e4e4e4;
       .list-item {
         font-size: 0.28rem;
         color: #333;
-        line-height: 0.6rem;
+        line-height: 0.5rem;
         .list-wrap-content-brand {
           @include overFlowHidden();
           .spec {
@@ -874,7 +875,7 @@
         .lab {
           color: #999;
           font-size: 0.24rem;
-          max-width: 2.2rem;
+          max-width: 2.1rem;
           @include overFlowHidden();
           span {
             font-size: 0.16rem;
@@ -943,14 +944,17 @@
           padding: 0 0.1rem;
           overflow: hidden;
           width: auto;
+          i {
+            font-size: 0.26rem;
+          }
         }
       }
     }
   }
   .sendGoods_Alert {
     background: #fff;
-    position: absolute;
-    bottom: 0;
+    position: fixed;
+    bottom: 0.98rem;
     left: 0;
     width: 100%;
     border-top-left-radius: 5px;
@@ -1000,9 +1004,9 @@
       border-bottom: 1px solid #d9d9d9;
       font-size: 0.32rem;
       color: #333;
-      .ti {
-        font-weight: bold;
-      }
+      /*.ti {*/
+        /*font-weight: bold;*/
+      /*}*/
       .pull-right {
         font-size: 0.28rem;
         color: #999;
@@ -1044,13 +1048,13 @@
   .peisong_Alert {
     background: #f1f3f6;
     position: fixed;
-    bottom: 0;
+    bottom: 0.98rem;
     left: 0;
     right: 0;
     top: 0;
     z-index: 11111;
     ul {
-      height: calc(100vh - 1.2rem - 1.7rem);
+      height: calc(100vh - 1.2rem - 1.7rem - 1rem);
       overflow-y: scroll;
       li {
         line-height: 1rem;