diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
index 37734ec5..84368688 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -41,6 +41,11 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row text-center justify-content-center">
+                                <div class="col-8">
+                                    <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 4">浙江北仑疫情爆发， 义乌船期非常不稳定，建议发广州仓库<br>Due to Beilun, Zhejiang pandemic outbreak our Yiwu warehouse might experience unexpected shipping delays, you can select our Guangzhou warehouse as an alternative.</p>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="row justify-content-center">
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 33a69cb6..c301c369 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -1,7 +1,8 @@
 <template>
-    <div class="row flex-wrap" v-if="order">
+    <div class="row flex-wrap" >
         <div class="col">
-            <div class="row m-b-30">
+            <loading-component v-if="isLoading"></loading-component>
+            <div class="row m-b-30" v-if="!isLoading">
                 <div class="col bg-master-lightest padding-25">
                     <div class="row align-items-center">
                         <div class="col-12 col-lg-3">