fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit 98246d03be8cb8d3620a623b4eabd54b32687534 2 parents f2ba4834 e20af320

Merge branch 'release/usercenter'

Inline Side-by-side
Showing 17 changed files with 48 additions and 37 deletions
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <strong class="fz18">现金券</strong> 6 <strong class="fz18">现金券</strong>
7 <p class="fz9 bold">CPOUPON</p> 7 <p class="fz9 bold">CPOUPON</p>
8 <div class="pirbox absolute"> 8 <div class="pirbox absolute">
9 - <em class="absolute">￥</em>0 9 + <em class="absolute">&yen;</em>0
10 </div> 10 </div>
11 </div>--> 11 </div>-->
12 <div class="coupon-box chit0"></div> 12 <div class="coupon-box chit0"></div>
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <strong class="fz18">现金券</strong> 6 <strong class="fz18">现金券</strong>
7 <p class="fz9 bold">CPOUPON</p> 7 <p class="fz9 bold">CPOUPON</p>
8 <div class="pirbox absolute"> 8 <div class="pirbox absolute">
9 - <em class="absolute">￥</em>{{amount}} 9 + <em class="absolute">&yen;</em>{{amount}}
10 </div> 10 </div>
11 <div class="count-not fz11 absolute"><hr class="fn-left"><hr class="fn-right">已送达您的账户</div> 11 <div class="count-not fz11 absolute"><hr class="fn-left"><hr class="fn-right">已送达您的账户</div>
12 </div> 12 </div>
@@ -90,9 +90,9 @@ @@ -90,9 +90,9 @@
90 <span class="reco-name">{{name}}</span> 90 <span class="reco-name">{{name}}</span>
91 </p> 91 </p>
92 <p class="price"> 92 <p class="price">
93 - <span class="sale-price {{^price}}no-price{{/price}}">￥{{salePrice}}</span> 93 + <span class="sale-price {{^price}}no-price{{/price}}">&yen;{{salePrice}}</span>
94 {{#price}} 94 {{#price}}
95 - <span class="market-price">￥{{.}}</span> 95 + <span class="market-price">&yen;{{.}}</span>
96 {{/price}} 96 {{/price}}
97 <a class="check-detail" href={{url}}> 97 <a class="check-detail" href={{url}}>
98 查看详情 98 查看详情
@@ -49,7 +49,8 @@ exports.addressAct = (req, res, next) => { @@ -49,7 +49,8 @@ exports.addressAct = (req, res, next) => {
49 module: 'home', 49 module: 'home',
50 page: 'address-act', 50 page: 'address-act',
51 pageHeader: headerModel.setNav({ 51 pageHeader: headerModel.setNav({
52 - navTitle: result.navTitle 52 + navTitle: result.navTitle,
  53 + navBtn: false
53 }), 54 }),
54 title: result.navTitle 55 title: result.navTitle
55 }; 56 };
@@ -161,7 +162,8 @@ exports.addressModify = (req, res, next) => { @@ -161,7 +162,8 @@ exports.addressModify = (req, res, next) => {
161 module: 'home', 162 module: 'home',
162 page: 'address-modify', 163 page: 'address-modify',
163 pageHeader: headerModel.setNav({ 164 pageHeader: headerModel.setNav({
164 - navTitle: '选择地址' 165 + navTitle: '选择地址',
  166 + navBtn: false
165 }), 167 }),
166 title: '选择地址', 168 title: '选择地址',
167 }; 169 };
@@ -184,6 +186,10 @@ exports.addressModify = (req, res, next) => { @@ -184,6 +186,10 @@ exports.addressModify = (req, res, next) => {
184 * @param next 186 * @param next
185 */ 187 */
186 exports.locationList = (req, res, next) => { 188 exports.locationList = (req, res, next) => {
  189 + res.set({
  190 + 'Cache-Control': 'max-age=600'
  191 + });
  192 +
187 addressModel.locationList({ 193 addressModel.locationList({
188 uid: req.user.uid 194 uid: req.user.uid
189 }).then(result => { 195 }).then(result => {
@@ -9,11 +9,12 @@ exports.index = (req, res, next) => { @@ -9,11 +9,12 @@ exports.index = (req, res, next) => {
9 module: 'home', 9 module: 'home',
10 page: 'help', 10 page: 'help',
11 pageHeader: headerModel.setNav({ 11 pageHeader: headerModel.setNav({
12 - navTitle: '帮助中心' 12 + navTitle: '帮助中心',
  13 + navBtn: false
13 }), 14 }),
14 title: '帮助中心', 15 title: '帮助中心',
15 pageFooter: true, 16 pageFooter: true,
16 - iHelp: result, 17 + iHelp: result
17 }); 18 });
18 }).catch(next); 19 }).catch(next);
19 }; 20 };
@@ -24,7 +25,8 @@ exports.helpDetail = (req, res, next) => { @@ -24,7 +25,8 @@ exports.helpDetail = (req, res, next) => {
24 module: 'home', 25 module: 'home',
25 page: 'help-detail', 26 page: 'help-detail',
26 pageHeader: headerModel.setNav({ 27 pageHeader: headerModel.setNav({
27 - navTitle: req.query.name 28 + navTitle: req.query.name,
  29 + navBtn: false
28 }), 30 }),
29 title: req.query.name, 31 title: req.query.name,
30 pageFooter: true, 32 pageFooter: true,
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 {{# banner}} 21 {{# banner}}
22 {{# data}} 22 {{# data}}
23 <a href="{{url}}"> 23 <a href="{{url}}">
24 - <img src="{{image src 640 200 2}}" alt="img"> 24 + <img src="{{image src 640 200}}" alt="img">
25 </a> 25 </a>
26 {{/ data}} 26 {{/ data}}
27 {{/ banner}} 27 {{/ banner}}
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 {{# productList}} 23 {{# productList}}
24 <li class="swiper-slide"> 24 <li class="swiper-slide">
25 <a href="{{link}}"> 25 <a href="{{link}}">
26 - <img class="swiper-lazy" data-src="{{image imgUrl 97 150}}" alt=""/> 26 + <img class="swiper-lazy" data-src="{{image imgUrl 235 314}}" alt=""/>
27 </a> 27 </a>
28 <div class="brand-product"> 28 <div class="brand-product">
29 <div class="{{# discount}}price-discount{{/ discount}}"> 29 <div class="{{# discount}}price-discount{{/ discount}}">
@@ -7,11 +7,11 @@ @@ -7,11 +7,11 @@
7 <ul class="cost block"> 7 <ul class="cost block">
8 <li> 8 <li>
9 年度累计金额： 9 年度累计金额：
10 - <span>￥{{costOfThisYear}}</span> 10 + <span>&yen;{{costOfThisYear}}</span>
11 </li> 11 </li>
12 <li> 12 <li>
13 历史消费总金额： 13 历史消费总金额：
14 - <span>￥{{sumCost}}</span> 14 + <span>&yen;{{sumCost}}</span>
15 </li> 15 </li>
16 </ul> 16 </ul>
17 17
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 您已升级至最高的等级啦！ 7 您已升级至最高的等级啦！
8 </p> 8 </p>
9 <p class="sum-cost"> 9 <p class="sum-cost">
10 - 年度累计金额<span> ￥{{costOfThisYear}}</span> 10 + 年度累计金额<span> &yen;{{costOfThisYear}}</span>
11 </p> 11 </p>
12 <div class="progresser"> 12 <div class="progresser">
13 <div class="outer"></div> 13 <div class="outer"></div>
@@ -24,11 +24,11 @@ @@ -24,11 +24,11 @@
24 <span class="vip-icon vip-2"></span> 24 <span class="vip-icon vip-2"></span>
25 </p> 25 </p>
26 <p class="grade-desc"> 26 <p class="grade-desc">
27 - 还差<span class="cost-gap">￥{{costGap}}</span>就可以升级为白金会员! 27 + 还差<span class="cost-gap">&yen;{{costGap}}</span>就可以升级为白金会员!
28 <span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span> 28 <span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span>
29 </p> 29 </p>
30 <p class="sum-cost"> 30 <p class="sum-cost">
31 - 年度累计金额<span> ￥{{costOfThisYear}}</span> 31 + 年度累计金额<span> &yen;{{costOfThisYear}}</span>
32 </p> 32 </p>
33 <div class="progresser"> 33 <div class="progresser">
34 <div class="outer"></div> 34 <div class="outer"></div>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 金卡会员 37 金卡会员
38 </span> 38 </span>
39 <span class="beacon beacon-max">白金卡会员</span> 39 <span class="beacon beacon-max">白金卡会员</span>
40 - <span class="cost-limit">￥5000.00</span> 40 + <span class="cost-limit">&yen;5000.00</span>
41 </div> 41 </div>
42 {{/if}} 42 {{/if}}
43 43
@@ -47,11 +47,11 @@ @@ -47,11 +47,11 @@
47 <span class="vip-icon vip-1"></span> 47 <span class="vip-icon vip-1"></span>
48 </p> 48 </p>
49 <p class="grade-desc"> 49 <p class="grade-desc">
50 - 还差<span class="cost-gap">￥{{costGap}}</span>就可以升级为金卡会员! 50 + 还差<span class="cost-gap">&yen;{{costGap}}</span>就可以升级为金卡会员!
51 <span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span> 51 <span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span>
52 </p> 52 </p>
53 <p class="sum-cost"> 53 <p class="sum-cost">
54 - 年度累计金额<span> ￥{{costOfThisYear}}</span> 54 + 年度累计金额<span> &yen;{{costOfThisYear}}</span>
55 </p> 55 </p>
56 <div class="progresser"> 56 <div class="progresser">
57 <div class="outer"></div> 57 <div class="outer"></div>
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 银卡会员 60 银卡会员
61 </span> 61 </span>
62 <span class="beacon beacon-max">金卡会员</span> 62 <span class="beacon beacon-max">金卡会员</span>
63 - <span class="cost-limit">￥2000.00</span> 63 + <span class="cost-limit">&yen;2000.00</span>
64 </div> 64 </div>
65 {{/if}} 65 {{/if}}
66 66
@@ -70,11 +70,11 @@ @@ -70,11 +70,11 @@
70 <span>普通会员</span> 70 <span>普通会员</span>
71 </p> 71 </p>
72 <p class="grade-desc"> 72 <p class="grade-desc">
73 - 还差<span class="cost-gap">￥{{costGap}}</span>就可以升级为银卡会员! 73 + 还差<span class="cost-gap">&yen;{{costGap}}</span>就可以升级为银卡会员!
74 <span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span> 74 <span class="sub-desc">(VIP金额累计需订单成功签收满15天并无退换货)</span>
75 </p> 75 </p>
76 <p class="sum-cost"> 76 <p class="sum-cost">
77 - 年度累计金额<span> ￥{{costOfThisYear}}</span> 77 + 年度累计金额<span> &yen;{{costOfThisYear}}</span>
78 </p> 78 </p>
79 <div class="progresser"> 79 <div class="progresser">
80 <div class="outer"></div> 80 <div class="outer"></div>
@@ -83,6 +83,6 @@ @@ -83,6 +83,6 @@
83 普通 83 普通
84 </span> 84 </span>
85 <span class="beacon beacon-max">银卡会员</span> 85 <span class="beacon beacon-max">银卡会员</span>
86 - <span class="cost-limit">￥600.00</span> 86 + <span class="cost-limit">&yen;600.00</span>
87 </div> 87 </div>
88 {{/if}} 88 {{/if}}
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 </div> 9 </div>
10 <div class="price"> 10 <div class="price">
11 <span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span> 11 <span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span>
12 - {{#price}}<span class="old-price">￥{{.}}</span>{{/price}} 12 + {{#price}}<span class="old-price">&yen;{{.}}</span>{{/price}}
13 </div> 13 </div>
14 <div class="swiper-lazy-preloader"></div> 14 <div class="swiper-lazy-preloader"></div>
15 </a> 15 </a>
@@ -14,13 +14,13 @@ @@ -14,13 +14,13 @@
14 <a href="{{url}}" class="nav-sub-right">{{text}}</a> 14 <a href="{{url}}" class="nav-sub-right">{{text}}</a>
15 {{/shopPage}} 15 {{/shopPage}}
16 {{#currencyPage}} 16 {{#currencyPage}}
17 - <a href="/home/helpDetail?code=20151230-102233&caption=有货币介绍" class="iconfont nav-home">&#xe639;</a> 17 + <a href="/home/helpDetail?code=20151230-102233&caption=有货币介绍&name=有货币介绍" class="iconfont nav-home">&#xe639;</a>
18 {{/currencyPage}} 18 {{/currencyPage}}
19 {{#currencyDetailPage}} 19 {{#currencyDetailPage}}
20 - <a href="/home/helpDetail?code=20111130-152530&caption=如何使用有货币支付" class="iconfont nav-home">&#xe639;</a> 20 + <a href="/home/helpDetail?code=20111130-152530&caption=如何使用有货币支付&name=如何使用有货币支付" class="iconfont nav-home">&#xe639;</a>
21 {{/currencyDetailPage}} 21 {{/currencyDetailPage}}
22 {{#installmentPage}} 22 {{#installmentPage}}
23 - <a href="/home/helpDetail?code=20151230-102233&caption=有货分期" class="iconfont nav-home">&#xe639;</a> 23 + <a href="/home/helpDetail?code=20151230-102233&caption=有货分期&name=有货分期" class="iconfont nav-home">&#xe639;</a>
24 {{/installmentPage}} 24 {{/installmentPage}}
25 {{#navPhone}} 25 {{#navPhone}}
26 <a href="{{.}}" class="iconfont nav-home">&#xe641;</a> 26 <a href="{{.}}" class="iconfont nav-home">&#xe641;</a>
@@ -193,6 +193,7 @@ function bindAddressListEvent(html) { @@ -193,6 +193,7 @@ function bindAddressListEvent(html) {
193 if (window.localStorage && window.localStorage.getItem) { 193 if (window.localStorage && window.localStorage.getItem) {
194 chinaAddressList = window.localStorage.getItem('chinaAddressList'); 194 chinaAddressList = window.localStorage.getItem('chinaAddressList');
195 } 195 }
  196 +
196 if (chinaAddressList) { 197 if (chinaAddressList) {
197 bindAddressListEvent(chinaAddressList); 198 bindAddressListEvent(chinaAddressList);
198 } else { 199 } else {
@@ -201,12 +202,14 @@ if (chinaAddressList) { @@ -201,12 +202,14 @@ if (chinaAddressList) {
201 $.ajax({ 202 $.ajax({
202 method: 'GET', 203 method: 'GET',
203 url: '/home/locationList', 204 url: '/home/locationList',
204 - timeout: 60000 205 + timeout: 60000,
  206 + cache: true
205 }).then(function(html) { 207 }).then(function(html) {
206 bindAddressListEvent(html); 208 bindAddressListEvent(html);
207 - if (window.localStorage && window.localStorage.setItem) {  
208 - window.localStorage.setItem('chinaAddressList', html);  
209 - } 209 +
  210 + // if (window.localStorage && window.localStorage.setItem) {
  211 + // window.localStorage.setItem('chinaAddressList', html);
  212 + // }
210 }).fail(function() { 213 }).fail(function() {
211 tip.show('获取省市区列表失败'); 214 tip.show('获取省市区列表失败');
212 }); 215 });
@@ -223,7 +223,7 @@ @@ -223,7 +223,7 @@
223 height: auto; 223 height: auto;
224 color: #fff; 224 color: #fff;
225 line-height: 40px; 225 line-height: 40px;
226 - font-size: 14px; 226 + font-size: 14PX;
227 } 227 }
228 } 228 }
229 } 229 }
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 30
31 .price { 31 .price {
32 margin: 0.3rem 0; 32 margin: 0.3rem 0;
33 - font-size: 16px; 33 + font-size: 16PX;
34 } 34 }
35 35
36 .sale-price { 36 .sale-price {
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 font-size: 24px; 107 font-size: 24px;
108 border-bottom: 1px solid #e0e0e0; 108 border-bottom: 1px solid #e0e0e0;
109 padding-bottom: 20px; 109 padding-bottom: 20px;
110 - height: 120px; 110 + height: 140px;
111 overflow: hidden; 111 overflow: hidden;
112 position: relative; 112 position: relative;
113 113
@@ -288,7 +288,7 @@ @@ -288,7 +288,7 @@
288 margin: 0 30px; 288 margin: 0 30px;
289 289
290 .swiper-slide { 290 .swiper-slide {
291 - width: 225px; 291 + width: 255px;
292 height: 100%; 292 height: 100%;
293 float: left; 293 float: left;
294 padding-right: 30px; 294 padding-right: 30px;
@@ -307,6 +307,7 @@ @@ -307,6 +307,7 @@
307 .num { 307 .num {
308 color: #e0e0e0; 308 color: #e0e0e0;
309 float: right; 309 float: right;
  310 + font-size: 16PX;
310 } 311 }
311 } 312 }
312 } 313 }
@@ -124,14 +124,13 @@ @@ -124,14 +124,13 @@
124 .create-new-suggest { 124 .create-new-suggest {
125 display: block; 125 display: block;
126 width: 100%; 126 width: 100%;
127 - height: 88px; 127 + height: 150px;
128 line-height: 88px; 128 line-height: 88px;
129 text-align: center; 129 text-align: center;
130 font-size: 30px; 130 font-size: 30px;
131 border-top: 30px solid #f0f0f0; 131 border-top: 30px solid #f0f0f0;
132 border-bottom: 30px solid #f0f0f0; 132 border-bottom: 30px solid #f0f0f0;
133 position: relative; 133 position: relative;
134 - height: 88px;  
135 134
136 .list-item { 135 .list-item {
137 padding: 0 35px; 136 padding: 0 35px;