fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit dcb3bbef5e85cd4a1af1d13e57c9f95aa41cafab 2 parents 8e6c3255 bd8852ae

Merge branch 'release/0829' into 'gray' 

Release/0829



See merge request !1519
Inline Side-by-side
Showing 5 changed files with 133 additions and 72 deletions
@@ -7,6 +7,13 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq @@ -7,6 +7,13 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
7 font-size: 100%; 7 font-size: 100%;
8 } 8 }
9 9
  10 +body, html {
  11 + width: 100%;
  12 + font-size: 12px;
  13 + font-family: helvetica,Arial,黑体,sans-serif;
  14 + line-height: 1.4;
  15 +}
  16 +
10 ol, ul { 17 ol, ul {
11 list-style: none; 18 list-style: none;
12 } 19 }
  1 +ul,
  2 +li {
  3 + list-style: none;
  4 +}
  5 +
1 .good-list-page { 6 .good-list-page {
2 min-height: 440px; 7 min-height: 440px;
3 } 8 }
@@ -113,7 +118,7 @@ @@ -113,7 +118,7 @@
113 .shop-tabs { 118 .shop-tabs {
114 display: flex; 119 display: flex;
115 justify-content: space-around; 120 justify-content: space-around;
116 - width: 100%; 121 + width: 66% !important;
117 font-size: 15px; 122 font-size: 15px;
118 line-height: 40px; 123 line-height: 40px;
119 border-top: 1PX solid #dededf; 124 border-top: 1PX solid #dededf;
@@ -121,6 +126,28 @@ @@ -121,6 +126,28 @@
121 background-color: #fff; 126 background-color: #fff;
122 } 127 }
123 128
  129 +.goods-tab-area {
  130 + position: relative;
  131 +}
  132 +
  133 +.all-goods-tab {
  134 + position: absolute;
  135 + right: 0;
  136 + top: 0;
  137 + color: #dededf!important;
  138 + transform-origin: 0px 0px 0px;
  139 + opacity: 1;
  140 + transform: scale(1, 1);
  141 + float: left;
  142 + line-height: 44px;
  143 + width: 34%;
  144 + text-align: center;
  145 + font-size: 15px;
  146 + color: #999;
  147 + border-top: 1px solid #dededf;
  148 + border-bottom: 1px solid #dededf;
  149 +}
  150 +
124 .shop-tabs em { 151 .shop-tabs em {
125 color: #dededf; 152 color: #dededf;
126 } 153 }
  1 +ul,
  2 +li {
  3 + list-style: none;
  4 +}
  5 +
1 .reds-shop .pull-left { 6 .reds-shop .pull-left {
2 float: left; 7 float: left;
3 } 8 }
@@ -70,7 +75,7 @@ @@ -70,7 +75,7 @@
70 .shop-tabs { 75 .shop-tabs {
71 display: flex; 76 display: flex;
72 justify-content: space-around; 77 justify-content: space-around;
73 - width: 100%; 78 + width: 66% !important;
74 font-size: 15px; 79 font-size: 15px;
75 line-height: 40px; 80 line-height: 40px;
76 border-top: 1PX solid #dededf; 81 border-top: 1PX solid #dededf;
@@ -78,6 +83,28 @@ @@ -78,6 +83,28 @@
78 background-color: #fff; 83 background-color: #fff;
79 } 84 }
80 85
  86 +.goods-tab-area {
  87 + position: relative;
  88 +}
  89 +
  90 +.all-goods-tab {
  91 + position: absolute;
  92 + right: 0;
  93 + top: 0;
  94 + color: #dededf!important;
  95 + transform-origin: 0px 0px 0px;
  96 + opacity: 1;
  97 + transform: scale(1, 1);
  98 + float: left;
  99 + line-height: 44px;
  100 + width: 34%;
  101 + text-align: center;
  102 + font-size: 15px;
  103 + color: #999;
  104 + border-top: 1px solid #dededf;
  105 + border-bottom: 1px solid #dededf;
  106 +}
  107 +
81 .shop-tabs em { 108 .shop-tabs em {
82 color: #dededf; 109 color: #dededf;
83 } 110 }
@@ -30,44 +30,44 @@ @@ -30,44 +30,44 @@
30 </mip-lightbox> 30 </mip-lightbox>
31 {{/ shopInfo}} 31 {{/ shopInfo}}
32 32
33 - <mip-vd-tabs class="tab">  
34 - <section class="shop-tabs tab-navs">  
35 - <li class="shop-tab-nav tab-nav active">  
36 - <span data-target="#red-index" data-trigger="tab" data-funHome>首页</span>  
37 - <em>|</em>  
38 - </li>  
39 - <li class="shop-tab-nav tab-nav">  
40 - <span data-target="#all-goods" data-trigger="tab" data-funGetNewGoods>新品</span>  
41 - <em>|</em>  
42 - </li>  
43 - <li class="shop-tab-nav tab-nav">  
44 - <a href="{{allGoodsUrl}}">  
45 - <span data-target="#all-goods" data-trigger="tab" data-funGetAllGoods>全部商品</span>  
46 - </a>  
47 - </li>  
48 - </section>  
49 - {{!--shop-tab: 首页--}}  
50 - <div id="red-index" class="tab-panel red-shop-index">  
51 - {{> shop/mip-modules}}  
52 - <div id="indexGoodsContainer" class="goods-container">  
53 - <div class="default-goods container clearfix">  
54 - {{> mip-product-list list=defaultGoods}} 33 + <div class="goods-tab-area">
  34 + <mip-vd-tabs class="tab">
  35 + <section class="shop-tabs tab-navs">
  36 + <li class="shop-tab-nav tab-nav active">
  37 + <span>首页</span>
  38 + <em>|</em>
  39 + </li>
  40 + <li class="shop-tab-nav tab-nav">
  41 + <span>新品</span>
  42 + <em>|</em>
  43 + </li>
  44 + </section>
  45 + {{!--shop-tab: 首页--}}
  46 + <div id="red-index" class="tab-panel red-shop-index">
  47 + {{> shop/mip-modules}}
  48 + <div id="indexGoodsContainer" class="goods-container">
  49 + <div class="default-goods container clearfix">
  50 + {{> mip-product-list list=defaultGoods}}
  51 + </div>
  52 + </div>
  53 + <div class="all-goods">
  54 + <a href="{{allGoodsUrl}}">点击查看全部商品</a>
