fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit eb240847d824786ef50c67356585cc85973ac75f 2 parents 2d7a1118 6173d3a3

Merge branch 'release/5.4' of git.yoho.cn:fe/YOHOBUYPC into release/5.4

Inline Side-by-side
Showing 8 changed files with 38 additions and 38 deletions
@@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@
323 <div class="right"> 323 <div class="right">
324 <p class="sum">商品总价（¥{{cartEnsure.productAmmount}}）- 活动（¥{{cartEnsure.activeSale}}）= 商品金额总计（¥{{cartEnsure.productAllA}}）</p> 324 <p class="sum">商品总价（¥{{cartEnsure.productAmmount}}）- 活动（¥{{cartEnsure.activeSale}}）= 商品金额总计（¥{{cartEnsure.productAllA}}）</p>
325 <p> 325 <p>
326 - <a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a> 326 + <a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>
327 共返有货币：{{cartEnsure.getYoho}}个　商品总价（不含运费）： 327 共返有货币：{{cartEnsure.getYoho}}个　商品总价（不含运费）：
328 <strong>¥{{cartEnsure.productAllA}}</strong> 元 328 <strong>¥{{cartEnsure.productAllA}}</strong> 元
329 </p> 329 </p>
@@ -176,7 +176,7 @@ @@ -176,7 +176,7 @@
176 {{/each}} 176 {{/each}}
177 <div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。 177 <div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。
178 </div> 178 </div>
179 - <div class="express-list hide is-sup"><span class="sf">您所选择的区域暂不在顺丰派送范围内,</span><a style="text-decoration: none;" target="_blank" href="{{sfUrl}}">点击查看详情</a></div> 179 + <div class="express-list hide is-sup"><span class="sf">您所选择的区域暂不在顺丰派送范围内,</span><a style="text-decoration: none;" target="_blank" href="{{sfUrl}}" class="hide">点击查看详情</a></div>
180 <div class="express-list sf hide">如您购买的商品为航空禁运品顺丰会用陆运的方式给您派送，预计3-5天送达，请您见谅</div> 180 <div class="express-list sf hide">如您购买的商品为航空禁运品顺丰会用陆运的方式给您派送，预计3-5天送达，请您见谅</div>
181 </div> 181 </div>
182 </div> 182 </div>
@@ -330,7 +330,7 @@ @@ -330,7 +330,7 @@
330 </div> 330 </div>
331 <div class="play-right"> 331 <div class="play-right">
332 <div class="back-coin"> 332 <div class="back-coin">
333 - <a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>共返有货币：{{totalYoho}}个 333 + <a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>共返有货币：{{totalYoho}}个
334 </div> 334 </div>
335 <ul class="play-total"> 335 <ul class="play-total">
336 {{#each promotionFormulaList}} 336 {{#each promotionFormulaList}}
@@ -405,7 +405,7 @@ @@ -405,7 +405,7 @@
405 <input type="button" class="cancel cancel-bi" value="取消"/> 405 <input type="button" class="cancel cancel-bi" value="取消"/>
406 </div> 406 </div>
407 <div class="float-right"> 407 <div class="float-right">
408 - <a class="yoho-coin-help-link" href="/help/?category_id=87" target="_blank">有货币使用规则？</a> 408 + <a class="yoho-coin-help-link" href="/help/detail?id=105" target="_blank">有货币使用规则？</a>
409 </div> 409 </div>
410 </li> 410 </li>
411 </ul> 411 </ul>
@@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@
149 <input type="button" class="cancel cancel-bi" value="取消"/> 149 <input type="button" class="cancel cancel-bi" value="取消"/>
150 </div> 150 </div>
151 <div class="float-right"> 151 <div class="float-right">
152 - <a class="yoho-coin-help-link" href="/help/?category_id=87" target="_blank">有货币使用规则？</a> 152 + <a class="yoho-coin-help-link" href="/help/detail?id=105" target="_blank">有货币使用规则？</a>
153 </div> 153 </div>
154 </li> 154 </li>
155 </ul> 155 </ul>
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <span class="form-prompt form-info" id="{{key}}-tip"> 66 <span class="form-prompt form-info" id="{{key}}-tip">
67 {{tips}} 67 {{tips}}
68 {{#isSelect}} 68 {{#isSelect}}
69 - <a href="{{tipsUrl}}" class="a-underline" target="_blank"> 69 + <a href="{{tipsUrl}}" class="a-underline hide" target="_blank">
70 查看货到付款地区 70 查看货到付款地区
71 </a> 71 </a>
72 {{/isSelect}} 72 {{/isSelect}}
@@ -263,7 +263,7 @@ @@ -263,7 +263,7 @@
263 </table> 263 </table>
264 <div class="order-balance"> 264 <div class="order-balance">
265 <p class="back-coin"> 265 <p class="back-coin">
266 - <a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>共返有货币：{{totalYoho}}个 266 + <a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>共返有货币：{{totalYoho}}个
267 </p> 267 </p>
268 {{#each orderBalance}} 268 {{#each orderBalance}}
269 <p> 269 <p>
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <div class="li-2">实际支付金额</div> 16 <div class="li-2">实际支付金额</div>
17 <div class="li-3">支付方式</div> 17 <div class="li-3">支付方式</div>
18 <div class="li-4"> 18 <div class="li-4">
19 - <a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a> 19 + <a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>
20 共返有货币 20 共返有货币
21 </div> 21 </div>
22 <div class="li-5">获得VIP累计金额</div> 22 <div class="li-5">获得VIP累计金额</div>
@@ -206,19 +206,19 @@ @@ -206,19 +206,19 @@
206 <ul class="clearfix"> 206 <ul class="clearfix">
207 <li class="left"> 207 <li class="left">
208 <p> 208 <p>
209 - <span>新手指南</span> 209 + <span>新手专区</span>
210 </p> 210 </p>
211 <p> 211 <p>
212 - <a href="//www.yohobuy.com/help/?category_id=81#help_b00reg" target="_blank">注册登录</a> 212 + <a href="//www.yohobuy.com/help/detail?id=25" target="_blank">注册登录</a>
213 </p> 213 </p>
214 <p> 214 <p>
215 - <a href="//www.yohobuy.com/help/?category_id=83" target="_blank">选购商品</a> 215 + <a href="//www.yohobuy.com/help/detail?id=27" target="_blank">购物结算</a>
216 </p> 216 </p>
217 <p> 217 <p>
218 - <a href="//www.yohobuy.com/help/?category_id=103" target="_blank">订单支付</a> 218 + <a href="//www.yohobuy.com/help/detail?id=29" target="_blank">下单支付</a>
219 </p> 219 </p>
220 <p> 220 <p>
221 - <a href="//www.yohobuy.com/help/?category_id=85" target="_blank">收货退款</a> 221 + <a href="//www.yohobuy.com/help/detail?id=31" target="_blank">收货评价</a>
222 </p> 222 </p>
223 </li> 223 </li>
224 <li class="left"> 224 <li class="left">
@@ -226,16 +226,16 @@ @@ -226,16 +226,16 @@
226 <span>会员中心</span> 226 <span>会员中心</span>
227 </p> 227 </p>
228 <p> 228 <p>
229 - <a href="//www.yohobuy.com/help/?category_id=87" target="_blank">有货币</a> 229 + <a href="//www.yohobuy.com/help/detail?id=7" target="_blank">会员制度</a>
230 </p> 230 </p>
231 <p> 231 <p>
232 - <a href="//www.yohobuy.com/help/?category_id=91" target="_blank">会员制度</a> 232 + <a href="//www.yohobuy.com/help/detail?id=9" target="_blank">会员优惠</a>
233 </p> 233 </p>
234 <p> 234 <p>
235 - <a href="//www.yohobuy.com/help/?category_id=89" target="_blank">账户管理</a> 235 + <a href="//www.yohobuy.com/help/detail?id=11" target="_blank">账户管理</a>
236 </p> 236 </p>
237 <p> 237 <p>
238 - <a href="//www.yohobuy.com/help/?category_id=93" target="_blank">密码管理</a> 238 + <a href="//www.yohobuy.com/help/detail?id=13" target="_blank">密码管理</a>
239 </p> 239 </p>
240 </li> 240 </li>
241 <li class="left"> 241 <li class="left">
@@ -243,16 +243,16 @@ @@ -243,16 +243,16 @@
243 <span>购物指南</span> 243 <span>购物指南</span>
244 </p> 244 </p>
245 <p> 245 <p>
246 - <a href="//www.yohobuy.com/help/?category_id=95" target="_blank">全球购专区</a> 246 + <a href="//www.yohobuy.com/help/detail?id=33" target="_blank">发票</a>
247 </p> 247 </p>
248 <p> 248 <p>
249 - <a href="//www.yohobuy.com/help/?category_id=97" target="_blank">尺码选择</a> 249 + <a href="//www.yohobuy.com/help/detail?id=35" target="_blank">尺码对照</a>
250 </p> 250 </p>
251 <p> 251 <p>
252 - <a href="//www.yohobuy.com/help/?category_id=99" target="_blank">发票</a> 252 + <a href="//www.yohobuy.com/help/detail?id=37" target="_blank">尺码解读</a>
253 </p> 253 </p>
254 <p> 254 <p>
255 - <a href="//www.yohobuy.com/help/?category_id=101" target="_blank">商品咨询</a> 255 + <a href="//www.yohobuy.com/help/detail?id=39" target="_blank">商品咨询</a>
256 </p> 256 </p>
257 </li> 257 </li>
258 <li class="left"> 258 <li class="left">
@@ -260,16 +260,16 @@ @@ -260,16 +260,16 @@
260 <span>支付方式</span> 260 <span>支付方式</span>
261 </p> 261 </p>
262 <p> 262 <p>
263 - <a href="//www.yohobuy.com/help/?category_id=105" target="_blank">在线支付</a> 263 + <a href="//www.yohobuy.com/help/detail?id=43" target="_blank">在线支付</a>
264 </p> 264 </p>
265 <p> 265 <p>
266 - <a href="//www.yohobuy.com/help/?category_id=107" target="_blank">货到付款</a> 266 + <a href="//www.yohobuy.com/help/detail?id=45" target="_blank">货到付款</a>
267 </p> 267 </p>
268 <p> 268 <p>
269 - <a href="//www.yohobuy.com/help/?category_id=109" target="_blank">优惠券</a> 269 + <a href="//www.yohobuy.com/help/detail?id=47" target="_blank">分期支付</a>
270 </p> 270 </p>
271 <p> 271 <p>
272 - <a href="//www.yohobuy.com/help/?category_id=111" target="_blank">有货币支付</a> 272 + <a href="//www.yohobuy.com/help/detail?id=105" target="_blank">优惠券、有货币</a>
273 </p> 273 </p>
274 </li> 274 </li>
275 <li class="left"> 275 <li class="left">
@@ -277,16 +277,16 @@ @@ -277,16 +277,16 @@
277 <span>配送方式</span> 277 <span>配送方式</span>
278 </p> 278 </p>
279 <p> 279 <p>
280 - <a href="//www.yohobuy.com/help/?category_id=113" target="_blank">配送时间</a> 280 + <a href="//www.yohobuy.com/help/detail?id=109" target="_blank">配送说明</a>
281 </p> 281 </p>
282 <p> 282 <p>
283 - <a href="//www.yohobuy.com/help/?category_id=115" target="_blank">配送范围</a> 283 + <a href="//www.yohobuy.com/help/detail?id=111" target="_blank">运费说明</a>
284 </p> 284 </p>
285 <p> 285 <p>
286 - <a href="//www.yohobuy.com/help/?category_id=119" target="_blank">顺丰速运</a> 286 + <a href="//www.yohobuy.com/help/detail?id=113" target="_blank">验货签收</a>
287 </p> 287 </p>
288 <p> 288 <p>
289 - <a href="//www.yohobuy.com/help/?category_id=117" target="_blank">商品验收与签收</a> 289 + <a href="//www.yohobuy.com/help/detail?id=115" target="_blank">收货样品</a>
290 </p> 290 </p>
291 </li> 291 </li>
292 <li class="left"> 292 <li class="left">
@@ -294,16 +294,16 @@ @@ -294,16 +294,16 @@
294 <span>售后服务</span> 294 <span>售后服务</span>
295 </p> 295 </p>
296 <p> 296 <p>
297 - <a href="//www.yohobuy.com/help/?category_id=121" target="_blank">退换货政策</a> 297 + <a href="//www.yohobuy.com/help/detail?id=49" target="_blank">退换货政策</a>
298 </p> 298 </p>
299 <p> 299 <p>
300 - <a href="//www.yohobuy.com/help/?category_id=123" target="_blank">退换货流程</a> 300 + <a href="//www.yohobuy.com/help/detail?id=51" target="_blank">退换货流程</a>
301 </p> 301 </p>
302 <p> 302 <p>
303 - <a href="//www.yohobuy.com/help/?category_id=125" target="_blank">退款方式与时效</a> 303 + <a href="//www.yohobuy.com/help/detail?id=53" target="_blank">时效承诺</a>
304 </p> 304 </p>
305 <p> 305 <p>
306 - <a href="//www.yohobuy.com/help/?category_id=127" target="_blank">投诉与建议</a> 306 + <a href="//www.yohobuy.com/help/detail?id=55" target="_blank">投诉与建议</a>
307 </p> 307 </p>
308 </li> 308 </li>
309 <li class="left"> 309 <li class="left">
@@ -311,16 +311,16 @@ @@ -311,16 +311,16 @@
311 <span>APP常见问题</span> 311 <span>APP常见问题</span>
312 </p> 312 </p>
313 <p> 313 <p>
314 - <a href="//www.yohobuy.com/help/?category_id=133" target="_blank">IPhone版</a> 314 + <a href="//www.yohobuy.com/help/detail?id=57" target="_blank">IPhone版</a>
315 </p> 315 </p>
316 <p> 316 <p>
317 - <a href="//www.yohobuy.com/help/?category_id=135" target="_blank">Android版</a> 317 + <a href="//www.yohobuy.com/help/detail?id=59" target="_blank">Android版</a>
318 </p> 318 </p>
319 <p> 319 <p>
320 - <a href="//www.yohobuy.com/help/?category_id=137" target="_blank">wap版</a> 320 + <a href="//www.yohobuy.com/help/detail?id=61" target="_blank">wap版</a>
321 </p> 321 </p>
322 <p> 322 <p>
323 - <a href="//www.yohobuy.com/help/?category_id=139" target="_blank">IPAD版</a> 323 + <a href="//www.yohobuy.com/help/detail?id=63" target="_blank">IPAD版</a>
324 </p> 324 </p>
325 </li> 325 </li>
326 </ul> 326 </ul>
@@ -28,7 +28,7 @@ class CurrencyModel @@ -28,7 +28,7 @@ class CurrencyModel
28 $currency = self::currencyList($uid, $condition); 28 $currency = self::currencyList($uid, $condition);
29 $result['currency'] = $currency['list']; 29 $result['currency'] = $currency['list'];
30 $result['pager'] = $currency['pager']; 30 $result['pager'] = $currency['pager'];
31 - $result['coinHelperUrl'] = '//www.yohobuy.com/help/?category_id=87';//有货币帮助 31 + $result['coinHelperUrl'] = '//www.yohobuy.com/help/detail?id=105';//有货币帮助
32 $result['tabs'] = self::currencyTabs($condition['queryType']); 32 $result['tabs'] = self::currencyTabs($condition['queryType']);
33 $result['options'] = self::currencyOptions($condition); 33 $result['options'] = self::currencyOptions($condition);
34 return $result; 34 return $result;