zhangdehua 1 vuosi sitten
vanhempi
commit
e9faf807d1

+ 33 - 1
app/index/view/base.html

@@ -118,7 +118,7 @@
             </div>
             <div class="mobileMenuItem">
                 <a href="/index/index/salesTerms.html">
-                    <h2 class="menuItemTitle userIcon">SalesTerms</h2>
+                    <h2 class="menuItemTitle userIcon">Sales Terms</h2>
                 </a>
             </div>
             <div class="mobileMenuItem">
@@ -152,6 +152,38 @@
                     <img class="arrowIcon" src="/assets/index/asstes/icon/arrowIcon.png" alt="Subscribe Us"
                          id="subscribeArrow">
                 </div>
+                <div class="fLinkContainer">
+                    <div class="fLinkBox">
+                        <h3 class="fLinkTitle">My Account</h3>
+                        <a href="/index/user/order.html">
+                            <div class="fLinkItem">Personal</div>
+                        </a>
+                        <a href="/index/cart/shoppingCart.html">
+                            <div class="fLinkItem">Shopping Cart</div>
+                        </a>
+                        <a href="/index/user/order.html">
+                            <div class="fLinkItem">My Order</div>
+                        </a>
+                    </div>
+                    <div class="fLinkBox">
+                        <h3 class="fLinkTitle">Polices</h3>
+                        <a href="/index/index/aboutUs.html">
+                            <div class="fLinkItem">About Us</div>
+                        </a>
+                        <a href="/index/index/privacyPolicy.html">
+                            <div class="fLinkItem">Privacy Policy</div>
+                        </a>
+                        <a href="/index/index/salesTerms.html">
+                            <div class="fLinkItem">Sales Terms</div>
+                        </a>
+                        <a href="/index/index/vapePoints.html">
+                            <div class="fLinkItem">Vape Points</div>
+                        </a>
+                        <a href="/index/index/returnWarranty.html">
+                            <div class="fLinkItem">Return & Warranty</div>
+                        </a>
+                    </div>
+                </div>
                 <div class="footerIconContainer">
                     <div>Contact Us:</div>
                     <div class="footerIconList">

+ 4 - 2
app/index/view/user/orderDetails.html

@@ -1,5 +1,5 @@
 {extend name="base" /}
-{block name="title"}Home{/block}
+{block name="title"}Order Info{/block}
 {block name="styles"}
 <link rel="stylesheet" href="/assets/index/css/orderDetails.css?t=12">
 {/block}
@@ -339,12 +339,14 @@
 <script src="/assets/index/js/jquery.lazyload.js"></script>
 <script>
     $(document).ready(function () {
+        $("#loadingModel").hide(0);
+
         var orderId = "{$order['order_id']}";
         console.log('orderId::', orderId)
         var payStatus = "{$order['pay_status']}";
         console.log('payStatus::', payStatus)
         $('#ogMarkButton').hide(0)
-        if (payStatus === "10") {
+        if (payStatus === "10" || payStatus === 10) {
             $('#ogMarkButton').show(0)
         }
 

+ 43 - 1
public/assets/index/css/common.css

@@ -436,6 +436,27 @@ a:active, a:focus {
     height: .19rem;
     width: auto;
 }
+.fLinkContainer{
+    flex: 1;
+    display: flex;
+    justify-content: flex-end;
+    padding-right: .5rem;
+}
+.fLinkBox{
+    padding: 0 .24rem;
+}
+.fLinkTitle{
+    font-size: .15rem;
+    color: #666666;
+    font-weight: 400;
+    margin-bottom: .04rem;
+}
+.fLinkItem{
+    font-size: .14rem;
+    color: #fff;
+    padding: .02rem 0;
+    cursor: pointer;
+}
 .footerIconContainer{
     max-width: 4rem;
 }
@@ -492,7 +513,7 @@ a:active, a:focus {
     font-size: 0;
 }
 .aLImgItem img{
-    width: 2.0rem;
+    width: .5rem;
     height: .3rem;
 }
 .weText{
@@ -727,6 +748,21 @@ a:active, a:focus {
         padding-left: 0;
         padding-top: .4rem;
     }
+    .fLinkContainer{
+        justify-content: flex-start;
+        padding-right: 0;
+        margin-bottom: .4rem;
+    }
+    .fLinkBox{
+        padding: 0;
+        margin-right: .4rem;
+    }
+    .fLinkTitle{
+        font-size: .2rem;
+    }
+    .fLinkItem{
+        font-size: .18rem;
+    }
 }
 @media (max-width: 999px) {
     .navContainer{
@@ -821,4 +857,10 @@ a:active, a:focus {
         width: 1.5rem;
         height: .75rem;
     }
+    .fLinkTitle{
+        font-size: .24rem;
+    }
+    .fLinkItem{
+        font-size: .22rem;
+    }
 }