Merge branch 'fix/goods-0525' into msb_test

pages/account/index/home/module/LogisitcsInfo.vue

@@ -36,7 +36,7 @@
               </p>
               <div class="item-info-wrap__orderNo">
                 <span>{{
-                  `${item.logistics.companyName}: ${item.logistics.trackingNo}`
+                  `${item.logistics.companyName || '--'}: ${item.logistics.trackingNo || '--'}`
                 }}</span>
                 <span class="item-info-wrap__orderNo--light">查看详情</span>
               </div>

pages/account/index/order/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-08 01:14:03
  * @LastEditors: ch
- * @LastEditTime: 2022-05-26 17:38:01
+ * @LastEditTime: 2022-05-27 11:37:59
  * @Description: file content
 -->
 <template>
@@ -31,7 +31,9 @@ export default {
 	data(){
 		return {
 			ORDER_TYPE,
-			orderInfo : {}
+			orderInfo : {
+				orderType : ORDER_TYPE.VIRTUAL
+			}
 		}
 	},
 	mounted(){