fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 39bf156a560612bebf43d05bc97dabe1302dcda0 2 parents 2cebc90d 7dc2c12a

Merge remote-tracking branch 'origin/beta' into develop

Inline Side-by-side
Showing 28 changed files with 592 additions and 44 deletions
  1 +<?php return function ($in, $debugopt = 1) {
  2 + $cx = array(
  3 + 'flags' => array(
  4 + 'jstrue' => false,
  5 + 'jsobj' => false,
  6 + 'spvar' => true,
  7 + 'prop' => false,
  8 + 'method' => false,
  9 + 'mustlok' => true,
  10 + 'echo' => false,
  11 + 'debug' => $debugopt,
  12 + ),
  13 + 'constants' => array(),
  14 + 'helpers' => array(),
  15 + 'blockhelpers' => array(),
  16 + 'hbhelpers' => array(),
  17 + 'partials' => array(),
  18 + 'scopes' => array(),
  19 + 'sp_vars' => array('root' => $in),
  20 + 'lcrun' => 'Plugin\LCRun3',
  21 +
  22 + );
  23 +
  24 + return '<!DOCTYPE html>
  25 +<html>
  26 +<head>
  27 + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  28 + <meta charset="utf-8">
  29 + <title>'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('staticTitle')), ENT_QUOTES, 'UTF-8').'</title>
  30 + <meta name="apple-mobile-web-app-title" content="SUMMER SALE">
  31 + <meta name="format-detection" content="telephone=no">
  32 + <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui" media="(device-height: 568px)">
  33 + <meta name="apple-mobile-web-app-capable" content="yes">
  34 + <meta name="apple-mobile-web-app-status-bar-style" content="grey">
  35 + <link rel="stylesheet" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/css/final/sale.css">
  36 + <script>
  37 + (function(doc, win) {
  38 + var docEl = doc.documentElement;
  39 + (function() {
  40 + var clientWidth = docEl.clientWidth;
  41 + if (!clientWidth) {
  42 + return;
  43 + }
  44 + docEl.style.fontSize = 20 * (clientWidth / 320) + \'px\';
  45 + }());
  46 + })(document, window);
  47 + </script>
  48 +</head>
  49 +<body class="keBody">
  50 +'.((Plugin\LCRun3::ifvar($cx, Plugin\LCRun3::v($cx, $in, array('weixinShare')))) ? '<div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src="http://img11.static.yhbimg.com/couponImg/2016/01/07/07/016f63f5bb1f12cdb19402371323d26798.png"/></div>
  51 +' : '').'
  52 +<div class="coupon-christmas" show="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('showPopupFlag')), ENT_QUOTES, 'UTF-8').'">
  53 + <div class="coupon-top">
  54 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/top-bg.png" alt="">
  55 + <a class="go-check" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('myCouponUrl')), ENT_QUOTES, 'UTF-8').'"></a>
  56 + <a class="share-btn" href="javascript:;"></a>
  57 + </div>
  58 + <div class="coupon-bottom">
  59 + <div class="coupon-banner">
  60 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_1')), ENT_QUOTES, 'UTF-8').'"></a>
  61 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_2')), ENT_QUOTES, 'UTF-8').'"></a>
  62 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_3')), ENT_QUOTES, 'UTF-8').'"></a>
  63 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_4')), ENT_QUOTES, 'UTF-8').'"></a>
  64 + </div>
  65 + <div class="bottom-btn">
  66 + <a class="follow-yoho" href="http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&amp;mid=201849402&amp;idx=1&amp;sn=c0089812f9769d82e0075f69d771f6e1#rd"></a>
  67 + <a class="download-yoho" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('downAppUrl')), ENT_QUOTES, 'UTF-8').'"></a>
  68 + </div>
  69 + </div>
  70 + <div class="coupon-ft">
  71 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/14.png">
  72 + </div>
  73 +</div>
  74 +<div class="modal"></div>
  75 +<div class="dialog-box geted">
  76 + <div class="dialog-inner">
  77 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/geted-2.png" alt=""/>
  78 + <span class="dialog-close"></span>
  79 + </div>
  80 +</div>
  81 +
  82 +<div class="dialog-box fail">
  83 + <div class="dialog-inner">
  84 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/fail-2.png" alt=""/>
  85 + <span class="refresh-btn"></span>
  86 + </div>
  87 +</div>
  88 +<input id="shareLink" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareLink')), ENT_QUOTES, 'UTF-8').'">
  89 +<input id="shareImg" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareImg')), ENT_QUOTES, 'UTF-8').'">
  90 +<input id="shareTitle" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareTitle')), ENT_QUOTES, 'UTF-8').'">
  91 +<input id="shareDesc" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareDesc')), ENT_QUOTES, 'UTF-8').'">
  92 +<script type="text/javascript" src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/js/jquery.min.js"></script>
  93 +<script>
  94 + //提示分享
  95 + $(\'.share-btn\').click(function () {
  96 + $(\'.modal\').fadeIn();
  97 + });
  98 + //关闭提示分享
  99 + $(\'.modal\').click(function () {
  100 + $(this).fadeOut();
  101 + });
  102 +
  103 + //提示已领过券
  104 + if ($(\'.coupon-christmas\').attr(\'show\') === \'1\') {
  105 + $(\'.dialog-box.geted\').show();
  106 + }
  107 + //提示领券失败
  108 + else if ($(\'.coupon-christmas\').attr(\'show\') === \'2\') {
  109 + $(\'.dialog-box.fail\').show();
  110 + }
  111 +
  112 + //关闭提示
  113 + $(\'.dialog-close\').click(function(){
  114 + $(this).parents(\'.dialog-box\').fadeOut();
  115 + });
  116 + //刷新页面
  117 + $(\'.refresh-btn\').click(function() {
  118 + location.reload();
  119 + });
  120 +</script>
  121 +'.((Plugin\LCRun3::ifvar($cx, Plugin\LCRun3::v($cx, $in, array('weixinShare')))) ? '<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  122 +<script type="text/javascript" charset="utf-8" src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('jsUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/js/share.weixin.js"></script>
  123 +' : '').''.'<!-- Google Tag Manager -->
  124 +<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  125 +<script>
  126 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({\'gtm.start\':
  127 + new Date().getTime(),event:\'gtm.js\'});var f=d.getElementsByTagName(s)[0],
  128 + j=d.createElement(s),dl=l!=\'dataLayer\'?\'&l=\'+l:\'\';j.async=true;j.src=
  129 + \'//www.googletagmanager.com/gtm.js?id=\'+i+dl;f.parentNode.insertBefore(j,f);
  130 + })(window,document,\'script\',\'dataLayer\',\'GTM-W958MG\');
  131 +</script>
  132 +<!-- End Google Tag Manager -->
  133 +<script type="text/javascript">
  134 + var _hmt = _hmt || [];
  135 + (function() {
  136 + var hm = document.createElement("script");
  137 + hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
  138 + var s = document.getElementsByTagName("script")[0];
  139 + s.parentNode.insertBefore(hm, s);
  140 + })();
  141 +</script>
  142 +<script>
  143 + var _hmt = _hmt || [];
  144 + (function() {
  145 + var hm = document.createElement("script");
  146 + hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
  147 + var s = document.getElementsByTagName("script")[0];
  148 + s.parentNode.insertBefore(hm, s);
  149 + })();
  150 +</script>
  151 +'.'</body>
  152 +</html>';
  153 +}
  154 +?>
  1 +<?php return function ($in, $debugopt = 1) {
  2 + $cx = array(
  3 + 'flags' => array(
  4 + 'jstrue' => false,
  5 + 'jsobj' => false,
  6 + 'spvar' => true,
  7 + 'prop' => false,
  8 + 'method' => false,
  9 + 'mustlok' => true,
  10 + 'echo' => false,
  11 + 'debug' => $debugopt,
  12 + ),
  13 + 'constants' => array(),
  14 + 'helpers' => array(),
  15 + 'blockhelpers' => array(),
  16 + 'hbhelpers' => array(),
  17 + 'partials' => array(),
  18 + 'scopes' => array(),
  19 + 'sp_vars' => array('root' => $in),
  20 + 'lcrun' => 'Plugin\LCRun3',
  21 +
  22 + );
  23 +
  24 + return '<!DOCTYPE html>
  25 +<html>
  26 +<head>
  27 + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  28 + <meta charset="utf-8">
  29 + <title>'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('staticTitle')), ENT_QUOTES, 'UTF-8').'</title>
  30 + <meta name="apple-mobile-web-app-title" content="SUMMER SALE">
  31 + <meta name="format-detection" content="telephone=no">
  32 + <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui" media="(device-height: 568px)">
  33 + <meta name="apple-mobile-web-app-capable" content="yes">
  34 + <meta name="apple-mobile-web-app-status-bar-style" content="grey">
  35 + <link rel="stylesheet" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/css/final/sale.css">
  36 + <script>
  37 + (function(doc, win) {
  38 + var docEl = doc.documentElement;
  39 + (function() {
  40 + var clientWidth = docEl.clientWidth;
  41 + if (!clientWidth) {
  42 + return;
  43 + }
  44 + docEl.style.fontSize = 20 * (clientWidth / 320) + \'px\';
  45 + }());
  46 + })(document, window);
  47 + </script>
  48 +</head>
  49 +<body class="keBody">
  50 +'.((Plugin\LCRun3::ifvar($cx, Plugin\LCRun3::v($cx, $in, array('weixinShare')))) ? '<div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src="http://img11.static.yhbimg.com/couponImg/2016/01/07/07/016f63f5bb1f12cdb19402371323d26798.png"/></div>
  51 +' : '').'
  52 +<div class="coupon-christmas" show="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('showPopupFlag')), ENT_QUOTES, 'UTF-8').'">
  53 + <div class="coupon-top">
  54 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/top-bg.png" alt="">
  55 + <a class="go-check" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('myCouponUrl')), ENT_QUOTES, 'UTF-8').'"></a>
  56 + <a class="share-btn" href="javascript:;"></a>
  57 + </div>
  58 + <div class="coupon-bottom">
  59 + <div class="coupon-banner">
  60 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_1')), ENT_QUOTES, 'UTF-8').'"></a>
  61 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_2')), ENT_QUOTES, 'UTF-8').'"></a>
  62 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_3')), ENT_QUOTES, 'UTF-8').'"></a>
  63 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_4')), ENT_QUOTES, 'UTF-8').'"></a>
  64 + </div>
  65 + <div class="bottom-btn">
  66 + <a class="follow-yoho" href="http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&amp;mid=201849402&amp;idx=1&amp;sn=c0089812f9769d82e0075f69d771f6e1#rd"></a>
  67 + <a class="download-yoho" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('downAppUrl')), ENT_QUOTES, 'UTF-8').'"></a>
  68 + </div>
  69 + </div>
  70 + <div class="coupon-ft">
  71 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/14.png">
  72 + </div>
  73 +</div>
  74 +<div class="modal"></div>
  75 +<div class="dialog-box geted">
  76 + <div class="dialog-inner">
  77 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/geted.png" alt=""/>
  78 + <span class="dialog-close"></span>
  79 + </div>
  80 +</div>
  81 +
  82 +<div class="dialog-box fail">
  83 + <div class="dialog-inner">
  84 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/fail.png" alt=""/>
  85 + <span class="refresh-btn"></span>
  86 + </div>
  87 +</div>
  88 +<input id="shareLink" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareLink')), ENT_QUOTES, 'UTF-8').'">
  89 +<input id="shareImg" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareImg')), ENT_QUOTES, 'UTF-8').'">
  90 +<input id="shareTitle" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareTitle')), ENT_QUOTES, 'UTF-8').'">
  91 +<input id="shareDesc" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareDesc')), ENT_QUOTES, 'UTF-8').'">
  92 +<script type="text/javascript" src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/js/jquery.min.js"></script>
  93 +<script>
  94 + //提示分享
  95 + $(\'.share-btn\').click(function () {
  96 + $(\'.modal\').fadeIn();
  97 + });
  98 + //关闭提示分享
  99 + $(\'.modal\').click(function () {
  100 + $(this).fadeOut();
  101 + });
  102 +
  103 + //提示已领过券
  104 + if ($(\'.coupon-christmas\').attr(\'show\') === \'1\') {
  105 + $(\'.dialog-box.geted\').show();
  106 + }
  107 + //提示领券失败
  108 + else if ($(\'.coupon-christmas\').attr(\'show\') === \'2\') {
  109 + $(\'.dialog-box.fail\').show();
  110 + }
  111 +
  112 + //关闭提示
  113 + $(\'.dialog-close\').click(function(){
  114 + $(this).parents(\'.dialog-box\').fadeOut();
  115 + });
  116 + //刷新页面
  117 + $(\'.refresh-btn\').click(function() {
  118 + location.reload();
  119 + });
  120 +</script>
  121 +'.((Plugin\LCRun3::ifvar($cx, Plugin\LCRun3::v($cx, $in, array('weixinShare')))) ? '<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  122 +<script type="text/javascript" charset="utf-8" src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('jsUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/js/share.weixin.js"></script>
  123 +' : '').''.'<!-- Google Tag Manager -->
  124 +<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  125 +<script>
  126 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({\'gtm.start\':
  127 + new Date().getTime(),event:\'gtm.js\'});var f=d.getElementsByTagName(s)[0],
  128 + j=d.createElement(s),dl=l!=\'dataLayer\'?\'&l=\'+l:\'\';j.async=true;j.src=
  129 + \'//www.googletagmanager.com/gtm.js?id=\'+i+dl;f.parentNode.insertBefore(j,f);
  130 + })(window,document,\'script\',\'dataLayer\',\'GTM-W958MG\');
  131 +</script>
  132 +<!-- End Google Tag Manager -->
  133 +<script type="text/javascript">
  134 + var _hmt = _hmt || [];
  135 + (function() {
  136 + var hm = document.createElement("script");
  137 + hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
  138 + var s = document.getElementsByTagName("script")[0];
  139 + s.parentNode.insertBefore(hm, s);
  140 + })();
  141 +</script>
  142 +<script>
  143 + var _hmt = _hmt || [];
  144 + (function() {
  145 + var hm = document.createElement("script");
  146 + hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
  147 + var s = document.getElementsByTagName("script")[0];
  148 + s.parentNode.insertBefore(hm, s);
  149 + })();
  150 +</script>
  151 +'.'</body>
  152 +</html>';
  153 +}
  154 +?>
  1 +<?php return function ($in, $debugopt = 1) {
  2 + $cx = array(
  3 + 'flags' => array(
  4 + 'jstrue' => false,
  5 + 'jsobj' => false,
  6 + 'spvar' => true,
  7 + 'prop' => false,
  8 + 'method' => false,
  9 + 'mustlok' => true,
  10 + 'echo' => false,
  11 + 'debug' => $debugopt,
  12 + ),
  13 + 'constants' => array(),
  14 + 'helpers' => array(),
  15 + 'blockhelpers' => array(),
  16 + 'hbhelpers' => array(),
  17 + 'partials' => array(),
  18 + 'scopes' => array(),
  19 + 'sp_vars' => array('root' => $in),
  20 + 'lcrun' => 'Plugin\LCRun3',
  21 +
  22 + );
  23 +
  24 + return '<!DOCTYPE html>
  25 +<html>
  26 +<head>
  27 + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  28 + <meta charset="utf-8">
  29 + <title>'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('staticTitle')), ENT_QUOTES, 'UTF-8').'</title>
  30 + <meta name="apple-mobile-web-app-title" content="SUMMER SALE">
  31 + <meta name="format-detection" content="telephone=no">
  32 + <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui" media="(device-height: 568px)">
  33 + <meta name="apple-mobile-web-app-capable" content="yes">
  34 + <meta name="apple-mobile-web-app-status-bar-style" content="grey">
  35 + <link rel="stylesheet" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/css/final/sale.css">
  36 + <script>
  37 + (function(doc, win) {
  38 + var docEl = doc.documentElement;
  39 + (function() {
  40 + var clientWidth = docEl.clientWidth;
  41 + if (!clientWidth) {
  42 + return;
  43 + }
  44 + docEl.style.fontSize = 20 * (clientWidth / 320) + \'px\';
  45 + }());
  46 + })(document, window);
  47 + </script>
  48 +</head>
  49 +<body class="keBody">
  50 +<div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src="http://img11.static.yhbimg.com/couponImg/2016/01/07/07/016f63f5bb1f12cdb19402371323d26798.png"/></div>
  51 +<div class="coupon-christmas" show="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('showPopupFlag')), ENT_QUOTES, 'UTF-8').'">
  52 + <div class="coupon-top">
  53 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/top-bg.png" alt="">
  54 + <a class="go-check" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('myCouponUrl')), ENT_QUOTES, 'UTF-8').'"></a>
  55 + <a class="share-btn" href="javascript:;"></a>
  56 + </div>
  57 + <div class="coupon-bottom">
  58 + <div class="coupon-banner">
  59 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_1')), ENT_QUOTES, 'UTF-8').'"></a>
  60 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_2')), ENT_QUOTES, 'UTF-8').'"></a>
  61 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_3')), ENT_QUOTES, 'UTF-8').'"></a>
  62 + <a href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('bannerUrl_4')), ENT_QUOTES, 'UTF-8').'"></a>
  63 + </div>
  64 + <div class="bottom-btn">
  65 + <a class="follow-yoho" href="http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&amp;mid=201849402&amp;idx=1&amp;sn=c0089812f9769d82e0075f69d771f6e1#rd"></a>
  66 + <a class="download-yoho" href="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('downAppUrl')), ENT_QUOTES, 'UTF-8').'"></a>
  67 + </div>
  68 + </div>
  69 + <div class="coupon-ft">
  70 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/14.png">
  71 + </div>
  72 +</div>
  73 +<div class="modal"></div>
  74 +<div class="dialog-box geted">
  75 + <div class="dialog-inner">
  76 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/geted.png" alt=""/>
  77 + <span class="dialog-close"></span>
  78 + </div>
  79 +</div>
  80 +
  81 +<div class="dialog-box fail">
  82 + <div class="dialog-inner">
  83 + <img src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/img/final/fail.png" alt=""/>
  84 + <span class="refresh-btn"></span>
  85 + </div>
  86 +</div>
  87 +<input id="shareLink" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareLink')), ENT_QUOTES, 'UTF-8').'">
  88 +<input id="shareImg" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareImg')), ENT_QUOTES, 'UTF-8').'">
  89 +<input id="shareTitle" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareTitle')), ENT_QUOTES, 'UTF-8').'">
  90 +<input id="shareDesc" type="hidden" value="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('shareDesc')), ENT_QUOTES, 'UTF-8').'">
  91 +<script type="text/javascript" src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('imgUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/js/jquery.min.js"></script>
  92 +<script>
  93 + //提示分享
  94 + $(\'.share-btn\').click(function () {
  95 + $(\'.modal\').fadeIn();
  96 + });
  97 + //关闭提示分享
  98 + $(\'.modal\').click(function () {
  99 + $(this).fadeOut();
  100 + });
  101 +
  102 + //提示已领过券
  103 + if ($(\'.coupon-christmas\').attr(\'show\') === \'1\') {
  104 + $(\'.dialog-box.geted\').show();
  105 + }
  106 + //提示领券失败
  107 + else if ($(\'.coupon-christmas\').attr(\'show\') === \'2\') {
  108 + $(\'.dialog-box.fail\').show();
  109 + }
  110 +
  111 + //关闭提示
  112 + $(\'.dialog-close\').click(function(){
  113 + $(this).parents(\'.dialog-box\').fadeOut();
  114 + });
  115 + //刷新页面
  116 + $(\'.refresh-btn\').click(function() {
  117 + location.reload();
  118 + });
  119 +</script>
  120 +'.((Plugin\LCRun3::ifvar($cx, Plugin\LCRun3::v($cx, $in, array('weixinShare')))) ? '<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  121 +<script type="text/javascript" charset="utf-8" src="'.htmlentities((string)Plugin\LCRun3::v($cx, $in, array('jsUrl')), ENT_QUOTES, 'UTF-8').'/cuxiao/js/share.weixin.js"></script>
  122 +' : '').''.'<!-- Google Tag Manager -->
  123 +<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  124 +<script>
  125 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({\'gtm.start\':
  126 + new Date().getTime(),event:\'gtm.js\'});var f=d.getElementsByTagName(s)[0],
  127 + j=d.createElement(s),dl=l!=\'dataLayer\'?\'&l=\'+l:\'\';j.async=true;j.src=
  128 + \'//www.googletagmanager.com/gtm.js?id=\'+i+dl;f.parentNode.insertBefore(j,f);
  129 + })(window,document,\'script\',\'dataLayer\',\'GTM-W958MG\');
  130 +</script>
  131 +<!-- End Google Tag Manager -->
  132 +<script type="text/javascript">
  133 + var _hmt = _hmt || [];
  134 + (function() {
  135 + var hm = document.createElement("script");
  136 + hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
  137 + var s = document.getElementsByTagName("script")[0];
  138 + s.parentNode.insertBefore(hm, s);
  139 + })();
  140 +</script>
  141 +<script>
  142 + var _hmt = _hmt || [];
  143 + (function() {
  144 + var hm = document.createElement("script");
  145 + hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
  146 + var s = document.getElementsByTagName("script")[0];
  147 + s.parentNode.insertBefore(hm, s);
  148 + })();
  149 +</script>
  150 +'.'</body>
  151 +</html>';
  152 +}
  153 +?>
@@ -819,26 +819,83 @@ @@ -819,26 +819,83 @@
819 name: '', 819 name: '',
820 price: '', 820 price: '',
821 salePrice: '', 821 salePrice: '',
822 - colors: [ 822 + /**colors: [
823 { 823 {
824 id: 1, 824 id: 1,
825 chosed: true, 825 chosed: true,
826 name: '黄色'， 826 name: '黄色'，
827 colorNum：10， 827 colorNum：10，
828 shortUrl：'', 828 shortUrl：'',
829 - sizes: [  
830 - { 829 + },
  830 + ...
  831 + ],**/
  832 +
  833 + colors: [
  834 + {
  835 + color:[//说明:第一行,其colorNum的值为其下所有尺码数量之和,不需要sizeNumStr的值.
  836 + {
  837 + id: 1,
  838 + name: '黄色'，
  839 + colorNum：10，
  840 + shortUrl：'',
  841 + },
  842 + {
  843 + id: 2,
  844 + name: '红色'，
  845 + colorNum：20，
  846 + shortUrl：'',
  847 + }
  848 + ]
  849 + },
  850 + {
  851 + color:[//说明:第二行至最后一行,其colorNum的值为其对应尺码的数量,不需要sizeNumStr的值.
  852 + {
  853 + id: 1,
  854 + name: '黄色'，
  855 + colorNum：10，
  856 + shortUrl：'',
  857 + },
  858 + {
  859 + id: 2,
  860 + name: '红色'，
  861 + colorNum：20，
  862 + shortUrl：'',
  863 + }
  864 + ]
  865 + }
  866 + ],
  867 +
  868 + sizes: [
  869 + {
  870 + size:[//说明:第一行,显示所有的尺寸,即为下面的defaultSizes,不需要numStr的值
  871 + {
  872 + id: 1,
  873 + name: 'M',
  874 + sizeNum: 2
  875 + },
  876 + {
831 id: 2, 877 id: 2,
832 - chosed: true,  
833 name: 'X', 878 name: 'X',
834 sizeNum: 2 879 sizeNum: 2
835 - },  
836 - ...  
837 - ] 880 + }
  881 + ]
838 }, 882 },
839 - ...  
840 - ],  
841 - defaultSizes: [ 883 + {
  884 + size:[//说明:第一行至最后一行,不需要numStr的值
  885 + {
  886 + id: 3,
  887 + name: 'M',
  888 + sizeNum: 2
  889 + },
  890 + {
  891 + id: 4,
  892 + name: 'X',
  893 + sizeNum: 2
  894 + }
  895 + ]
  896 + }
  897 + ]
  898 + /**defaultSizes: [
842 { 899 {
843 numZero: true, 900 numZero: true,
844 name: 'X', 901 name: 'X',
@@ -847,7 +904,7 @@ @@ -847,7 +904,7 @@
847 ... 904 ...
848 ] 905 ]
849 906
850 - totalNum: 20 907 + totalNum: 20**/
851 } 908 }
852 909
853 ### 购物车商品 910 ### 购物车商品
@@ -35,14 +35,14 @@ class Yohobuy @@ -35,14 +35,14 @@ class Yohobuy
35 const SERVICE_URL = 'http://testservice.yoho.cn:28077/'; 35 const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
36 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 36 const YOHOBUY_URL = 'http://www.yohobuy.com/';
37 const API_OLD = 'http://test2.open.yohobuy.com/'; 37 const API_OLD = 'http://test2.open.yohobuy.com/';
38 - 38 +
39 /* 预览环境 */ 39 /* 预览环境 */
40 // const API_URL = 'http://preapi.yoho.cn/'; 40 // const API_URL = 'http://preapi.yoho.cn/';
41 // const API_URL2 = 'http://preapi.yoho.cn/'; 41 // const API_URL2 = 'http://preapi.yoho.cn/';
42 // const SERVICE_URL = 'http://serviceh5.yoho.cn/'; 42 // const SERVICE_URL = 'http://serviceh5.yoho.cn/';
43 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 43 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
44 // const API_OLD = 'http://api2.open.yohobuy.com/'; 44 // const API_OLD = 'http://api2.open.yohobuy.com/';
45 - 45 +
46 /* PC重构地址 */ 46 /* PC重构地址 */
47 // const API_URL = 'http://test.open.yohobuy.com/'; 47 // const API_URL = 'http://test.open.yohobuy.com/';
48 // const SERVICE_URL = 'http://test.service.api.yohobuy.com/'; 48 // const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
@@ -385,7 +385,7 @@ class FloorProcess @@ -385,7 +385,7 @@ class FloorProcess
385 if (isset($one['url'])) { 385 if (isset($one['url'])) {
386 $one['url'] = Helpers::getFilterUrl($one['url']); 386 $one['url'] = Helpers::getFilterUrl($one['url']);
387 } 387 }
388 - $one['img'] = Helpers::getImageUrl($one['src'], 98, 98); 388 + $one['img'] = Helpers::getImageUrl($one['src'], 275, 160);
389 unset($one['src']); 389 unset($one['src']);
390 } 390 }
391 if (!empty($data)) { 391 if (!empty($data)) {
@@ -767,7 +767,7 @@ class Helpers @@ -767,7 +767,7 @@ class Helpers
767 */ 767 */
768 public static function syncUserSession($uid, $refer = '', $callback = 'call') 768 public static function syncUserSession($uid, $refer = '', $callback = 'call')
769 { 769 {
770 - return 'http://mapi.yohobuy.com/Passport/session/index?callback=' . $callback 770 + return 'http://m1.yohobuy.com/Passport/session/index?callback=' . $callback
771 . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer; 771 . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer;
772 } 772 }
773 773
@@ -783,7 +783,7 @@ class Helpers @@ -783,7 +783,7 @@ class Helpers
783 */ 783 */
784 public static function logoutSession($token, $refer = '', $callback = 'call') 784 public static function logoutSession($token, $refer = '', $callback = 'call')
785 { 785 {
786 - return 'http://mapi.yohobuy.com/Passport/session/logout?callback=' . $callback 786 + return 'http://m1.yohobuy.com/Passport/session/logout?callback=' . $callback
787 . '&sign=' . md5(md5('Js8Yn0!EwPM45-ws')) . '&token=' . $token . '&go=' . $refer; 787 . '&sign=' . md5(md5('Js8Yn0!EwPM45-ws')) . '&token=' . $token . '&go=' . $refer;
788 } 788 }
789 789
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -116,10 +116,10 @@ @@ -116,10 +116,10 @@
116 116
117 .dialog-inner span { 117 .dialog-inner span {
118 position: absolute; 118 position: absolute;
119 - width: 9rem; 119 + width: 8.225rem;
120 height: 1.85rem; 120 height: 1.85rem;
121 - bottom: 0.6rem; 121 + bottom: 1.475rem;
122 left: 50%; 122 left: 50%;
123 - margin: 0 0 0 -4.5rem; 123 + margin: 0 0 0 -4.1125rem;
124 cursor: pointer; 124 cursor: pointer;
125 } 125 }
@@ -91,7 +91,14 @@ module.exports = function(specificGender) { @@ -91,7 +91,14 @@ module.exports = function(specificGender) {
91 if (data === ' ') { 91 if (data === ' ') {
92 searching = false; 92 searching = false;
93 loading.hideLoadingMask(); 93 loading.hideLoadingMask();
94 - if (gender) { 94 +
  95 + //修复有货币页面最后一条数据显示被遮挡的问题
  96 + if (specificGender) {
  97 + window.rePosFooter();
  98 + }
  99 +
  100 + // 有货币页面不加载底部
  101 + if (gender && !specificGender) {
95 if (gender === '1,3') { 102 if (gender === '1,3') {
96 url = '/boys/bottomBanner'; 103 url = '/boys/bottomBanner';
97 } else { 104 } else {
@@ -11,6 +11,9 @@ @@ -11,6 +11,9 @@
11 var goodsConsultsEle = $('#goods-consults')[0], 11 var goodsConsultsEle = $('#goods-consults')[0],
12 goodsConsultsHammer = goodsConsultsEle && new Hammer(goodsConsultsEle); 12 goodsConsultsHammer = goodsConsultsEle && new Hammer(goodsConsultsEle);
13 13
  14 +var productId,
  15 + total;
  16 +
14 function showCountPlus($el) { 17 function showCountPlus($el) {
15 var $count = $el.find('.animate-count'); 18 var $count = $el.find('.animate-count');
16 19
@@ -24,6 +27,13 @@ function showCountPlus($el) { @@ -24,6 +27,13 @@ function showCountPlus($el) {
24 }); 27 });
25 } 28 }
26 29
  30 +(function() {
  31 + var queryStr = window.location.search.substring(1);
  32 +
  33 + productId = queryStr.split('&')[0].split('=')[1];
  34 + total = queryStr.split('&')[1] ? queryStr.split('&')[1].split('=')[1] : undefined;
  35 +})();
  36 +
27 if (goodsConsultsHammer) { 37 if (goodsConsultsHammer) {
28 38
29 goodsConsultsHammer.on('tap', function(e) { 39 goodsConsultsHammer.on('tap', function(e) {
@@ -45,7 +55,9 @@ if (goodsConsultsHammer) { @@ -45,7 +55,9 @@ if (goodsConsultsHammer) {
45 method: 'post', 55 method: 'post',
46 url: url, 56 url: url,
47 data: { 57 data: {
48 - id: id 58 + id: id,
  59 + productId: productId,
  60 + total: total
49 } 61 }
50 }).done(function(data) { 62 }).done(function(data) {
51 if (data.code === 200) { 63 if (data.code === 200) {
@@ -24,6 +24,10 @@ @@ -24,6 +24,10 @@
24 </script> 24 </script>
25 </head> 25 </head>
26 <body class="keBody"> 26 <body class="keBody">
  27 +{{#if weixinShare}}
  28 +<div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src="http://img11.static.yhbimg.com/couponImg/2016/01/07/07/016f63f5bb1f12cdb19402371323d26798.png"/></div>
  29 +{{/if}}
  30 +
27 <div class="coupon-christmas" show="{{showPopupFlag}}"> 31 <div class="coupon-christmas" show="{{showPopupFlag}}">
28 <div class="coupon-top"> 32 <div class="coupon-top">
29 <img src="{{imgUrl}}/cuxiao/img/final/top-bg.png" alt=""> 33 <img src="{{imgUrl}}/cuxiao/img/final/top-bg.png" alt="">
@@ -49,14 +53,14 @@ @@ -49,14 +53,14 @@
49 <div class="modal"></div> 53 <div class="modal"></div>
50 <div class="dialog-box geted"> 54 <div class="dialog-box geted">
51 <div class="dialog-inner"> 55 <div class="dialog-inner">
52 - <img src="{{imgUrl}}/cuxiao/img/final/geted.png" alt=""/> 56 + <img src="{{imgUrl}}/cuxiao/img/final/geted-2.png" alt=""/>
53 <span class="dialog-close"></span> 57 <span class="dialog-close"></span>
54 </div> 58 </div>
55 </div> 59 </div>
56 60
57 <div class="dialog-box fail"> 61 <div class="dialog-box fail">
58 <div class="dialog-inner"> 62 <div class="dialog-inner">
59 - <img src="{{imgUrl}}/cuxiao/img/final/fail.png" alt=""/> 63 + <img src="{{imgUrl}}/cuxiao/img/final/fail-2.png" alt=""/>
60 <span class="refresh-btn"></span> 64 <span class="refresh-btn"></span>
61 </div> 65 </div>
62 </div> 66 </div>
1 1
2 {{> layout/header}} 2 {{> layout/header}}
3 <div class="yoho-coin-detail-page yoho-page"> 3 <div class="yoho-coin-detail-page yoho-page">
4 - <div class="money">你拥有的有货币：<span>{{ money}}</span></div>  
5 -  
6 <ul class="coin-detail"></ul> 4 <ul class="coin-detail"></ul>
7 </div> 5 </div>
8 {{> layout/footer}} 6 {{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="login-page passport-page yoho-page"> 2 <div class="login-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -41,4 +41,4 @@ @@ -41,4 +41,4 @@
41 </ul> 41 </ul>
42 </div> 42 </div>
43 </div> 43 </div>
44 -{{> layout/footer_passport}}  
  44 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="login-international-page passport-page yoho-page"> 2 <div class="login-international-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -13,4 +13,4 @@ @@ -13,4 +13,4 @@
13 <span id="btn-login" class="btn btn-login disble row">登录</span> 13 <span id="btn-login" class="btn btn-login disble row">登录</span>
14 </div> 14 </div>
15 </div> 15 </div>
16 -{{> layout/footer_passport}}  
  16 +{{> layout/footer}}
@@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
6 {{#navHome}} 6 {{#navHome}}
7 <a href="{{.}}" class="iconfont nav-home">&#xe611;</a> 7 <a href="{{.}}" class="iconfont nav-home">&#xe611;</a>
8 {{/navHome}} 8 {{/navHome}}
  9 + {{#currencyPage}}
  10 + <a href="/home/help" class="iconfont nav-home">&#xe639;</a>
  11 + {{/currencyPage}}
9 {{#navPhone}} 12 {{#navPhone}}
10 <a href="{{.}}" class="iconfont nav-home">&#xe641;</a> 13 <a href="{{.}}" class="iconfont nav-home">&#xe641;</a>
11 {{/navPhone}} 14 {{/navPhone}}
@@ -665,7 +665,7 @@ class CouponController extends HuodongAction @@ -665,7 +665,7 @@ class CouponController extends HuodongAction
665 'shareImg' => 'http://img11.static.yhbimg.com/couponImg/2016/01/07/07/016f63f5bb1f12cdb19402371323d26798.png', 665 'shareImg' => 'http://img11.static.yhbimg.com/couponImg/2016/01/07/07/016f63f5bb1f12cdb19402371323d26798.png',
666 'showPopupFlag' => $showPopupFlag, 666 'showPopupFlag' => $showPopupFlag,
667 'myCouponUrl' => $myCouponUrl, 667 'myCouponUrl' => $myCouponUrl,
668 - 'bannerUrl_1' => 'http://feature.yoho.cn/0112/0112APPHOMEBOY/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"FINAL SALE重磅升级","url":"http://feature.yoho.cn/0112/0112APPHOMEBOY/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"536"},"param":{"share_id":"536"}}', 668 + 'bannerUrl_1' => 'http://feature.yoho.cn/0112/0112APPHOMEBOY/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"FINAL SALE重磅升级","url":"http://feature.yoho.cn/0112/0112APPHOMEBOY/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"536"},"param":{"share_id":"536"}}}',
669 'bannerUrl_2' => 'http://feature.yoho.cn/0112/0112APPHOMEGIRL/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"FINAL SALE重磅升级","url":"http://feature.yoho.cn/0112/0112APPHOMEGIRL/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"534"},"param":{"share_id":"534"}}}', 669 'bannerUrl_2' => 'http://feature.yoho.cn/0112/0112APPHOMEGIRL/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"FINAL SALE重磅升级","url":"http://feature.yoho.cn/0112/0112APPHOMEGIRL/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"534"},"param":{"share_id":"534"}}}',
670 'bannerUrl_3' => 'http://feature.yoho.cn/0112/0112APPHOMEKIDS/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"FINAL SALE重磅升级","url":"http://feature.yoho.cn/0112/0112APPHOMEKIDS/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"532"},"param":{"share_id":"532"}}}', 670 'bannerUrl_3' => 'http://feature.yoho.cn/0112/0112APPHOMEKIDS/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"FINAL SALE重磅升级","url":"http://feature.yoho.cn/0112/0112APPHOMEKIDS/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"532"},"param":{"share_id":"532"}}}',
671 'bannerUrl_4' => 'http://feature.yoho.cn/0112/0112APPHOMELIFE/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"FINAL SALE重磅升级","url":"http://feature.yoho.cn/0112/0112APPHOMELIFE/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"530"},"param":{"share_id":"530"}}}', 671 'bannerUrl_4' => 'http://feature.yoho.cn/0112/0112APPHOMELIFE/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"FINAL SALE重磅升级","url":"http://feature.yoho.cn/0112/0112APPHOMELIFE/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"530"},"param":{"share_id":"530"}}}',
@@ -727,7 +727,9 @@ class HomeController extends AbstractAction @@ -727,7 +727,9 @@ class HomeController extends AbstractAction
727 //调用取消订单接口,返回订单取消状态 727 //调用取消订单接口,返回订单取消状态
728 $data = OrderData::cancelOrderData($orderCode, $uid, $gender, $channel); 728 $data = OrderData::cancelOrderData($orderCode, $uid, $gender, $channel);
729 //将取消状态返回至浏览器 729 //将取消状态返回至浏览器
730 - if (empty($data['code']) && empty($data['message'])) { 730 + if (!$data) {
  731 + $this->echoJson(array('message' => '取消订单失败'));
  732 + } else if (empty($data['code']) && empty($data['message'])) {
731 $this->echoJson(array('code' => 200)); 733 $this->echoJson(array('code' => 200));
732 } else { 734 } else {
733 $this->echoJson($data); 735 $this->echoJson($data);
@@ -988,8 +990,8 @@ class HomeController extends AbstractAction @@ -988,8 +990,8 @@ class HomeController extends AbstractAction
988 // 审判跳转登录页 990 // 审判跳转登录页
989 $this->auditJumpLogin(); 991 $this->auditJumpLogin();
990 992
991 - $this->setTitle('YOHO币');  
992 - $this->setNavHeader('YOHO币', true, false); 993 + $this->setTitle('YOHO币明细');
  994 + $this->setNavHeader('YOHO币明细', true, false);
993 995
994 $data = UserModel::getYohoCoinLists($this->_uid, 0, 20); 996 $data = UserModel::getYohoCoinLists($this->_uid, 0, 20);
995 $this->_view->display('currency-detail', array( 997 $this->_view->display('currency-detail', array(
@@ -397,7 +397,7 @@ class UserModel @@ -397,7 +397,7 @@ class UserModel
397 // 处理数据 397 // 处理数据
398 foreach ($banner['data'] as $val) { 398 foreach ($banner['data'] as $val) {
399 foreach ($val['data'] as $single) { 399 foreach ($val['data'] as $single) {
400 - $result['url'] = ''; 400 + $result['url'] = Helpers::getFilterUrl($single['url']);
401 $result['img'] = Helpers::getImageUrl($single['src'], 640, 200); 401 $result['img'] = Helpers::getImageUrl($single['src'], 640, 200);
402 } 402 }
403 } 403 }
@@ -607,9 +607,10 @@ class DetailModel @@ -607,9 +607,10 @@ class DetailModel
607 * @param int $uid 用户ID 607 * @param int $uid 用户ID
608 * @param int $id 咨询ID 608 * @param int $id 咨询ID
609 * @param int $productId 商品ID 609 * @param int $productId 商品ID
  610 + * @param int $total 购买咨询总数
610 * @return array 611 * @return array
611 */ 612 */
612 - public static function upvoteConsult($uid, $id, $productId) 613 + public static function upvoteConsult($uid, $id, $productId, $total)
613 { 614 {
614 $result = array('code' => 400, 'message' => '出错啦~'); 615 $result = array('code' => 400, 'message' => '出错啦~');
615 616
@@ -619,7 +620,7 @@ class DetailModel @@ -619,7 +620,7 @@ class DetailModel
619 if (empty($uid)) { 620 if (empty($uid)) {
620 $result['code'] = 401; 621 $result['code'] = 401;
621 $result['message'] = '用户id为空'; 622 $result['message'] = '用户id为空';
622 - $result['data'] = Helpers::url('/signin.html', array('refer' => Helpers::url('/product/detail/consultform', array('product_id' => $productId)))); 623 + $result['data'] = Helpers::url('/signin.html', array('refer' => Helpers::url('/product/detail/consults', array('product_id' => $productId, 'total' => $total))));
623 break; 624 break;
624 } 625 }
625 626
@@ -639,9 +640,10 @@ class DetailModel @@ -639,9 +640,10 @@ class DetailModel
639 * @param int $uid 用户ID 640 * @param int $uid 用户ID
640 * @param int $id 咨询ID 641 * @param int $id 咨询ID
641 * @param int $productId 商品ID 642 * @param int $productId 商品ID
  643 + * @param int $total 购买咨询总数
642 * @return array 644 * @return array
643 */ 645 */
644 - public static function usefulConsult($uid, $id, $productId) 646 + public static function usefulConsult($uid, $id, $productId, $total)
645 { 647 {
646 $result = array('code' => 400, 'message' => '出错啦~'); 648 $result = array('code' => 400, 'message' => '出错啦~');
647 649
@@ -651,7 +653,7 @@ class DetailModel @@ -651,7 +653,7 @@ class DetailModel
651 if (empty($uid)) { 653 if (empty($uid)) {
652 $result['code'] = 401; 654 $result['code'] = 401;
653 $result['message'] = '用户id为空'; 655 $result['message'] = '用户id为空';
654 - $result['data'] = Helpers::url('/signin.html', array('refer' => Helpers::url('/product/detail/consultform', array('product_id' => $productId)))); 656 + $result['data'] = Helpers::url('/signin.html', array('refer' => Helpers::url('/product/detail/consults', array('product_id' => $productId, 'total' => $total))));
655 break; 657 break;
656 } 658 }
657 659
@@ -176,10 +176,11 @@ class DetailController extends AbstractAction @@ -176,10 +176,11 @@ class DetailController extends AbstractAction
176 $result = array(); 176 $result = array();
177 177
178 if ($this->isAjax()) { 178 if ($this->isAjax()) {
179 - $productId = $this->get('product_id', 0); 179 + $productId = $this->post('productId', 0);
  180 + $total = $this->post('total', 0);
180 $uid = $this->getUid(); 181 $uid = $this->getUid();
181 $id = $this->post('id'); 182 $id = $this->post('id');
182 - $result = \Product\DetailModel::upvoteConsult($uid, $id, $productId); 183 + $result = \Product\DetailModel::upvoteConsult($uid, $id, $productId, $total);
183 } 184 }
184 185
185 $this->echoJson($result); 186 $this->echoJson($result);
@@ -193,10 +194,11 @@ class DetailController extends AbstractAction @@ -193,10 +194,11 @@ class DetailController extends AbstractAction
193 $result = array(); 194 $result = array();
194 195
195 if ($this->isAjax()) { 196 if ($this->isAjax()) {
196 - $productId = $this->get('product_id', 0); 197 + $productId = $this->post('productId', 0);
  198 + $total = $this->post('total', 0);
197 $uid = $this->getUid(); 199 $uid = $this->getUid();
198 $id = $this->post('id'); 200 $id = $this->post('id');
199 - $result = \Product\DetailModel::usefulConsult($uid, $id, $productId); 201 + $result = \Product\DetailModel::usefulConsult($uid, $id, $productId, $total);
200 } 202 }
201 203
202 $this->echoJson($result); 204 $this->echoJson($result);
@@ -194,9 +194,9 @@ class IndexController extends AbstractAction @@ -194,9 +194,9 @@ class IndexController extends AbstractAction
194 194
195 if (isset($condition['gender'])) { 195 if (isset($condition['gender'])) {
196 $condition['gender'] = rawurldecode($condition['gender']); 196 $condition['gender'] = rawurldecode($condition['gender']);
197 - } else { 197 + }/* else {
198 $condition['gender'] = Helpers::getGenderByCookie(); 198 $condition['gender'] = Helpers::getGenderByCookie();
199 - } 199 + }*/
200 200
201 $data = array(); 201 $data = array();
202 $data['goodListPage'] = true; 202 $data['goodListPage'] = true;