# Conflicts: # src/views/shop/shopOrder/components/orderInfo.vue # src/views/shop/shopOrder/index.vue