zhangdehua 9 kuukautta sitten
vanhempi
commit
731bc7d2ac

+ 28 - 5
app/index/view/base.html

@@ -47,6 +47,11 @@
                         </nav>-->
         </div>
         <div class="headIconContainer">
+            <a href="/index/passport/login.html">
+                <div class="headIconItem shoppingCartIcon">
+                    <img src="/assets/index/asstes/icon/sign-up.png" alt="Register" tabindex="Register">
+                </div>
+            </a>
             <!-- pc端菜单入口 -->
             <div class="computerMenu">
                 <p id="computerMenuBot">
@@ -55,8 +60,13 @@
                 <!-- pc端菜单 -->
                 <section class="pcMenuFixed">
                     <div class="pcMenuItem">
+                        <a href="/index/passport/login.html">
+                            <h2 class="menuItemTitle">Sign In & Sign Up</h2>
+                        </a>
+                    </div>
+                    <div class="pcMenuItem">
                         <a href="/index/user/order.html">
-                            <h2 class="menuItemTitle">Personal</h2>
+                            <h2 class="menuItemTitle">My Order</h2>
                         </a>
                     </div>
                     <div class="pcMenuItem">
@@ -104,7 +114,7 @@
             <!-- 个人中心 -->
             <a href="/index/user/order.html">
                 <div class="headIconItem userIcon">
-                    <img src="/assets/index/asstes/icon/user.png" alt="user" tabindex="user">
+                    <img src="/assets/index/asstes/icon/all-orders.png" alt="My orders" tabindex="user">
                 </div>
             </a>
         </div>
@@ -119,10 +129,17 @@
                     <img src="/assets/index/asstes/icon/logo.png" alt="Free Shipping Vapes" title="Free Shipping Vapes">
                 </h1>
             </a>
+            <div class="mobileRegisterIconList">
+                <a href="/index/passport/login.html">
+                    <div class="mobileRegisterIcon RegisterIcon">
+                        <img src="/assets/index/asstes/icon/sign-up.png" alt="Register" tabindex="user">
+                    </div>
+                </a>
+            </div>
             <div class="mobileUserIconList">
                 <a href="/index/user/order.html">
                     <div class="mobileUserIcon userIcon">
-                        <img src="/assets/index/asstes/icon/user.png" alt="user" tabindex="user">
+                        <img src="/assets/index/asstes/icon/all-orders.png" alt="User" tabindex="user">
                     </div>
                 </a>
             </div>
@@ -134,11 +151,17 @@
         </div>
         <!-- 移动端菜单 -->
         <section class="mobileMenuFixed">
+
             <div class="mobileMenuItem active">
                 <a href="/index/index/index.html">
                     <h2 class="menuItemTitle">Home</h2>
                 </a>
             </div>
+            <div class="mobileMenuItem">
+                <a href="/index/passport/login.html">
+                    <h2 class="menuItemTitle">Sign In & Sign Up</h2>
+                </a>
+            </div>
             <!--            <div class="mobileMenuItem">
                             <a href="#">
                                 <h2 class="menuItemTitle">DISPOSABLES</h2>
@@ -154,7 +177,7 @@
                             </div>-->
             <div class="mobileMenuItem">
                 <a href="/index/user/order.html">
-                    <h2 class="menuItemTitle userIcon">Personal</h2>
+                    <h2 class="menuItemTitle userIcon">My Orders</h2>
                 </a>
             </div>
             <div class="mobileMenuItem">
@@ -344,4 +367,4 @@
 </body>
 <script src="/assets/index/js/productDetails.js?t=11"></script>
 {block name="scriptSrc"}{/block}
-</html>
+</html>

+ 4 - 1
app/index/view/index/index.html

@@ -35,8 +35,11 @@
                         </div>
                         <img class="tabLink" src="/assets/index/asstes/icon/tabLinkIcon.png" alt="">-->
             <div class="tabItem goodsModelTabItem active" data-type="best">
+<!--
                 <h3 class="tabName">SPECIAL OFFER</h3>
-                <p class="tabUnderline"></p>
+-->
+                <img style="height: 0.8rem;width: 3.0rem;" src="/assets/index/asstes/icon/special-offer.jpg">
+<!--                <p class="tabUnderline"></p>-->
             </div>
         </div>
         <a name="goodsPosition"></a>

+ 3 - 3
app/index/view/passport/logIn.html

@@ -30,7 +30,7 @@
         <section class="pageSection">
             <!-- 登录模块 -->
             <div id="loginModel">
-                <h1 class="modelTitle">Log In</h1>
+                <h1 class="modelTitle">Sign In</h1>
                 <div class="modelContainer">
                     <!-- 电子邮箱 -->
                     <div class="modelItem">
@@ -45,7 +45,7 @@
                     <a href="/index/passport/retrievePassword.html"><p class="forgotPassword">Forgot Password?</p>
                     </a>
                     <!-- 登录 -->
-                    <div class="pageButton" id="loginButton">Log In</div>
+                    <div class="pageButton" id="loginButton">Sign In</div>
                     <!-- 没有账户 -->
                     <div class="accountTips">
                         <p>No account? </p>
@@ -68,7 +68,7 @@
                         <div class="pageButton" id="continueButton">Continue</div>
                         <div class="accountTips">
                             <p>Have an Account?</p>
-                            <span id="toLogin">&nbsp;Log In</span>
+                            <span id="toLogin">&nbsp;Sign In</span>
                         </div>
                     </div>
                 </div>

BIN
public/assets/index/asstes/icon/all-orders.png


BIN
public/assets/index/asstes/icon/my-orders.png


BIN
public/assets/index/asstes/icon/sign-up.png


BIN
public/assets/index/asstes/icon/special-offer.jpg


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

@@ -345,7 +345,7 @@ a:active, a:focus {
     width: auto;
 }
 
-.mobileUserIconList {
+.mobileRegisterIconList {
     display: flex;
     flex: 1;
     align-items: center;
@@ -353,6 +353,18 @@ a:active, a:focus {
     padding-right: .24rem;
 }
 
+.mobileRegisterIcon img {
+    height: .3rem;
+}
+
+.mobileUserIconList {
+    display: flex;
+    flex: 0.2;
+    align-items: center;
+    justify-content: space-between;
+    padding-right: .01rem;
+}
+
 .mobileUserIcon img {
     height: .3rem;
 }