Merge branch 'feature/0820-mip' into release/0829

@@ -7,6 +7,13 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
     font-size: 100%;
     font-size: 100%;
 }
 }
 
 
+body, html {
+    width: 100%;
+    font-size: 12px;
+    font-family: helvetica,Arial,黑体,sans-serif;
+    line-height: 1.4;
+}
+
 ol, ul {
 ol, ul {
     list-style: none;
     list-style: none;
 }
 }

+ul,
+li {
+    list-style: none;
+}
+
 .good-list-page {
 .good-list-page {
     min-height: 440px;
     min-height: 440px;
 }
 }
@@ -113,7 +118,7 @@
 .shop-tabs {
 .shop-tabs {
     display: flex;
     display: flex;
     justify-content: space-around;
     justify-content: space-around;
-    width: 100%;
+    width: 66% !important;
     font-size: 15px;
     font-size: 15px;
     line-height: 40px;
     line-height: 40px;
     border-top: 1PX solid #dededf;
     border-top: 1PX solid #dededf;
@@ -121,6 +126,28 @@
     background-color: #fff;
     background-color: #fff;
 }
 }
 
 
+.goods-tab-area {
+    position: relative;
+}
+
+.all-goods-tab {
+    position: absolute;
+    right: 0;
+    top: 0;
+    color: #dededf!important;
+    transform-origin: 0px 0px 0px;
+    opacity: 1;
+    transform: scale(1, 1);
+    float: left;
+    line-height: 44px;
+    width: 34%;
+    text-align: center;
+    font-size: 15px;
+    color: #999;
+    border-top: 1px solid #dededf;
+    border-bottom: 1px solid #dededf;
+}
+
 .shop-tabs em {
 .shop-tabs em {
     color: #dededf;
     color: #dededf;
 }
 }

+ul,
+li {
+    list-style: none;
+}
+
 .reds-shop .pull-left {
 .reds-shop .pull-left {
     float: left;
     float: left;
 }
 }
@@ -70,7 +75,7 @@
 .shop-tabs {
 .shop-tabs {
     display: flex;
     display: flex;
     justify-content: space-around;
     justify-content: space-around;
-    width: 100%;
+    width: 66% !important;
     font-size: 15px;
     font-size: 15px;
     line-height: 40px;
     line-height: 40px;
     border-top: 1PX solid #dededf;
     border-top: 1PX solid #dededf;
@@ -78,6 +83,28 @@
     background-color: #fff;
     background-color: #fff;
 }
 }
 
 
+.goods-tab-area {
+    position: relative;
+}
+
+.all-goods-tab {
+    position: absolute;
+    right: 0;
+    top: 0;
+    color: #dededf!important;
+    transform-origin: 0px 0px 0px;
+    opacity: 1;
+    transform: scale(1, 1);
+    float: left;
+    line-height: 44px;
+    width: 34%;
+    text-align: center;
+    font-size: 15px;
+    color: #999;
+    border-top: 1px solid #dededf;
+    border-bottom: 1px solid #dededf;
+}
+
 .shop-tabs em {
 .shop-tabs em {
     color: #dededf;
     color: #dededf;
 }
 }

@@ -30,44 +30,44 @@
     </mip-lightbox>
     </mip-lightbox>
     {{/ shopInfo}}
     {{/ shopInfo}}
 
 
-    <mip-vd-tabs class="tab">
-        <section class="shop-tabs tab-navs">
-            <li class="shop-tab-nav tab-nav active">
-                <span data-target="#red-index" data-trigger="tab" data-funHome>首页</span>
-                <em>|</em>
-            </li>
-            <li class="shop-tab-nav tab-nav">
-                <span data-target="#all-goods" data-trigger="tab" data-funGetNewGoods>新品</span>
-                <em>|</em>
-            </li>
-            <li class="shop-tab-nav tab-nav">
-                <a href="{{allGoodsUrl}}">
-                    <span data-target="#all-goods" data-trigger="tab" data-funGetAllGoods>全部商品</span>
-                </a>
-            </li>
-        </section>
-        {{!--shop-tab: 首页--}}
-        <div id="red-index" class="tab-panel red-shop-index">
-            {{> shop/mip-modules}}
-            <div id="indexGoodsContainer" class="goods-container">
-                <div class="default-goods container clearfix">
-                    {{> mip-product-list list=defaultGoods}}
+    <div class="goods-tab-area">
+        <mip-vd-tabs class="tab">
+            <section class="shop-tabs tab-navs">
+                <li class="shop-tab-nav tab-nav active">
+                    <span>首页</span>
+                    <em>|</em>
+                </li>
+                <li class="shop-tab-nav tab-nav">
+                    <span>新品</span>
+                    <em>|</em>
+                </li>
+            </section>
+            {{!--shop-tab: 首页--}}
+            <div id="red-index" class="tab-panel red-shop-index">
+                {{> shop/mip-modules}}
+                <div id="indexGoodsContainer" class="goods-container">
+                    <div class="default-goods container clearfix">
+                        {{> mip-product-list list=defaultGoods}}
+                    </div>
+                </div>
+                <div class="all-goods">
+                    <a href="{{allGoodsUrl}}">点击查看全部商品</a>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="all-goods">
-                <a href="{{allGoodsUrl}}">点击查看全部商品</a>
-            </div>
-        </div>
 
 
-        {{!--shop-tab: 最新--}}
-        <div class="new-goods">
-            {{> mip-product-list list=newGoods}}
+            {{!--shop-tab: 最新--}}
+            <div class="new-goods">
+                {{> mip-product-list list=newGoods}}
 
 
-            <div class="all-goods">
-                <a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
+                <div class="all-goods">
+                    <a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
+                </div>
             </div>
             </div>
