hot fixed

HUNG-rushb · Dec 2, 2021 · 21d3c9e · 21d3c9e
1 parent 626afa1
commit 21d3c9e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/my_res/public/index.html b/my_res/public/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
 
     <!-- Fav icon -->
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+    <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
 
     <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png" />
     <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png" />
@@ -49,7 +49,7 @@
     <link rel="manifest" href="/manifest.json" />
     <meta name="msapplication-TileColor" content="#ffffff" />
     <meta name="msapplication-TileImage" content="/ms-icon-144x144.png" />
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="theme-color" content="#ffffff" /> -->
 
     <!-- Google Map Autocomplete -->
     <!-- <script src="http://maps.googleapis.com/maps/api/js?key=AIzaSyCLmkMvRT42aeaFqentZfmn09iJtDLa7es&libraries=places"></script> -->
@@ -58,10 +58,10 @@
     <script src="https://sp.zalo.me/plugins/sdk.js"></script>
 
     <!-- Zalo Pay  -->
-    <script
+    <!-- <script
       src="/js/zalopay.js?ver=1494921725335"
       type="text/javascript"
-    ></script>
+    ></script> -->
 
     <!-- Title  -->
     <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->

diff --git a/my_res/src/components/Layout/CheckCart.vue b/my_res/src/components/Layout/CheckCart.vue
@@ -77,7 +77,7 @@ export default {
 <style scoped>
 #cart {
   background-color: #a4c066;
-  position: absolute;
+  position: fixed;
   right: 1rem;
   top: 5rem;
 }

diff --git a/my_res/src/components/Layout/Offcanvas.js b/my_res/src/components/Layout/Offcanvas.js
diff --git a/my_res/src/components/Layout/ReviewFood.vue b/my_res/src/components/Layout/ReviewFood.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- <div class="fixed-top"> -->
   <div>
     <div
       class="offcanvas offcanvas-bottom"

diff --git a/my_res/src/components/Layout/ZaloChat.vue b/my_res/src/components/Layout/ZaloChat.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="fixed-top">
     <div
       class="zalo-chat-widget"
       data-oaid="137117482624142109"
@@ -10,9 +10,3 @@
     ></div>
   </div>
 </template>
-
-<script>
-export default {};
-</script>
-
-<style scoped></style>
diff --git a/my_res/src/views/Home.vue b/my_res/src/views/Home.vue
@@ -11,7 +11,7 @@
     <BackToTop />
     <OrderButton />
     <AddToast />
-    <CheckCart />
+
     <ReviewFood />
 
     <HomeMenu />
@@ -22,6 +22,8 @@
 
     <ZaloChat />
 
+    <CheckCart />
+
     <!-- <UpdateDataFirebase /> -->
   </div>
 </template>

diff --git a/my_res/src/views/Menu.vue b/my_res/src/views/Menu.vue
@@ -4,7 +4,8 @@
 
     <OrderButton />
     <AddToast />
-    <CheckCart />
+
+    <ZaloChat />
     <ReviewFood />
 
     <div class="row" id="menu">
@@ -44,6 +45,8 @@
     </div>
 
     <Footer />
+
+    <CheckCart />
   </div>
 </template>
 
@@ -57,6 +60,7 @@ import CheckCart from "../components/Layout/CheckCart.vue";
 import OrderButton from "../components/Layout/OrderButton.vue";
 import AddToast from "../components/Layout/AddToast.vue";
 import ReviewFood from "../components/Menu/ReviewFood.vue";
+import ZaloChat from "../components/Layout/ZaloChat.vue";
 
 export default {
   name: "Menu",
@@ -68,6 +72,7 @@ export default {
     OrderButton,
     AddToast,
     ReviewFood,
+    ZaloChat,
   },
   data() {
     // console.log(getMenu);