Merge branch 'master' of http://gitlab.jiucaiyun.cn/sph/SH_OrderLifeCycleU

src/views/myOrder/detail/logisticsDetail.vue

@@ -26,7 +26,7 @@
             <span class="logistic-values">{{ shippingInfo.estimatedArrivalTime }}</span>
           </div>
         </span>
-        <span class="logistic-type">市内</span>
+        <span class="logistic-type">{{shippingInfo.roadType==='D'?'市内':'市外'}}</span>
       </div>
     </div>
     <div id="stepLine" :class="stepList.length>2?'logistics-step-line':'logistics-step-line_show'" v-if="stepList">

src/views/myOrder/myOrderList.vue

 <template>
   <div id="myOrderList">
-    <div class="content">
+    <div class="content" ref="wrapper">
       <van-pull-refresh class="list" ref="supplierList" v-model="isRefreshing" @refresh="onRefresh">
         <van-list
           v-model="isLoading"
@@ -82,6 +82,7 @@ export default {
       finished: false,
       error: false,
       logInfoShow: false,
+      scrollPos: 0,
       orderList: [],
       orderItem: {},
       sphImage: require('@/assets/img/u48.png'),
@@ -117,6 +118,10 @@ export default {
       return time
     }
   },
+  activated() {
+    this.$refs.wrapper.scrollTop = this.scrollPos
+    console.log('位置还原', this.scrollPos)
+  },
   mounted() {
     // this.onLoad()
     let _this = this
@@ -138,6 +143,9 @@ export default {
     },
     // 单个发票点击事件
     orderItemAction(model) {
+      let wrapperScrollTop = this.$refs.wrapper.scrollTop
+      this.scrollPos = wrapperScrollTop
+      console.log('点击时列表位置', this.scrollPos)
       this.$emit('orderItemAction', model)
     },
     onRefresh() {