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

src/router/myOrder/index.js

@@ -17,13 +17,23 @@ const myOrder = [
     },
     component: resolve => require(['@/views/myOrder/detail/orderDetail'], resolve)
   },
+  {
+    path: '/goodsInfo',
+    name: 'goodsInfo',
+    meta: {
+      title: '商品信息',
+      auth: false
+    },
+    component: resolve => require(['@/views/myOrder/goodsInfo'], resolve)
+  },
   {
     path: '/logisticsDetail',
     name: 'logisticsDetail',
     meta: {
       title: '物流详情',
       auth: false
-    }
+    },
+    component: resolve => require(['@/views/myOrder/detail/logisticsDetail'], resolve)
   }
 ]
 export default myOrder

src/views/myOrder/detail/logisticsDetail.vue

@@ -23,6 +23,18 @@ export default {
         logo: require('@/assets/img/u48.png')
       }
     }
+  },
+  mounted() {
+    // 设置标题栏关闭返回按钮
+    this.$store.commit('setNavBar', {
+      show: true,
+      leftArrow: true,
+      rightIcon: false,
+      title: '',
+      leftText: '物流详情',
+      leftClick: null,
+      rightClick: null
+    })
   }
 }
 </script>

src/views/myOrder/detail/orderDetail.vue

@@ -59,17 +59,17 @@
         全部
         <van-icon class="title-arrow" name="arrow"/>
       </div>
-      <goods-simple-item />
-      <goods-simple-item />
+      <goods-simple-item/>
+      <goods-simple-item/>
     </div>
-<!-- 订单发票信息   -->
+    <!-- 订单发票信息 -->
     <div class="order-common order-invoice">
       <div class="invoice-all">
         <span class="all-title">发票信息</span>
         全部
         <van-icon class="title-arrow" name="arrow"/>
       </div>
-      <invoice-simple-item />
+      <invoice-simple-item/>
     </div>
   </div>
 </template>
@@ -110,8 +110,9 @@ export default {
 <style lang="scss" scoped>
 .order-detail {
   overflow: auto;
-  font-size:12px;
+  font-size: 12px;
   height: calc(100vh - 46px);
+
   .order-common {
     padding: 10px;
     border-radius: 4px;
@@ -275,37 +276,43 @@ export default {
     .goods-all {
       display: flex;
       align-items: center;
-      margin-bottom:10px;
+      margin-bottom: 10px;
+
       .all-title {
         flex: 1;
         font-size: 14px;
-        color:#000;
+        color: #000;
         font-weight: 400;
       }
+
       .title-arrow {
         font-size: 15px;
         //margin-top: 1px;
-        margin-left:6px;
+        margin-left: 6px;
       }
     }
   }
+
   /*订单发票*/
   .order-invoice {
-    margin-bottom:20px;
+    margin-bottom: 20px;
+
     .invoice-all {
       display: flex;
       align-items: center;
-      margin-bottom:10px;
+      margin-bottom: 10px;
+
       .all-title {
         flex: 1;
         font-size: 14px;
-        color:#000;
+        color: #000;
         font-weight: 400;
       }
+
       .title-arrow {
         font-size: 15px;
         //margin-top: 1px;
-        margin-left:6px;
+        margin-left: 6px;
       }
     }
 

src/views/myOrder/goodsInfo.vue

+<template>
+  <div class="goods-info">
+      <div class="order-sum">
+          <div class="sum-number"></div>
+      </div>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "goodsInfo",
+  data() {
+    return {
+        icons: {
+        inDelivery: require('@/assets/img/u546.svg'),
+        copy: require('@/assets/img/u533.svg')
+      }
+    };
+  },
+  mounted() {
+    // 设置标题栏关闭返回按钮
+    this.$store.commit("setNavBar", {
+      show: true,
+      leftArrow: true,
+      rightIcon: false,
+      title: "",
+      leftText: "商品详情",
+      leftClick: null,
+      rightClick: null,
+    });
+  },
+};
+</script>
+
+
+<style scoped lang="scss">
+</style>
\ No newline at end of file