-        </div>
-    </mip-vd-tabs>
+        </mip-vd-tabs>
+        <a href="{{allGoodsUrl}}" class="all-goods-tab">
+            <span>全部商品</span>
+        </a>
+    </div>
 </div>
 </div>
 {{> mip-suspend-cart}}
 {{> mip-suspend-cart}}
 {{> mip-footer}}
 {{> mip-footer}}

@@ -22,48 +22,48 @@
         {{/if}}
         {{/if}}
     </div>
     </div>
 
 
-    <mip-vd-tabs class="tab">
-        <section class="shop-tabs tab-navs">
-            <li class="shop-tab-nav tab-nav active">
-                <span data-target="#red-index" data-trigger="tab" data-funHome>首页</span>
-                <em>|</em>
-            </li>
-            <li class="shop-tab-nav tab-nav">
-                <span data-target="#all-goods" data-trigger="tab" data-funGetNewGoods>新品</span>
-                <em>|</em>
-            </li>
-            <li class="shop-tab-nav tab-nav">
-                <a href="{{allGoodsUrl}}">
-                    <span data-target="#all-goods" data-trigger="tab" data-funGetAllGoods>全部商品</span>
-                </a>
-            </li>
-        </section>
-        {{!--shop-tab: 首页--}}
-        <div id="red-index" class="tab-panel red-shop-index">
-            {{> shop/mip-modules}}
-            <div id="indexGoodsContainer" class="goods-container">
-                <div class="default-goods container clearfix">
-                    {{# defaultGoods}}
-                        {{> mip-product-list}}
-                    {{/ defaultGoods}}
+    <div class="goods-tab-area">
+        <mip-vd-tabs class="tab">
+            <section class="shop-tabs tab-navs">
+                <li class="shop-tab-nav tab-nav active">
+                    <span data-target="#red-index" data-trigger="tab" data-funHome>首页</span>
+                    <em>|</em>
+                </li>
+                <li class="shop-tab-nav tab-nav">
+                    <span data-target="#all-goods" data-trigger="tab" data-funGetNewGoods>新品</span>
+                    <em>|</em>
+                </li>
+            </section>
+            {{!--shop-tab: 首页--}}
+            <div id="red-index" class="tab-panel red-shop-index">
+                {{> shop/mip-modules}}
+                <div id="indexGoodsContainer" class="goods-container">
+                    <div class="default-goods container clearfix">
+                        {{# defaultGoods}}
+                            {{> mip-product-list}}
+                        {{/ defaultGoods}}
+                    </div>
+                </div>
+                <div class="all-goods">
+                    <a href="{{allGoodsUrl}}">点击查看全部商品</a>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="all-goods">
-                <a href="{{allGoodsUrl}}">点击查看全部商品</a>
-            </div>
-        </div>
 
 
-        {{!--shop-tab: 最新--}}
-        <div class="new-goods">
-            {{# newGoods}}
-                {{> mip-product-list}}
-            {{/ newGoods}}
+            {{!--shop-tab: 最新--}}
+            <div class="new-goods">
+                {{# newGoods}}
+                    {{> mip-product-list}}
+                {{/ newGoods}}
 
 
-            <div class="all-goods">
-                <a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
+                <div class="all-goods">
+                    <a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
+                </div>
             </div>
             </div>
-        </div>
-    </mip-vd-tabs>
+        </mip-vd-tabs>
+        <a href="{{allGoodsUrl}}" class="all-goods-tab">
+            <span data-target="#all-goods" data-trigger="tab" data-funGetAllGoods>全部商品</span>
+        </a>
+    </div>
 </div>
 </div>
 {{> mip-suspend-cart}}
 {{> mip-suspend-cart}}
 {{> mip-shop-footer}}
 {{> mip-shop-footer}}