修改

components/mobile/MobileHeader.vue

@@ -205,6 +205,12 @@
         } else if (this.startWith(val, '/mobile/center/user/doPay')) {
           this.showSearchIcon = false
           title = '待付款订单'
+        } else if (this.startWith(val, '/mobile/order/details')) {
+          this.showSearchIcon = false
+          title = '订单详情'
+        } else if (this.startWith(val, '/mobile/order')) {
+          this.showSearchIcon = false
+          title = '订单中心'
         } else {
           this.showSearchIcon = true
           title = '优软商城'

pages/mobile/order/details.vue

@@ -166,7 +166,8 @@
         <div class="clearfix">
           <div class="name pull-left">付款方式</div>
           <div class="pull-right">
-            {{orderList.paytype === 1103 ? '线下付款' : '网上支付'}}
+            <!--{{orderList.paytype}}-->
+            {{orderList.paytype === '1103' ? '线下付款' : '网上支付'}}
           </div>
         </div>
         <div class="clearfix">
@@ -181,7 +182,9 @@
       <div class="order-details-invoiceinfo" v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206" v-show="showinvoiceType">
         <div class="invoiceList clearfix" >
           <div class="pull-left">发票类型：</div>
-          <div class="pull-right">{{orderList.purchaseRemark || '空'}}</div>
+          <div class="pull-right">
+            {{orderList.invoicetype === 1205 ? '增值税(专用)发票': '增值税普通发票'}}
+          </div>
         </div>
         <div class="invoiceList clearfix">
           <div class="pull-left">发票抬头：</div>
@@ -429,6 +432,7 @@
           data[0].paytype = route.query.paytype
           data[0].historyS = JSON.parse(data[0].statushistory)
           data[0].purchaseDetails = data[0].orderDetails
+          data[0].purchaseRemark = data[0].orderRemark ? JSON.parse(data[0].orderRemark)[data[0].storeid] : ''
           if (route.query.type === 'buyer') {
             sellsendGoodsTime = await axios.get(`/trade/tradebasicproperties/get/1054`)
           }
@@ -558,7 +562,7 @@
             })
           } else {
             this.$http.get(`/trade/purchase/vendor/tobeshiped/${item.id}`).then(res => {
-              this._id = EncryptionFilter(res.inid)
+              this._id = EncryptionFilter(res.data.inid)
               this.$http.get(`/trade/inFpu/tobeshipped/${this._id}`).then(res => {
                 this.sendGoodsInfo = res.data[0]
                 this.sendGoodsInfo.area = JSON.parse(res.data[0].jsonSpAddress)
@@ -888,9 +892,8 @@
   .order-wrapper {
     background: #f1f3f6;
     margin: 0.88rem 0 0.98rem 0;
-    height: calc(100vh - 0.88rem);
+    height: calc(100vh - 0.88rem - 0.96rem);
     overflow-y: scroll;
-    padding-bottom: 0.96rem;
     .order-details-wrap {
       .order-details-top {
         .top-t-wrap {
@@ -1460,7 +1463,7 @@
     .cancelOrder {
       background: #fff;
       position: absolute;
-      bottom: 0;
+      bottom: 0.98rem;
       left: 0;
       width: 100%;
       border-top-left-radius: 5px;

pages/mobile/order/index.vue

@@ -455,7 +455,7 @@
           })
         } else {
           this.$http.get(`/trade/purchase/vendor/tobeshiped/${item.id}`).then(res => {
-            this._id = EncryptionFilter(res.inid)
+            this._id = EncryptionFilter(res.data.inid)
             this.$http.get(`/trade/inFpu/tobeshipped/${this._id}`).then(res => {
               this.sendGoodsInfo = res.data[0]
               this.sendGoodsInfo.area = JSON.parse(res.data[0].jsonSpAddress)
@@ -813,9 +813,9 @@
 .order-wrapper {
   background: #f1f3f6;
   margin: 0.88rem 0 0.98rem 0;
-  height: calc(100vh - 0.88rem);
+  height: calc(100vh - 0.88rem - 0.96rem);
   overflow-y: scroll;
-  padding-bottom: 0.96rem;
+  /*padding-bottom: 0.96rem;*/
   .order-nav {
     background: #fff;
     div {
@@ -1240,7 +1240,7 @@
   .cancelOrder {
     background: #fff;
     position: absolute;
-    bottom: 0;
+    bottom: 0.98rem;
     left: 0;
     width: 100%;
     border-top-left-radius: 5px;