55 </div> 55 </div>
56 </div> 56 </div>
57 - <div class="all-goods">  
58 - <a href="{{allGoodsUrl}}">点击查看全部商品</a>  
59 - </div>  
60 - </div>  
61 57
62 - {{!--shop-tab: 最新--}}  
63 - <div class="new-goods">  
64 - {{> mip-product-list list=newGoods}} 58 + {{!--shop-tab: 最新--}}
  59 + <div class="new-goods">
  60 + {{> mip-product-list list=newGoods}}
65 61
66 - <div class="all-goods">  
67 - <a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a> 62 + <div class="all-goods">
  63 + <a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
  64 + </div>
68 </div> 65 </div>
69 - </div>  
70 - </mip-vd-tabs> 66 + </mip-vd-tabs>
  67 + <a href="{{allGoodsUrl}}" class="all-goods-tab">
  68 + <span>全部商品</span>
  69 + </a>
  70 + </div>
71 </div> 71 </div>
72 {{> mip-suspend-cart}} 72 {{> mip-suspend-cart}}
73 {{> mip-footer}} 73 {{> mip-footer}}
@@ -22,48 +22,48 @@ @@ -22,48 +22,48 @@
22 {{/if}} 22 {{/if}}
23 </div> 23 </div>
24 24
25 - <mip-vd-tabs class="tab">  
26 - <section class="shop-tabs tab-navs">  
27 - <li class="shop-tab-nav tab-nav active">  
28 - <span data-target="#red-index" data-trigger="tab" data-funHome>首页</span>  
29 - <em>|</em>  
30 - </li>  
31 - <li class="shop-tab-nav tab-nav">  
32 - <span data-target="#all-goods" data-trigger="tab" data-funGetNewGoods>新品</span>  
33 - <em>|</em>  
34 - </li>  
35 - <li class="shop-tab-nav tab-nav">  
36 - <a href="{{allGoodsUrl}}">  
37 - <span data-target="#all-goods" data-trigger="tab" data-funGetAllGoods>全部商品</span>  
38 - </a>  
39 - </li>  
40 - </section>  
41 - {{!--shop-tab: 首页--}}  
42 - <div id="red-index" class="tab-panel red-shop-index">  
43 - {{> shop/mip-modules}}  
44 - <div id="indexGoodsContainer" class="goods-container">  
45 - <div class="default-goods container clearfix">  
46 - {{# defaultGoods}}  
47 - {{> mip-product-list}}  
48 - {{/ defaultGoods}} 25 + <div class="goods-tab-area">
  26 + <mip-vd-tabs class="tab">
  27 + <section class="shop-tabs tab-navs">
  28 + <li class="shop-tab-nav tab-nav active">
  29 + <span data-target="#red-index" data-trigger="tab" data-funHome>首页</span>
  30 + <em>|</em>
  31 + </li>
  32 + <li class="shop-tab-nav tab-nav">
  33 + <span data-target="#all-goods" data-trigger="tab" data-funGetNewGoods>新品</span>
  34 + <em>|</em>
  35 + </li>
  36 + </section>
  37 + {{!--shop-tab: 首页--}}
  38 + <div id="red-index" class="tab-panel red-shop-index">
  39 + {{> shop/mip-modules}}
  40 + <div id="indexGoodsContainer" class="goods-container">
  41 + <div class="default-goods container clearfix">
  42 + {{# defaultGoods}}
  43 + {{> mip-product-list}}
  44 + {{/ defaultGoods}}
  45 + </div>
  46 + </div>
  47 + <div class="all-goods">
  48 + <a href="{{allGoodsUrl}}">点击查看全部商品</a>
49 </div> 49 </div>
50 </div> 50 </div>
51 - <div class="all-goods">  
52 - <a href="{{allGoodsUrl}}">点击查看全部商品</a>  
53 - </div>  
54 - </div>  
55 51
56 - {{!--shop-tab: 最新--}}  
57 - <div class="new-goods">  
58 - {{# newGoods}}  
59 - {{> mip-product-list}}  
60 - {{/ newGoods}} 52 + {{!--shop-tab: 最新--}}
  53 + <div class="new-goods">
  54 + {{# newGoods}}
  55 + {{> mip-product-list}}
  56 + {{/ newGoods}}
61 57
62 - <div class="all-goods">  
63 - <a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a> 58 + <div class="all-goods">
  59 + <a href="{{allGoodsUrl}}&type=new">点击查看全部商品</a>
  60 + </div>
64 </div> 61 </div>
65 - </div>  
66 - </mip-vd-tabs> 62 + </mip-vd-tabs>
  63 + <a href="{{allGoodsUrl}}" class="all-goods-tab">
  64 + <span data-target="#all-goods" data-trigger="tab" data-funGetAllGoods>全部商品</span>
  65 + </a>
  66 + </div>
67 </div> 67 </div>
68 {{> mip-suspend-cart}} 68 {{> mip-suspend-cart}}
69 {{> mip-shop-footer}} 69 {{> mip-shop-footer}}