diff --git a/library/Action/HuodongAction.php b/library/Action/HuodongAction.php
index f250769..2e45526 100644
--- a/library/Action/HuodongAction.php
+++ b/library/Action/HuodongAction.php
@@ -53,7 +53,10 @@ class HuodongAction extends Controller_Abstract
$this->_view->assign('jsUrl', $config->js->url);
}
if (isset($config->css->url)) {
- $this->_view->assign('cssUrl', $config->js->url);
+ $this->_view->assign('cssUrl', $config->css->url);
+ }
+ if (isset($config->css->url)) {
+ $this->_view->assign('imgUrl', $config->img->url);
}
}
diff --git a/static/huodong/cuxiao/css/christmas/index.css b/static/huodong/cuxiao/css/christmas/index.css
new file mode 100644
index 0000000..6054c22
--- /dev/null
+++ b/static/huodong/cuxiao/css/christmas/index.css
@@ -0,0 +1,120 @@
+* {
+ margin: 0;
+ padding: 0;
+}
+.coupon-christmas img {
+ display: block;
+ max-width: 100%;
+}
+
+.coupon-top {
+ position: relative;
+}
+.coupon-top .go-check {
+ position: absolute;
+ top: 4.325rem;
+ width: 100%;
+ height: 6.85rem;
+}
+.coupon-top .share-btn {
+ position: absolute;
+ width: 13.75rem;
+ height: 2.25rem;
+ bottom: 1rem;
+ left: 50%;
+ margin: 0 0 0 -6.875rem;
+ background-size: 100%;
+
+}
+
+.coupon-bottom {
+ padding: 0 0 1.075rem;
+ background: url(../../img/christmas/bottom-bg.png) no-repeat bottom center;
+ background-size: 100% auto;
+}
+
+.coupon-banner {
+ margin: 0 auto 0.525rem;
+ width: 13.85rem;
+}
+
+.bottom-btn {
+ position: relative;
+ width: 13.725rem;
+ height: 1.725rem;
+ margin: 0 auto;
+ font-size: 0;
+}
+.bottom-btn a{
+ position: absolute;
+ top: 0;
+ width: 8.2rem;
+ height: 100%;
+}
+.bottom-btn a.follow-yoho {
+ width: 5.275rem;
+ left: 0;
+}
+.bottom-btn a.download-yoho {
+ right: 0;
+}
+.modal {
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ background: url(../../img/christmas/share.png) center top no-repeat;
+ -webkit-background-size: 100%;
+ -moz-background-size: 100%;
+ background-size: 100%;
+ display: none;
+}
+
+.has-done {
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ background: rgba(0,0,0,0.4) url(../../img/christmas/11.png);
+ background-repeat: no-repeat;
+ background-size: 80% auto;
+ background-position: center center;
+ overflow: hidden;
+ display: none;
+}
+
+.dialog-box {
+ display: none;
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ background: rgba(0,0,0,0.4);
+ z-index: 999;
+}
+
+.dialog-inner {
+ position: absolute;
+ width: 13.375rem;
+ height: 9.625rem;
+ top: 50%;
+ left: 50%;
+ margin: -4.8125rem 0 0 -6.6875rem;
+}
+
+.dialog-inner img {
+ max-width: 100%;
+}
+
+.dialog-inner span {
+ position: absolute;
+ width: 8.225rem;
+ height: 1.85rem;
+ bottom: 1.475rem;
+ left: 50%;
+ margin: 0 0 0 -4.1125rem;
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/static/huodong/cuxiao/css/newuser/help.css b/static/huodong/cuxiao/css/newuser/help.css
new file mode 100644
index 0000000..191c6cc
--- /dev/null
+++ b/static/huodong/cuxiao/css/newuser/help.css
@@ -0,0 +1,98 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+ v2.0 | 20110126
+ License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
+}
+body {
+ /*font-size: 62.5%;*/
+ line-height: 1;
+ font-family: 'STHeiti','Microsoft YaHei';
+}
+ol, ul {
+ list-style: none;
+}
+blockquote, q {
+ quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: '';
+ content: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+/* main style */
+header,
+.content{
+ padding: 0 0.3rem;
+}
+header{
+ height: 2.2rem;
+ background-color: #3f3f3f;
+ color:#fff;
+ line-height: 2.2rem;
+ text-align: left;
+}
+header span{
+ font-size: 0.85rem;
+
+}
+header a{
+ display: inline-block;
+ vertical-align: center;
+ margin-right: 3.5rem;
+ height: 1rem;
+ width: 0.8rem;
+ background-image: url(../../img/newuser/return.png) ;
+ background-size: cover;
+}
+.content{
+ padding :0.75rem;
+ font-size: 0.6rem;
+ line-height: 0.95rem;
+ color: #444;
+}
+.steps h1 span{
+ display: inline-block;
+ width: 0.7rem;
+ height: 0.6rem;
+ margin-right: 0.3rem;
+ background:url(../../img/newuser/tip.png);
+ background-size: cover;
+}
+.content b{
+ font-weight: 900;
+}
+.content .instruction{
+ margin-bottom: 1rem;
+}
+.content .step{
+ margin-bottom: 1rem;
+}
\ No newline at end of file
diff --git a/static/huodong/cuxiao/img/christmas/04.jpg b/static/huodong/cuxiao/img/christmas/04.jpg
new file mode 100644
index 0000000..f181645
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/04.jpg differ
diff --git a/static/huodong/cuxiao/img/christmas/11.png b/static/huodong/cuxiao/img/christmas/11.png
new file mode 100644
index 0000000..4bb3f40
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/11.png differ
diff --git a/static/huodong/cuxiao/img/christmas/12.jpg b/static/huodong/cuxiao/img/christmas/12.jpg
new file mode 100644
index 0000000..3410ed7
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/12.jpg differ
diff --git a/static/huodong/cuxiao/img/christmas/14.jpg b/static/huodong/cuxiao/img/christmas/14.jpg
new file mode 100644
index 0000000..6a234ce
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/14.jpg differ
diff --git a/static/huodong/cuxiao/img/christmas/banner01.png b/static/huodong/cuxiao/img/christmas/banner01.png
new file mode 100644
index 0000000..6916be2
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/banner01.png differ
diff --git a/static/huodong/cuxiao/img/christmas/banner02.png b/static/huodong/cuxiao/img/christmas/banner02.png
new file mode 100644
index 0000000..ee4dce5
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/banner02.png differ
diff --git a/static/huodong/cuxiao/img/christmas/bottom-bg.png b/static/huodong/cuxiao/img/christmas/bottom-bg.png
new file mode 100644
index 0000000..23b55a0
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/bottom-bg.png differ
diff --git a/static/huodong/cuxiao/img/christmas/bottom-btn.png b/static/huodong/cuxiao/img/christmas/bottom-btn.png
new file mode 100644
index 0000000..f04fded
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/bottom-btn.png differ
diff --git a/static/huodong/cuxiao/img/christmas/fail.png b/static/huodong/cuxiao/img/christmas/fail.png
new file mode 100644
index 0000000..fd34d8c
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/fail.png differ
diff --git a/static/huodong/cuxiao/img/christmas/geted.png b/static/huodong/cuxiao/img/christmas/geted.png
new file mode 100644
index 0000000..f6b2c2d
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/geted.png differ
diff --git a/static/huodong/cuxiao/img/christmas/op.png b/static/huodong/cuxiao/img/christmas/op.png
new file mode 100644
index 0000000..efc7111
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/op.png differ
diff --git a/static/huodong/cuxiao/img/christmas/share-btn.png b/static/huodong/cuxiao/img/christmas/share-btn.png
new file mode 100644
index 0000000..f0b102e
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/share-btn.png differ
diff --git a/static/huodong/cuxiao/img/christmas/share.png b/static/huodong/cuxiao/img/christmas/share.png
new file mode 100644
index 0000000..1fdeb35
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/share.png differ
diff --git a/static/huodong/cuxiao/img/christmas/top-bg.png b/static/huodong/cuxiao/img/christmas/top-bg.png
new file mode 100644
index 0000000..99c944b
Binary files /dev/null and b/static/huodong/cuxiao/img/christmas/top-bg.png differ
diff --git a/static/huodong/cuxiao/img/newuser/01.jpg b/static/huodong/cuxiao/img/newuser/01.jpg
new file mode 100644
index 0000000..c931bbc
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/01.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/02.jpg b/static/huodong/cuxiao/img/newuser/02.jpg
new file mode 100644
index 0000000..53d36b0
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/02.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/03.jpg b/static/huodong/cuxiao/img/newuser/03.jpg
new file mode 100644
index 0000000..420db12
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/03.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/04.jpg b/static/huodong/cuxiao/img/newuser/04.jpg
new file mode 100644
index 0000000..220a1f3
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/04.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/05.jpg b/static/huodong/cuxiao/img/newuser/05.jpg
new file mode 100644
index 0000000..dfe96ec
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/05.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/06.jpg b/static/huodong/cuxiao/img/newuser/06.jpg
new file mode 100644
index 0000000..d9567e8
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/06.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/07.jpg b/static/huodong/cuxiao/img/newuser/07.jpg
new file mode 100644
index 0000000..da71acc
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/07.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/08.jpg b/static/huodong/cuxiao/img/newuser/08.jpg
new file mode 100644
index 0000000..e12b691
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/08.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/09.jpg b/static/huodong/cuxiao/img/newuser/09.jpg
new file mode 100644
index 0000000..86495c5
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/09.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/10.jpg b/static/huodong/cuxiao/img/newuser/10.jpg
new file mode 100644
index 0000000..23a6ce0
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/10.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/11.jpg b/static/huodong/cuxiao/img/newuser/11.jpg
new file mode 100644
index 0000000..e115cf1
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/11.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/12.jpg b/static/huodong/cuxiao/img/newuser/12.jpg
new file mode 100644
index 0000000..66f720e
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/12.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/13.jpg b/static/huodong/cuxiao/img/newuser/13.jpg
new file mode 100644
index 0000000..034c049
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/13.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/14.jpg b/static/huodong/cuxiao/img/newuser/14.jpg
new file mode 100644
index 0000000..3f09551
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/14.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/15.jpg b/static/huodong/cuxiao/img/newuser/15.jpg
new file mode 100644
index 0000000..d020e49
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/15.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/16.jpg b/static/huodong/cuxiao/img/newuser/16.jpg
new file mode 100644
index 0000000..eb70f71
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/16.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/17.jpg b/static/huodong/cuxiao/img/newuser/17.jpg
new file mode 100644
index 0000000..9ab0390
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/17.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/18.jpg b/static/huodong/cuxiao/img/newuser/18.jpg
new file mode 100644
index 0000000..04df851
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/18.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/19.jpg b/static/huodong/cuxiao/img/newuser/19.jpg
new file mode 100644
index 0000000..0c3ebd5
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/19.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/20.jpg b/static/huodong/cuxiao/img/newuser/20.jpg
new file mode 100644
index 0000000..33d0fc8
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/20.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/21.jpg b/static/huodong/cuxiao/img/newuser/21.jpg
new file mode 100644
index 0000000..eabe030
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/21.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/22.jpg b/static/huodong/cuxiao/img/newuser/22.jpg
new file mode 100644
index 0000000..b6d638a
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/22.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/23.jpg b/static/huodong/cuxiao/img/newuser/23.jpg
new file mode 100644
index 0000000..0593d69
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/23.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/24-1.jpg b/static/huodong/cuxiao/img/newuser/24-1.jpg
new file mode 100644
index 0000000..aaa58e8
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/24-1.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/24-2.jpg b/static/huodong/cuxiao/img/newuser/24-2.jpg
new file mode 100644
index 0000000..bff7cfb
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/24-2.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/24-3.jpg b/static/huodong/cuxiao/img/newuser/24-3.jpg
new file mode 100644
index 0000000..9b2d521
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/24-3.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/25.jpg b/static/huodong/cuxiao/img/newuser/25.jpg
new file mode 100644
index 0000000..03681c2
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/25.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/26.jpg b/static/huodong/cuxiao/img/newuser/26.jpg
new file mode 100644
index 0000000..d504513
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/26.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/27.jpg b/static/huodong/cuxiao/img/newuser/27.jpg
new file mode 100644
index 0000000..e4c8da2
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/27.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/banner.jpg b/static/huodong/cuxiao/img/newuser/banner.jpg
new file mode 100644
index 0000000..655b05f
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/banner.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-01.jpg b/static/huodong/cuxiao/img/newuser/brand-01.jpg
new file mode 100644
index 0000000..8d60474
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-01.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-02.jpg b/static/huodong/cuxiao/img/newuser/brand-02.jpg
new file mode 100644
index 0000000..fdb8d39
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-02.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-03.jpg b/static/huodong/cuxiao/img/newuser/brand-03.jpg
new file mode 100644
index 0000000..1513946
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-03.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-04.jpg b/static/huodong/cuxiao/img/newuser/brand-04.jpg
new file mode 100644
index 0000000..ea56532
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-04.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-05.jpg b/static/huodong/cuxiao/img/newuser/brand-05.jpg
new file mode 100644
index 0000000..3281dbf
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-05.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-06.jpg b/static/huodong/cuxiao/img/newuser/brand-06.jpg
new file mode 100644
index 0000000..47c4438
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-06.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-07.jpg b/static/huodong/cuxiao/img/newuser/brand-07.jpg
new file mode 100644
index 0000000..10f1202
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-07.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-08.jpg b/static/huodong/cuxiao/img/newuser/brand-08.jpg
new file mode 100644
index 0000000..d5229ae
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-08.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-09.jpg b/static/huodong/cuxiao/img/newuser/brand-09.jpg
new file mode 100644
index 0000000..10c77ad
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-09.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-10.jpg b/static/huodong/cuxiao/img/newuser/brand-10.jpg
new file mode 100644
index 0000000..6d9fb13
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-10.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-11.jpg b/static/huodong/cuxiao/img/newuser/brand-11.jpg
new file mode 100644
index 0000000..cd403c0
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-11.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-12.jpg b/static/huodong/cuxiao/img/newuser/brand-12.jpg
new file mode 100644
index 0000000..a450e40
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-12.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-13.jpg b/static/huodong/cuxiao/img/newuser/brand-13.jpg
new file mode 100644
index 0000000..a12fd7d
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-13.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-14.jpg b/static/huodong/cuxiao/img/newuser/brand-14.jpg
new file mode 100644
index 0000000..1ce48f2
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-14.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-15.jpg b/static/huodong/cuxiao/img/newuser/brand-15.jpg
new file mode 100644
index 0000000..d61f56f
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-15.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-16.jpg b/static/huodong/cuxiao/img/newuser/brand-16.jpg
new file mode 100644
index 0000000..ee38e33
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-16.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-17.jpg b/static/huodong/cuxiao/img/newuser/brand-17.jpg
new file mode 100644
index 0000000..e981758
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-17.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-18.jpg b/static/huodong/cuxiao/img/newuser/brand-18.jpg
new file mode 100644
index 0000000..049bcd0
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-18.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-19.jpg b/static/huodong/cuxiao/img/newuser/brand-19.jpg
new file mode 100644
index 0000000..87e931f
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-19.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-20.jpg b/static/huodong/cuxiao/img/newuser/brand-20.jpg
new file mode 100644
index 0000000..e761ad9
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-20.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-21.jpg b/static/huodong/cuxiao/img/newuser/brand-21.jpg
new file mode 100644
index 0000000..18716b5
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-21.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-22.jpg b/static/huodong/cuxiao/img/newuser/brand-22.jpg
new file mode 100644
index 0000000..c0e0a3e
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-22.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-23.jpg b/static/huodong/cuxiao/img/newuser/brand-23.jpg
new file mode 100644
index 0000000..405ca22
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-23.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-24.jpg b/static/huodong/cuxiao/img/newuser/brand-24.jpg
new file mode 100644
index 0000000..e441281
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-24.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-25.jpg b/static/huodong/cuxiao/img/newuser/brand-25.jpg
new file mode 100644
index 0000000..06e005c
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-25.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/brand-26.jpg b/static/huodong/cuxiao/img/newuser/brand-26.jpg
new file mode 100644
index 0000000..b8d7d01
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/brand-26.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/line-1.jpg b/static/huodong/cuxiao/img/newuser/line-1.jpg
new file mode 100644
index 0000000..144f153
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/line-1.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/line-2.jpg b/static/huodong/cuxiao/img/newuser/line-2.jpg
new file mode 100644
index 0000000..01c8907
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/line-2.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/line-3.jpg b/static/huodong/cuxiao/img/newuser/line-3.jpg
new file mode 100644
index 0000000..b28da11
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/line-3.jpg differ
diff --git a/static/huodong/cuxiao/img/newuser/tip.png b/static/huodong/cuxiao/img/newuser/tip.png
new file mode 100644
index 0000000..1ad454f
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/tip.png differ
diff --git a/static/huodong/cuxiao/img/newuser/two.jpg b/static/huodong/cuxiao/img/newuser/two.jpg
new file mode 100644
index 0000000..e1a5fcb
Binary files /dev/null and b/static/huodong/cuxiao/img/newuser/two.jpg differ
diff --git a/static/huodong/cuxiao/js/newuser/coupon.js b/static/huodong/cuxiao/js/newuser/coupon.js
new file mode 100644
index 0000000..014af37
--- /dev/null
+++ b/static/huodong/cuxiao/js/newuser/coupon.js
@@ -0,0 +1,281 @@
+var $tip, tipItime;
+
+/* 领指定券 */
+var activityId = $('#coupon-container').attr('param');
+var userIsLogged = $('#coupon-container').attr('isLogged') === 'Y';
+var isApp;
+
+$('.get-coupon').click(function () {
+ var couponId = $(this).attr('param');
+ isApp = $(this).attr('href') !== 'javascript:;';
+ if (!isNaN(activityId) && !isNaN(couponId)) {
+ getNamedCoupon(activityId, couponId, isApp, userIsLogged);
+ }
+});
+/* 领所有券 */
+$('#get-all-coupon').click(function () {
+ var isApp = $(this).attr('href') !== 'javascript:;';
+ getAllCoupon(activityId, isApp);
+});
+
+/* 检查是否有在领取中的券,有则直接领取 */
+if (userIsLogged) {
+ var cookieCouponId = cookie('_Coupon' + activityId);
+ if (cookieCouponId && !isNaN(cookieCouponId)) {
+ getNamedCoupon(activityId, cookieCouponId, isApp, userIsLogged);
+ }
+}
+
+/**
+ * 微信分享
+ */
+(function ($) {
+ if (typeof (wx) == "undefined") {
+ return;
+ }
+ var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage';
+ $.getJSON(_weChatInterface + '?pageurl=' +
+ encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function (json) {
+ var _appId, _timestamp, _nonceStr, _signature;
+ if (json !== undefined && json !== '') {
+ _appId = json.appId.toString();
+ _timestamp = json.timestamp;
+ _nonceStr = json.nonceStr.toString();
+ _signature = json.signature.toString();
+
+ wx.config({
+ debug: false,
+ appId: _appId,
+ timestamp: _timestamp,
+ nonceStr: _nonceStr,
+ signature: _signature,
+ jsApiList: [
+ 'checkJsApi',
+ 'onMenuShareTimeline',
+ 'onMenuShareAppMessage',
+ 'onMenuShareQQ',
+ 'onMenuShareWeibo',
+ 'hideMenuItems',
+ 'showMenuItems',
+ 'hideAllNonBaseMenuItem',
+ 'showAllNonBaseMenuItem',
+ 'translateVoice',
+ 'startRecord',
+ 'stopRecord',
+ 'onRecordEnd',
+ 'playVoice',
+ 'pauseVoice',
+ 'stopVoice',
+ 'uploadVoice',
+ 'downloadVoice',
+ 'chooseImage',
+ 'previewImage',
+ 'uploadImage',
+ 'downloadImage',
+ 'getNetworkType',
+ 'openLocation',
+ 'getLocation',
+ 'hideOptionMenu',
+ 'showOptionMenu',
+ 'closeWindow',
+ 'scanQRCode',
+ 'chooseWXPay',
+ 'openProductSpecificView',
+ 'addCard',
+ 'chooseCard',
+ 'openCard'
+ ]
+ });
+ }
+ });
+ wx.ready(function () {
+ var shareTitle = $('#shareTitle').val();
+ var shareImg = $('#shareImg').val();
+ var shareDesc = $('#shareDesc').val();
+ var shareLink = $('#shareLink').val();
+ var shareData = {
+ title: shareTitle,
+ desc: shareDesc,
+ imgUrl: shareImg,
+ link: shareLink
+ };
+ wx.onMenuShareAppMessage(shareData);
+ wx.onMenuShareTimeline(shareData);
+ wx.onMenuShareQQ(shareData);
+ wx.onMenuShareWeibo(shareData);
+ });
+}(jQuery));
+
+/**
+ * 初始化提示框
+ */
+(function () {
+ var tipHtml = '<div id="yoho-tip" class="yoho-tip"></div>';
+
+ //插入提示HTML
+ $('#coupon-container').append(tipHtml);
+
+ $tip = $('#yoho-tip');
+ $tip.on('touchend', function () {
+ $tip.hide();
+
+ //清除Timeout
+ clearTimeout(tipItime);
+ });
+}());
+
+function cookie(name) {
+ var cookies = document.cookie,
+ cookieVal,
+ offset;
+
+ if (document.cookie && document.cookie !== '') {
+ offset = cookies.indexOf(name + '=');
+ if (offset > -1) {
+ offset += name.length + 1;
+
+ cookieVal = decodeURIComponent($.trim(cookies.substring(offset, cookies.indexOf(';', offset))));
+ }
+ }
+
+ return cookieVal;
+}
+
+function setCookie(name, value, options) {
+ var expires = '',
+ path,
+ domain,
+ secure,
+ date;
+
+ if (typeof value !== 'undefined') {
+ options = options || {};
+ if (value === null) {
+ value = '';
+ options.expires = -1;
+ }
+
+ if (options.expires &&
+ (typeof options.expires === 'number' || options.expires.toUTCString)) {
+ if (typeof options.expires === 'number') {
+ date = new Date();
+ date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+ } else {
+ date = options.expires;
+ }
+ expires = '; expires=' + date.toUTCString();
+ }
+ path = options.path ? '; path=' + options.path : '';
+ domain = options.domain ? '; domain=' + options.domain : '';
+ secure = options.secure ? '; secure' : '';
+ document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+ }
+}
+
+/**
+ * 显示提示
+ */
+function showTip(con, dur) {
+ var content, duration;
+
+ if (typeof con === 'undefined') {
+ return;
+ }
+
+ content = con.toString();
+ duration = (dur && dur > 0) ? dur : 3000;
+
+ $tip.html(content).show();
+
+ tipItime = setTimeout(function () {
+ if ($tip.css('display') === 'block') {
+ $tip.hide();
+ }
+ }, duration);
+}
+
+/**
+ * 获取活动的指定优惠券
+ */
+function getNamedCoupon(activityId, couponId, isApp, userIsLogged)
+{
+ $.ajax({
+ type: 'POST',
+ url: '/cuxiao/coupon/getnamed',
+ data: 'activityId=' + activityId + '&couponId=' + couponId,
+ success: function (data) {
+ setCookie('_Coupon' + activityId, null, {
+ expires: -2,
+ domain: '.m.yohobuy.com'
+ });
+ if (isApp && !userIsLogged) {
+ return;
+ }
+ if (data.code == 200) {
+ showTip('恭喜你成功领取优惠券！<br><br>稍后即会到账，请耐心等待。');
+ }
+ else if (data.code == 201) {
+ showTip('你已领取过品牌优惠券<br><br>快去选购心仪的商品吧！');
+ }
+ else if (data.code == 400) {
+ setCookie('_Coupon' + activityId, couponId, {
+ expires: 1,
+ domain: '.m.yohobuy.com'
+ });
+ if (isApp) {
+ //showTip('请先登录！');
+ } else {
+ location.href = decodeURIComponent(data.data);
+ }
+ }
+ else if (data.message) {
+ //showTip(data.message);
+ if (data.message == '新用户才可领取') {
+ showTip('Sorry,新客券只有新客才能领取呦!');
+ } else {
+ showTip('领取失败<br><br>请稍候再试');
+ }
+ setCookie('_Coupon' + activityId, null);
+ }
+
+ },
+ error: function () {
+ showTip('网络断开连接啦~');
+ }
+ });
+}
+
+/**
+ * 获取活动所有的优惠券
+ */
+function getAllCoupon(activityId, isApp)
+{
+ $.ajax({
+ type: 'POST',
+ url: '/cuxiao/coupon/getall',
+ data: 'activityId=' + activityId,
+ dataType: 'json',
+ success: function (data) {
+ if (data.code == 200) {
+ showTip('恭喜您，成功领取');
+ }
+ else if (data.code == 201) {
+ showTip('对不起，您已经领取过');
+ }
+ else if (data.code == 400) {
+ if (isApp) {
+ showTip('请先登录！');
+ } else {
+ location.href = decodeURIComponent(data.data);
+ }
+ }
+ else if (data.message) {
+ //showTip(data.message);
+ showTip('系统繁忙，请稍候再试！');
+ }
+ },
+ error: function () {
+ showTip('网络断开连接啦~');
+ }
+ });
+}
\ No newline at end of file
diff --git a/static/huodong/cuxiao/js/share.weixin.js b/static/huodong/cuxiao/js/share.weixin.js
new file mode 100644
index 0000000..c5fb2a7
--- /dev/null
+++ b/static/huodong/cuxiao/js/share.weixin.js
@@ -0,0 +1,79 @@
+/**
+ * 微信分享
+ */
+(function($) {
+ if (typeof(wx) == "undefined") {
+ return;
+ }
+ var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage';
+ $.getJSON(_weChatInterface + '?pageurl=' +
+ encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) {
+ var _appId, _timestamp, _nonceStr, _signature;
+ if (json !== undefined && json !== '') {
+ _appId = json.appId.toString();
+ _timestamp = json.timestamp;
+ _nonceStr = json.nonceStr.toString();
+ _signature = json.signature.toString();
+
+ wx.config({
+ debug: false,
+ appId: _appId,
+ timestamp: _timestamp,
+ nonceStr: _nonceStr,
+ signature: _signature,
+ jsApiList: [
+ 'checkJsApi',
+ 'onMenuShareTimeline',
+ 'onMenuShareAppMessage',
+ 'onMenuShareQQ',
+ 'onMenuShareWeibo',
+ 'hideMenuItems',
+ 'showMenuItems',
+ 'hideAllNonBaseMenuItem',
+ 'showAllNonBaseMenuItem',
+ 'translateVoice',
+ 'startRecord',
+ 'stopRecord',
+ 'onRecordEnd',
+ 'playVoice',
+ 'pauseVoice',
+ 'stopVoice',
+ 'uploadVoice',
+ 'downloadVoice',
+ 'chooseImage',
+ 'previewImage',
+ 'uploadImage',
+ 'downloadImage',
+ 'getNetworkType',
+ 'openLocation',
+ 'getLocation',
+ 'hideOptionMenu',
+ 'showOptionMenu',
+ 'closeWindow',
+ 'scanQRCode',
+ 'chooseWXPay',
+ 'openProductSpecificView',
+ 'addCard',
+ 'chooseCard',
+ 'openCard'
+ ]
+ });
+ }
+ });
+ wx.ready(function() {
+ var shareTitle = $('#shareTitle').val();
+ var shareImg = $('#shareImg').val();
+ var shareDesc = $('#shareDesc').val();
+ var shareLink = $('#shareLink').val();
+ var shareData = {
+ title: shareTitle,
+ desc: shareDesc,
+ imgUrl: shareImg,
+ link: shareLink
+ };
+ wx.onMenuShareAppMessage(shareData);
+ wx.onMenuShareTimeline(shareData);
+ wx.onMenuShareQQ(shareData);
+ wx.onMenuShareWeibo(shareData);
+ });
+}(jQuery));
\ No newline at end of file
diff --git a/template/huodong.m.yohobuy.com/actions/cuxiao/christmas/index.phtml b/template/huodong.m.yohobuy.com/actions/cuxiao/christmas/index.phtml
new file mode 100644
index 0000000..64f2652
--- /dev/null
+++ b/template/huodong.m.yohobuy.com/actions/cuxiao/christmas/index.phtml
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<title>{{staticTitle}}</title>
+<meta name="apple-mobile-web-app-title" content="SUMMER SALE">
+<meta name="format-detection" content="telephone=no">
+<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,minimal-ui" media="(device-height: 568px)">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="grey">
+<link rel="stylesheet" href="{{imgUrl}}/cuxiao/css/christmas/index.css">
+<link rel="dns-prefetch" href="//cdn.yoho.cn">
+<script>
+ (function(doc, win) {
+ var docEl = doc.documentElement;
+ (function() {
+ var clientWidth = docEl.clientWidth;
+ if (!clientWidth) {
+ return;
+ }
+ docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
+ }());
+ })(document, window);
+</script>
+</head>
+<body class="keBody">
+<div class="coupon-christmas" show="{{showPopupFlag}}">
+ <div class="coupon-top">
+ <img src="{{imgUrl}}/cuxiao/img/christmas/top-bg.png" alt="">
+ <a class="go-check" href="{{myCouponUrl}}"></a>
+ <a class="share-btn" href="javascript:;"></a>
+ </div>
+ <div class="coupon-bottom">
+ <div class="coupon-banner">
+ <a href="{{bannerUrl_1}}">
+ <img src="{{imgUrl}}/cuxiao/img/christmas/banner01.png" alt="">
+ </a>
+ </div>
+ <div class="coupon-banner">
+ <a href="{{bannerUrl_2}}">
+ <img src="{{imgUrl}}/cuxiao/img/christmas/banner02.png" alt="">
+ </a>
+ </div>
+ <div class="bottom-btn">
+ <a class="follow-yoho" href="http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&mid=201849402&idx=1&sn=c0089812f9769d82e0075f69d771f6e1#rd"></a>
+ <a class="download-yoho" href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho&g_f=995445"></a>
+ </div>
+
+ </div>
+ <div class="coupon-ft">
+ <img src="{{imgUrl}}/cuxiao/img/christmas/14.jpg">
+ </div>
+</div>
+<div class="modal"></div>
+<div class="dialog-box geted">
+ <div class="dialog-inner">
+ <img src="{{imgUrl}}/cuxiao/img/christmas/geted.png" alt=""/>
+ <span class="dialog-close"></span>
+ </div>
+</div>
+<div class="dialog-box fail">
+ <div class="dialog-inner">
+ <img src="{{imgUrl}}/cuxiao/img/christmas/fail.png" alt=""/>
+ <span class="refresh-btn"></span>
+ </div>
+</div>
+<input id="shareLink" type="hidden" value="{{shareLink}}">
+<input id="shareImg" type="hidden" value="{{shareImg}}">
+<input id="shareTitle" type="hidden" value="{{shareTitle}}">
+<input id="shareDesc" type="hidden" value="{{shareDesc}}">
+<script type="text/javascript" src="{{imgUrl}}/cuxiao/js/jquery.min.js"></script>
+<script>
+ //提示分享
+ $('.share-btn').click(function () {
+ $('.modal').fadeIn();
+ });
+ //关闭提示分享
+ $('.modal').click(function () {
+ $(this).fadeOut();
+ });
+
+ //提示已领过券
+ if ($('.coupon-christmas').attr('show') === '1') {
+ $('.dialog-box.geted').show();
+ }
+ //提示领券失败
+ else if ($('.coupon-christmas').attr('show') === '2') {
+ $('.dialog-box.fail').show();
+ }
+
+ //关闭提示
+ $('.dialog-close').click(function(){
+ $(this).parents('.dialog-box').fadeOut();
+ });
+ //刷新页面
+ $('.refresh-btn').click(function() {
+ location.reload();
+ });
+</script>
+{{#if weixinShare}}
+<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script type="text/javascript" charset="utf-8" src="{{jsUrl}}/cuxiao/js/share.weixin.js"></script>
+{{/if}}
+{{> layout/analysis}}
+</body>
+</html>
\ No newline at end of file
diff --git a/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/girlsbrand-2.phtml b/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/girlsbrand-2.phtml
index 9abf1a0..0895cac 100644
--- a/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/girlsbrand-2.phtml
+++ b/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/girlsbrand-2.phtml
@@ -69,7 +69,7 @@
<a class="get-coupon" href="{{jumpUrl}}" param="15763"></a>
</li>
<li>
- <a class="enter-store" href="{{url_738}}"></a>
+ <a class="enter-store" href="{{url_701}}"></a>
<a class="get-coupon" href="{{jumpUrl}}" param="15827"></a>
</li>
</ul>
@@ -116,7 +116,7 @@
</ul>
<ul class="img-coupon04 girl2">
<li>
- <a class="enter-store" href="{{url_875}}"></a>
+ <a class="enter-store" href="{{url_738}}"></a>
<a class="get-coupon" href="{{jumpUrl}}" param="15843"></a>
</li>
<li>
diff --git a/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser-help.phtml b/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser-help.phtml
index 850b106..37289ea 100644
--- a/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser-help.phtml
+++ b/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser-help.phtml
@@ -1,59 +1,44 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="UTF-8">
- <title>{{staticTitle}}</title>
- <style>
- .content{padding: 0 3rem;}
- .content{padding :3rem;font-size: 2.4rem;line-height: 3.8rem;color: #444;}
- .steps h1 span{
- display: inline-block;
- width: 2.9rem;
- height: 2.4rem;
- margin-right: 4.5rem;
- background:url("{{jsUrl}}/cuxiao/img/151201/newuser/tip.png");
- background-size: cover;
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+ <title>{{staticTitle}}</title>
+ <link rel="stylesheet" href="{{jsUrl}}/cuxiao/css/newuser/help.css">
+</head>
+<body>
+<!-- <header>
+ <a href="javascript:;"></a>
+ <span>如何使用优惠券</span>
+ </header>-->
+ <div class="content">
+ <div class="instruction">
+ <b>说明：</b>优惠券是有货线上品牌商城针对不同品牌或商品向消费者发送的虚拟优惠券，优惠券可直接用于指定品牌或商品消费，不可转让他人，不可兑换为现金
+ </div>
+ <div class="steps">
+ <h1><span></span>优惠券使用步骤</h1>
+ <div class="step">
+ 1. 选择要购买的商品进入到 <b>填写订单 </b>页面后。在选择支付方式里面，点击" <b>使用优惠券支付</b> "，并选择要使用的优惠券或直接输入优惠码
+ </div>
+ <div class="step">
+ 2. 在当前页面您可以看到付款详情，确认无误后，点击" <b>去付款</b> " 即生成订单, 按照您所选的支付方式付款。
+ </div>
+ <div class="step">
+ 3. 可进入到 " <b>个人中心</b> "点击" <b>订单中心</b> " 查看订单详情。
+ </div>
+ </div>
+ </div>
+ <script>
+ (function(doc, win) {
+ var docEl = doc.documentElement;
+ (function() {
+ var clientWidth = docEl.clientWidth;
+ if (!clientWidth) {
+ return;
}
- .content b{
- font-weight: 900;
- }
- .content .instruction{
- margin-bottom: 4rem;
- }
- .content .step{
- margin-bottom: 4rem;
- }
- </style>
- </head>
- <body>
- <div class="content">
- <div class="instruction">
- <b>说明：</b>优惠券是有货线上品牌商城针对不同品牌或商品向消费者发送的虚拟优惠券，优惠券可直接用于指定品牌或商品消费，不可转让他人，不可兑换为现金
- </div>
- <div class="steps">
- <h1><span></span>优惠券使用步骤</h1>
- <div class="step">
- 1. 选择要购买的商品进入到 <b>填写订单 </b>页面后。在选择支付方式里面，点击" <b>使用优惠券支付</b> "，并选择要使用的优惠券或直接输入优惠码
- </div>
- <div class="step">
- 2. 在当前页面您可以看到付款详情，确认无误后，点击" <b>去付款</b> " 即生成订单, 按照您所选的支付方式付款。
- </div>
- <div class="step">
- 3. 可进入到 " <b>个人中心</b> "点击" <b>订单中心</b> " 查看订单详情。
- </div>
- </div>
- </div>
- <script>
- (function(doc, win) {
- var docEl = doc.documentElement;
- (function() {
- var clientWidth = docEl.clientWidth;
- if (!clientWidth) {
- return;
- }
- docEl.style.fontSize = 20 * (clientWidth / 1280) + 'px';
- }());
- })(document, window);
- </script>
- </body>
+ docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
+ }());
+ })(document, window);
+ </script>
+</body>
</html>
\ No newline at end of file
diff --git a/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser-yohope.phtml b/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser-yohope.phtml
index e5cc3ff..e211495 100644
--- a/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser-yohope.phtml
+++ b/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser-yohope.phtml
@@ -35,142 +35,142 @@
</head>
<body>
<div id="wrapper">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/banner.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/banner.jpg">
<div class="introduce">
YOHOPE计划是中国潮流产业的领导者YOHO!集团联合潮流教父Nigo、五月天主唱阿信等全球潮流ICON共同推出的新锐设计师孵化平台，主意是“Help Dream”。该计划为具有设计天赋和潮流设计梦想的国内外原创设计师提供全方位的支持，共同打造更加多元化、更具代表性的设计师品牌和潮流文化，推动中国潮流生态圈的发展。
</div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/two.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/two.jpg">
<ul class="brand-item">
<li>
<a href="{{url_208}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-01.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-01.jpg">
</a>
</li>
<li>
<a href="{{url_256}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-02.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-02.jpg">
</a>
</li>
<li>
<a href="{{url_257}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-03.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-03.jpg">
</a>
</li>
<li>
<a href="{{url_450}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-04.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-04.jpg">
</a>
</li>
<li>
<a href="{{url_444}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-05.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-05.jpg">
</a>
</li>
<li>
<a href="{{url_443}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-06.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-06.jpg">
</a>
</li>
<li>
<a href="{{url_261}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-07.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-07.jpg">
</a>
</li>
<li>
<a href="{{url_350}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-08.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-08.jpg">
</a>
</li>
<li>
<a href="{{url_302}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-09.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-09.jpg">
</a>
</li>
<li>
<a href="{{url_852}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-10.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-10.jpg">
</a>
</li>
<li>
<a href="{{url_570}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-11.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-11.jpg">
</a>
</li>
<li><a href="{{url_560}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-12.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-12.jpg">
</a>
</li>
<li>
<a href="{{url_520}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-13.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-13.jpg">
</a>
</li>
<li>
<a href="{{url_562}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-14.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-14.jpg">
</a>
</li>
<li>
<a href="{{url_672}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-15.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-15.jpg">
</a>
</li>
<li>
<a href="{{url_678}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-16.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-16.jpg">
</a>
</li>
<li>
<a href="{{url_396}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-17.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-17.jpg">
</a>
</li>
<li>
<a href="{{url_397}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-18.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-18.jpg">
</a>
</li>
<li>
<a href="{{url_550}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-19.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-19.jpg">
</a>
</li>
<li>
<a href="{{url_591}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-20.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-20.jpg">
</a>
</li>
<li>
<a href="{{url_583}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-21.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-21.jpg">
</a>
</li>
<li>
<a href="{{url_598}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-22.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-22.jpg">
</a>
</li>
<li>
<a href="{{url_824}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-23.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-23.jpg">
</a>
</li>
<li>
<a href="{{url_481}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-24.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-24.jpg">
</a>
</li>
<li>
<a href="{{url_701}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-25.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-25.jpg">
</a>
</li>
<li>
<a href="{{url_464}}">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/brand-26.jpg">
+ <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/newuser/brand-26.jpg">
</a>
</li>
</ul>
diff --git a/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser.phtml b/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser.phtml
index 38505c9..57e9d96 100644
--- a/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser.phtml
+++ b/template/huodong.m.yohobuy.com/actions/cuxiao/coupon/newuser.phtml
@@ -1,99 +1,142 @@
<!DOCTYPE html>
<html>
-<head>
- <meta charset="UTF-8">
- <title>{{staticTitle}}</title>
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
- <meta content="yes" name="apple-mobile-web-app-capable">
- <meta content="telephone=no" name="format-detection">
- <meta content="yes" name="apple-touch-fullscreen">
- <meta content="black" name="apple-mobile-web-app-status-bar-style">
- <style>
- *{margin: 0;padding: 0;}
- #wrapper {width: 100%;}
- #wrapper img {width: 100%; height: auto; display: block;overflow: hidden;}
- .img-box {width: 100%;position: relative;}
- .img-box .href {width: 50%; height: 100%;position: absolute;top: 0;}
- .img-box .href-left {left: 0}
- .img-box .href-right {right: 0}
- .img-box .href-click {width: 90%;height: 100%;position: absolute;top: 0;left: 5%;}
- .show-more {height: 100%;width: 25%;position: absolute;top: 0;right: 10%;}
- .yoho-tip {position: fixed;display: none;text-align: center;width: 70%;padding: 34px 0;top: 50%;left: 50%;margin-left: -35%;margin-top: -45px;background-color: #000;opacity: 0.7;color: #fff;font-size: 18px;border: none;border-radius: 10px;}
- </style>
-</head>
-<body>
- <div id="wrapper">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/01.jpg">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/02.jpg">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/03.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/04.jpg">
- <a class="href href-right" href="{{url_yohope}}"></a>
+ <head>
+ <meta charset="UTF-8">
+ <title>{{staticTitle}}</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+ <style>
+ *{margin: 0;padding: 0;}
+ #coupon-container {width: 100%;}
+ #coupon-container img {width: 100%; height: auto; display: block;overflow: hidden;}
+ .img-box {width: 100%;position: relative;}
+ .img-box .href {width: 50%; height: 100%;position: absolute;top: 0;}
+ .img-box .href-left {left: 0}
+ .img-box .href-right {right: 0}
+ .img-box .href-center {width: 90%;height: 100%;position: absolute;top: 0;left: 5%;}
+ .show-more {height: 100%;width: 25%;position: absolute;top: 0;right: 10%;}
+ .yoho-tip {
+ position: fixed;
+ display: none;
+ text-align: center;
+ width: 70%;
+ padding: 34px 0;
+ top: 50%;
+ left: 50%;
+ margin-left: -35%;
+ margin-top: -45px;
+ background-color: #000;
+ opacity: 0.9;
+ color: #fff;
+ font-size: 18px;
+ border: none;
+ border-radius: 10px;
+ }
+ </style>
+ <link rel="dns-prefetch" href="//cdn.yoho.cn">
+ <link rel="dns-prefetch" href="//static.yohobuy.com">
+ </head>
+ <body>
+ <div class="coupon-container" id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/01.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/02.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/03.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-1.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/04.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/05.jpg">
+ <a class="href href-right" href="{{url_yohope}}"></a>
+ </div>
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/06.jpg">
+ <a class="href href-center" href="{{url_mycoupon}}"></a>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-2.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/07.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/08.jpg">
+ <a class="href href-left" href="{{url_more}}"></a>
+ </div>
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/09.jpg">
+ <span class="href href-left get-coupon" href="{{jumpUrl}}" param="16567"></span>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/10.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/11.jpg">
+ <a class="href href-left" href="{{url_4}}"></a>
+ <a class="href href-right" href="{{url_343}}"></a>
+ </div>
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/12.jpg">
+ <span class="href href-left get-coupon" href="{{jumpUrl}}" param="16547"></span>
+ <span class="href href-right get-coupon" href="{{jumpUrl}}" param="16549"></span>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-1.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/13.jpg">
+ <a class="href href-left" href="{{url_230}}"></a>
+ <a class="href href-right" href="{{url_536}}"></a>
+ </div>
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/14.jpg">
+ <span class="href href-left get-coupon" href="{{jumpUrl}}" param="16551"></span>
+ <span class="href href-right get-coupon" href="{{jumpUrl}}" param="16553"></span>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-1.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/15.jpg">
+ <a class="href href-left" href="{{url_847}}"></a>
+ </div>
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/16.jpg">
+ <span class="href href-left get-coupon" href="{{jumpUrl}}" param="16555"></span>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-1.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/17.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/18.jpg">
+ <a class="href href-left" href="{{url_868}}"></a>
+ <a class="href href-right" href="{{url_1026}}"></a>
+ </div>
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/19.jpg">
+ <span class="href href-left get-coupon" href="{{jumpUrl}}" param="16557"></span>
+ <span class="href href-right get-coupon" href="{{jumpUrl}}" param="16559"></span>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-1.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/20.jpg">
+ <a class="href href-left" href="{{url_570}}"></a>
+ <a class="href href-right" href="{{url_778}}"></a>
+ </div>
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/21.jpg">
+ <span class="href href-left get-coupon" href="{{jumpUrl}}" param="16561"></span>
+ <span class="href href-right get-coupon" href="{{jumpUrl}}" param="16563"></span>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-1.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/22.jpg">
+ <a class="href href-left" href="{{url_517}}"></a>
+ </div>
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/23.jpg">
+ <span class="href href-left get-coupon" href="{{jumpUrl}}" param="16565"></span>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-1.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-2.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/24-1.jpg">
+ <div class="img-box">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/24-2.jpg">
+ <a class="show-more" href="{{url_help}}"></a>
+ </div>
+ <img src="{{jsUrl}}/cuxiao/img/newuser/24-3.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/line-2.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/25.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/26.jpg">
+ <img src="{{jsUrl}}/cuxiao/img/newuser/27.jpg">
</div>
- <a href="{{url_mycoupon}}"><img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/05.jpg"></a>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/06.jpg">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/07.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/08.jpg">
- <a class="href href-left" href="{{url_60}}"></a>
- <a class="href href-right" href="{{url_710}}"></a>
- </div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/09.jpg">
- <a class="href href-left" href="{{url_138}}"></a>
- <a class="href href-right" href="{{url_495}}"></a>
- </div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/10.jpg">
- <a class="href href-left" href="{{url_419}}"></a>
- <a class="href href-right" href="{{url_868}}"></a>
- </div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/11.jpg">
- <a class="href href-left" href="{{url_1026}}"></a>
- <a class="href href-right" href="{{url_1027}}"></a>
- </div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/12.jpg">
- <a class="href href-left" href="{{url_324}}"></a>
- <a class="href href-right" href="{{url_649}}"></a>
- </div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/13.jpg">
- <a class="href href-left" href="{{url_more}}"></a>
- </div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/14.jpg">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/15.jpg">
- <a class="href-click" id="get-all-coupon" href="{{jumpUrl}}"></a>
- </div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/16.jpg">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/17.jpg">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/18.jpg">
- <div class="img-box">
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/19.jpg">
- <a href="{{url_help}}" class="show-more"></a>
- </div>
- <img class="lazy" data-original="{{jsUrl}}/cuxiao/img/151201/newuser/00.jpg">
- </div>
- <div id="coupon-container" param="{{activityId}}"></div>
- <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
- <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.lazyload.js"></script>
- <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/151201/coupon.mobile.js"></script>
- <script>
- $(function() {
- $("img.lazy").lazyload({
- threshold: 200
- });
- });
- </script>
-</body>
+ <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
+ <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon.js"></script>
+ </body>
</html>
\ No newline at end of file
diff --git a/yohobuy/huodong.m.yohobuy.com/application/controllers/Error.php b/yohobuy/huodong.m.yohobuy.com/application/controllers/Error.php
index 60f4e22..e704076 100644
--- a/yohobuy/huodong.m.yohobuy.com/application/controllers/Error.php
+++ b/yohobuy/huodong.m.yohobuy.com/application/controllers/Error.php
@@ -23,6 +23,7 @@ class ErrorController extends AbstractAction
{
header('HTTP/1.1 404 Not Found');
header('Status: 404 Not Found');
+
exit();
}
diff --git a/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Christmas.php b/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Christmas.php
new file mode 100644
index 0000000..37f8819
--- /dev/null
+++ b/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Christmas.php
@@ -0,0 +1,106 @@
+<?php
+
+use Action\HuodongAction;
+use Plugin\Helpers;
+use LibModels\Wap\Cuxiao\ActivityData;
+
+/**
+ * 圣诞领券活动
+ * @author Administrator
+ */
+class ChristmasController extends HuodongAction
+{
+
+ private $_isApp = false;
+
+ /**
+ * 备注：2015年12月11号上线
+ */
+ public function christmasAction()
+ {
+ //获取登录者ID，未登录返回false
+ $uid = $this->getLoggedUid();
+ if (!$uid || !is_numeric($uid)) {
+ //未登录的用户访问，跳转到登录页面。并且在登陆后跳转回本页面
+ $this->go(Helpers::url('/signin.html', array('refer' => Helpers::url('/cuxiao/christmas/christmas')), 'default'));
+ }
+
+ // 该变量用来控制和显示页面的弹出提示
+ $showPopupFlag = '0';
+
+ //获取跳转到个人中心-我的优惠券链接，并调用接口，完成领券操作
+ $myCouponUrl = Helpers::url('/home/coupons', null, 'default') . '?openby:yohobuy={"action":"go.coupon"}';
+ $activityId = $this->getActivityId();
+ $result = ActivityData::getCouponAll($uid, $activityId);
+ if (isset($result['code'])) {
+ switch (intval($result['code'])) {
+ case 200: // 领取成功, 发送站内信消息
+ $showPopupFlag = '0';
+ $title = '【优惠券】您有6张潮集圣诞优惠券';
+ $content = '尊敬的客户：恭喜您成功获得6张潮集圣诞优惠券 ！您可以在个人中心的交易管理中查看‘我的优惠券’。';
+ ActivityData::message($uid, $title, $content);
+ break;
+ case 201: // 已领取过, 提示重复领券
+ $showPopupFlag = '1';
+ break;
+ default: // 领取失败, 提示领券失败
+ $showPopupFlag = '2';
+ break;
+ }
+ }
+
+ $this->_view->display('index', array(
+ 'staticTitle' => '潮集圣诞',
+
+ 'weixinShare' => $this->_isApp ? false : true, // 是否需要微信分享
+ 'shareLink' => 'http://feature.yoho.cn/1211APPTEST3/index.html',
+ 'shareTitle' => 'YOHO!BUY有货【潮集圣诞】第一弹疯狂来袭！500元优惠券引爆圣诞！',
+ 'shareDesc' => '800+潮牌限时4折起，折上满减，最高直减￥100！',
+ 'shareImg' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/05/02a7ec01785c8579ed10bdb65a16d60a44.png',
+
+ 'showPopupFlag' => $showPopupFlag,
+ 'myCouponUrl' => $myCouponUrl,
+ 'bannerUrl_1' => 'http://feature.yoho.cn/1211/1211APPHOMEBOY/index.html?openby:yohobuy＝{"action":"go.h5","params":{"title":"潮集圣诞","url":"http://feature.yoho.cn/1211/1211APPHOMEBOY/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"454"},"param":{"share_id":"454"}}}',
+ 'bannerUrl_2' => 'http://feature.yoho.cn/1211/1211APPHOMEGIRL/index.html?openby:yohobuy＝{"action":"go.h5","params":{"title":"潮集圣诞","url":"http://feature.yoho.cn/1211/1211APPHOMEGIRL/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"456"},"param":{"share_id":"456"}}}',
+ ));
+ }
+
+ /**
+ * 检测登录状态
+ *
+ * @return int
+ */
+ public function getLoggedUid()
+ {
+ // 判断是否是应用访问, 拼接APP需要的URL参数
+ $this->_isApp = null !== $this->get('app_version');
+ $uid = false;
+ if ($this->_isApp) {
+ $uid = $this->get('uid');
+ } else {
+ $uid = $this->getUid();
+ }
+
+ return $uid;
+ }
+
+ /**
+ * 根据环境来获取活动ID
+ *
+ * @return int
+ */
+ private function getActivityId()
+ {
+ // 设置环境变量
+ switch (APPLICATION_ENV) {
+ case 'production': // 生产
+ return 388;
+ case 'preview': // 预览
+ case 'testing': // 测试
+ case 'develop': // 开发
+ default:
+ return 84;
+ }
+ }
+
+}
diff --git a/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Coupon.php b/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Coupon.php
index 448d569..6b2dd89 100644
--- a/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Coupon.php
+++ b/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Coupon.php
@@ -113,7 +113,7 @@ class CouponController extends HuodongAction
'url_199' => 'http://list.m.yohobuy.com/?gender=1,3&brand=199&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"199","title":"ZERONE"}}',
'url_714' => 'http://list.m.yohobuy.com/?gender=1,3&brand=714&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"714","title":"threeSociety"}}',
'url_553' => 'http://list.m.yohobuy.com/?gender=1,3&brand=553&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"553","title":"DUNKELVOLK"}}',
- 'url_194' => 'http://list.m.yohobuy.com/?gender=1,3&brand=268&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"268","title":"New Era"}}',
+ 'url_194' => 'http://list.m.yohobuy.com/?gender=1,3&brand=194&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"194","title":"New Era"}}',
'url_462' => 'http://list.m.yohobuy.com/?gender=1,3&brand=462&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"462","title":"SPRAYGROUND"}}',
'url_136' => 'http://list.m.yohobuy.com/?gender=1,3&brand=136&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"136","title":"EASTPAK"}}',
'url_641' => 'http://list.m.yohobuy.com/?gender=1,3&brand=641&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"641","title":"inmix"}}',
@@ -235,9 +235,8 @@ class CouponController extends HuodongAction
} else {
$isLogged = $this->getUid();
}
- $isPageTwo = time() > 1449417600;
- $urlBoys = $isPageTwo ? Helpers::url('/cuxiao/coupon/boysbrand2') : Helpers::url('/cuxiao/coupon/boysbrand');
- $urlGirls = $isPageTwo ? Helpers::url('/cuxiao/coupon/girlsbrand2') : Helpers::url('/cuxiao/coupon/girlsbrand');
+ $urlBoys = Helpers::url('/cuxiao/coupon/boysbrand');
+ $urlGirls = Helpers::url('/cuxiao/coupon/girlsbrand');
$urlKids = Helpers::url('/cuxiao/coupon/kidsbrand');
$urlLifestyle = Helpers::url('/cuxiao/coupon/lifestylebrand');
$urlShare = Yohobuy::SERVICE_URL . '/operations/api/v5/webshare/getShare';
@@ -288,9 +287,8 @@ class CouponController extends HuodongAction
$isLogged = $this->getUid();
}
- $isPageTwo = time() > 1449417600;
- $urlBoys = $isPageTwo ? Helpers::url('/cuxiao/coupon/boysbrand2') : Helpers::url('/cuxiao/coupon/boysbrand');
- $urlGirls = $isPageTwo ? Helpers::url('/cuxiao/coupon/girlsbrand2') : Helpers::url('/cuxiao/coupon/girlsbrand');
+ $urlBoys = Helpers::url('/cuxiao/coupon/boysbrand');
+ $urlGirls = Helpers::url('/cuxiao/coupon/girlsbrand');
$urlKids = Helpers::url('/cuxiao/coupon/kidsbrand');
$urlLifestyle = Helpers::url('/cuxiao/coupon/lifestylebrand');
$urlShare = Yohobuy::SERVICE_URL . '/operations/api/v5/webshare/getShare';
@@ -355,22 +353,22 @@ class CouponController extends HuodongAction
$this->_view->display('boysbrand-2', array(
'activityId' => 372, // 活动ID
- 'staticTitle' => '有货2015感恩季，又一大波品牌专属优惠券来袭，即领即用！', // 标题
+ 'staticTitle' => 'Yoho!Buy有货2015感恩季，1000万元+品牌专属优惠券大派送！', // 标题
'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlBoys . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
'weixinShare' => $isApp ? false : true, // 是否需要微信分享
'shareLink' => $urlBoys,
- 'shareTitle' => '有货2015感恩季，又一大波品牌专属优惠券来袭，即领即用！',
- 'shareImg' => 'http://img12.static.yhbimg.com/couponImg/2015/12/07/03/02200896d719aa56535abb8d8bac2f75f4.png',
- 'shareDesc' => 'Yoho!Buy有货2015感恩季，12.7～12.10千万元品牌专属优惠券即领即用，让你乐享整个冬季！',
+ 'shareTitle' => 'Yoho!Buy有货2015感恩季，1000万元+品牌专属优惠券大派送！',
+ 'shareImg' => 'http://img12.static.yhbimg.com/couponImg/2015/11/26/09/0226ad7f8bcf5467a789e17b761c7557e0.jpg',
+ 'shareDesc' => '2015感恩季！品牌专属优惠券限时送！先领券，再购物，让你乐享整个冬季！',
'url_boys' => $urlBoys . '?yohobuy={"action":"go.h5","params":{"id":"372","share":"' . $urlShare . '","shareparam":{"share_id":"406"},"islogin":"N","type":0,"url":"' . $urlBoys . '","param":{}}}',
'url_girls' => $urlGirls . '?yohobuy={"action":"go.h5","params":{"id":"374","share":"' . $urlShare . '","shareparam":{"share_id":"408"},"islogin":"N","type":0,"url":"' . $urlGirls . '","param":{}}}',
'url_kids' => $urlKids . '?yohobuy={"action":"go.h5","params":{"id":"368","share":"' . $urlShare . '","shareparam":{"share_id":"410"},"islogin":"N","type":0,"url":"' . $urlKids . '","param":{}}}',
'url_lifestyle' => $urlLifestyle . '?yohobuy={"action":"go.h5","params":{"id":"370","share":"' . $urlShare . '","shareparam":{"share_id":"412"},"islogin":"N","type":0,"url":"' . $urlLifestyle . '","param":{}}}',
- 'url_114' => 'http://list.m.yohobuy.com/?gender=1,3&brand=4&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"4","title":"5CM"}}',
+ 'url_114' => 'http://list.m.yohobuy.com/?gender=1,3&brand=114&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"114","title":"5CM"}}',
'url_847' => 'http://list.m.yohobuy.com/?gender=1,3&brand=847&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"847","title":"Clarks ORIGINALS"}}',
'url_536' => 'http://list.m.yohobuy.com/?gender=1,3&brand=536&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"536","title":"ABLE JEANS"}}',
'url_230' => 'http://list.m.yohobuy.com/?gender=1,3&brand=230&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"230","title":"Dickies"}}',
@@ -383,9 +381,9 @@ class CouponController extends HuodongAction
'url_199' => 'http://list.m.yohobuy.com/?gender=1,3&brand=199&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"199","title":"ZERONE"}}',
'url_714' => 'http://list.m.yohobuy.com/?gender=1,3&brand=714&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"714","title":"threeSociety"}}',
'url_553' => 'http://list.m.yohobuy.com/?gender=1,3&brand=553&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"553","title":"DUNKELVOLK"}}',
- 'url_194' => 'http://list.m.yohobuy.com/?gender=1,3&brand=268&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"268","title":"New Era"}}',
+ 'url_194' => 'http://list.m.yohobuy.com/?gender=1,3&brand=194&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"194","title":"New Era"}}',
'url_462' => 'http://list.m.yohobuy.com/?gender=1,3&brand=462&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"462","title":"SPRAYGROUND"}}',
- 'url_136' => 'http://list.m.yohobuy.com/?gender=1,3&brand=36&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"36","title":"EASTPAK"}}',
+ 'url_136' => 'http://list.m.yohobuy.com/?gender=1,3&brand=136&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"136","title":"EASTPAK"}}',
'url_641' => 'http://list.m.yohobuy.com/?gender=1,3&brand=641&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"641","title":"inmix"}}',
'url_832' => 'http://list.m.yohobuy.com/?gender=1,3&brand=832&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"832","title":"CHUMS"}}',
'url_940' => 'http://list.m.yohobuy.com/?gender=1,3&brand=940&openby:yohobuy={"action":"go.list","params":{"gender":"1,3","brand":"940","title":"Trenta"}}',
@@ -419,15 +417,15 @@ class CouponController extends HuodongAction
$this->_view->display('girlsbrand-2', array(
'activityId' => 374, // 活动ID
- 'staticTitle' => '有货2015感恩季，又一大波品牌专属优惠券来袭，即领即用！', // 标题
+ 'staticTitle' => 'Yoho!Buy有货2015感恩季，1000万元+品牌专属优惠券大派送！', // 标题
'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlGirls . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
'weixinShare' => $isApp ? false : true, // 是否需要微信分享
'shareLink' => $urlGirls,
- 'shareTitle' => '有货2015感恩季，又一大波品牌专属优惠券来袭，即领即用！',
- 'shareImg' => 'http://img12.static.yhbimg.com/couponImg/2015/12/07/03/02200896d719aa56535abb8d8bac2f75f4.png',
- 'shareDesc' => 'Yoho!Buy有货2015感恩季，12.7～12.10千万元品牌专属优惠券即领即用，让你乐享整个冬季！',
+ 'shareTitle' => 'Yoho!Buy有货2015感恩季，1000万元+品牌专属优惠券大派送！',
+ 'shareImg' => 'http://img12.static.yhbimg.com/couponImg/2015/11/26/09/0226ad7f8bcf5467a789e17b761c7557e0.jpg',
+ 'shareDesc' => '2015感恩季！品牌专属优惠券限时送！先领券，再购物，让你乐享整个冬季！',
'url_boys' => $urlBoys . '?yohobuy={"action":"go.h5","params":{"id":"372","share":"' . $urlShare . '","shareparam":{"share_id":"406"},"islogin":"N","type":0,"url":"' . $urlBoys . '","param":{}}}',
'url_girls' => $urlGirls . '?yohobuy={"action":"go.h5","params":{"id":"374","share":"' . $urlShare . '","shareparam":{"share_id":"408"},"islogin":"N","type":0,"url":"' . $urlGirls . '","param":{}}}',
@@ -440,7 +438,7 @@ class CouponController extends HuodongAction
'url_738' => 'http://list.m.yohobuy.com/?gender=2,3&brand=738&openby:yohobuy={"action":"go.list","params":{"gender":"2,3","brand":"738","title":"Juni&Juli"}}',
'url_947' => 'http://list.m.yohobuy.com/?gender=2,3&brand=947&openby:yohobuy={"action":"go.list","params":{"gender":"2,3","brand":"947","title":"LONSDALE龙狮戴尔"}}',
'url_760' => 'http://list.m.yohobuy.com/?gender=2,3&brand=760&openby:yohobuy={"action":"go.list","params":{"gender":"2,3","brand":"760","title":"bread n butter"}}',
- 'url_875' => 'http://list.m.yohobuy.com/?gender=2,3&brand=875&openby:yohobuy={"action":"go.list","params":{"gender":"2,3","brand":"875","title":"insh"}}',
+ 'url_738' => 'http://list.m.yohobuy.com/?gender=2,3&brand=738&openby:yohobuy={"action":"go.list","params":{"gender":"2,3","brand":"738","title":"Juni&Juli"}}',
'url_778' => 'http://list.m.yohobuy.com/?gender=2,3&brand=778&openby:yohobuy={"action":"go.list","params":{"gender":"2,3","brand":"778","title":"SLY"}}',
'url_570' => 'http://list.m.yohobuy.com/?gender=2,3&brand=570&openby:yohobuy={"action":"go.list","params":{"gender":"2,3","brand":"570","title":"iyogurt"}}',
'url_868' => 'http://list.m.yohobuy.com/?gender=2,3&brand=868&openby:yohobuy={"action":"go.list","params":{"gender":"2,3","brand":"868","title":"Mango"}}',
@@ -470,8 +468,11 @@ class CouponController extends HuodongAction
$isApp = null !== $this->get('app_version');
$isAppLogged = true;
if ($isApp) {
+ $isLogged = $this->get('uid') !== null;
$isAppLogged = $this->checkIsLogin();
- }
+ } else {
+ $isLogged = $this->getUid();
+ }
$urlNewuser = Helpers::url('/cuxiao/coupon/newuser');
$urlYohope = Helpers::url('/cuxiao/coupon/yohope');
$urlHelp = Helpers::url('/cuxiao/coupon/help');
@@ -479,25 +480,25 @@ class CouponController extends HuodongAction
$urlEncode = strtr($urlNewuser, array('/' => '\\/'));
$this->_view->display('newuser', array(
- 'activityId' => 83, // 活动ID
+ 'activityId' => 418, // 活动ID
'staticTitle' => '新人潮这看，超值惊喜等你领', // 标题
'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
-
- 'url_mycoupon' => $urlMycoupon . '?yohobuy={"action":"go.coupon"}',
+ 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
+ 'url_mycoupon' => $urlMycoupon . '?openby:yohobuy={"action":"go.coupon"}',
'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
'url_more' => 'http://list.m.yohobuy.com/?msort=1&openby:yohobuy={"action":"go.list","params":{"msort":"1","title":"上衣"}}',
- 'url_60' => 'http://izzue.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"60"}}',
- 'url_710' => 'http://madness.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"710"}}',
- 'url_138' => 'http://thething.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"138"}}',
- 'url_495' => 'http://lightningbear.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"495"}}',
- 'url_419' => 'http://haso.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"419"}}',
+ 'url_4' => 'http://5cm.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"4"}}',
+ 'url_343' => 'http://dc.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"343"}}',
+ 'url_230' => 'http://dickies.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"230"}}',
+ 'url_536' => 'http://ablejeans.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"536"}}',
+ 'url_847' => 'http://clarksoriginals.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"847"}}',
'url_868' => 'http://mango.m.yohobuy.com/?gender=2,3&openby:yohobuy={"action":"go.brand","params":{"brand_id":"868"}}',
- 'url_1026' => 'http://jnby.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"1026"}}',
- 'url_1027' => 'http://less.m.yohobuy.com/?gender=2,3&openby:yohobuy={"action":"go.brand","params":{"brand_id":"1027"}}',
- 'url_324' => 'http://bjiaab.m.yohobuy.com/?gender=2,3&openby:yohobuy={"action":"go.brand","params":{"brand_id":"324"}}',
- 'url_649' => 'http://jeffreycampbell.m.yohobuy.com/?gender=2,3&openby:yohobuy={"action":"go.brand","params":{"brand_id":"649"}}',
+ 'url_1026' =>'http://jnby.m.yohobuy.com/?gender=2,3&openby:yohobuy={"action":"go.brand","params":{"brand_id":"1026"}}',
+ 'url_570' => 'http://iyogurt.m.yohobuy.com/?gender=2,3&openby:yohobuy={"action":"go.brand","params":{"brand_id":"570"}}',
+ 'url_778' => 'http://sly.m.yohobuy.com/?gender=2,3&openby:yohobuy={"action":"go.brand","params":{"brand_id":"778"}}',
+ 'url_517' => 'http://tuk.m.yohobuy.com/?openby:yohobuy={"action":"go.brand","params":{"brand_id":"517"}}',
));
}
@@ -549,7 +550,7 @@ class CouponController extends HuodongAction
public function helpAction()
{
$this->_view->display('newuser-help', array(
- 'staticTitle' => '如何使用优惠券',
+ 'staticTitle' => '如何使用优惠券'
));
}
diff --git a/yohobuy/huodong.m.yohobuy.com/configs/application.developer.ini b/yohobuy/huodong.m.yohobuy.com/configs/application.developer.ini
index 5dc7fd9..330ace6 100644
--- a/yohobuy/huodong.m.yohobuy.com/configs/application.developer.ini
+++ b/yohobuy/huodong.m.yohobuy.com/configs/application.developer.ini
@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
-application.version = "1.0.0"
+application.version = "1.0.1"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -60,3 +60,4 @@ application.seo.description = "YOHO! 有货，年轻人潮流购物中心，中�
; 网站静态资源
application.js.url = "http://static.dev.yohobuy.com/huodong"
application.css.url = "http://static.dev.yohobuy.com/huodong"
+application.img.url = "http://static.dev.yohobuy.com/huodong"
diff --git a/yohobuy/huodong.m.yohobuy.com/configs/application.preview.ini b/yohobuy/huodong.m.yohobuy.com/configs/application.preview.ini
index 506d5b4..204e689 100644
--- a/yohobuy/huodong.m.yohobuy.com/configs/application.preview.ini
+++ b/yohobuy/huodong.m.yohobuy.com/configs/application.preview.ini
@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
-application.version = "1.0.0"
+application.version = "1.0.1"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -59,4 +59,5 @@ application.seo.description = "YOHO! 有货，年轻人潮流购物中心，中�
; 网站静态资源
application.js.url = "http://buy.static.test.yoho.cn/huodong"
-application.css.url = "http://buy.static.test.yoho.cn/huodong"
\ No newline at end of file
+application.css.url = "http://buy.static.test.yoho.cn/huodong"
+application.img.url = "http://buy.static.test.yoho.cn/huodong"
\ No newline at end of file
diff --git a/yohobuy/huodong.m.yohobuy.com/configs/application.production.ini b/yohobuy/huodong.m.yohobuy.com/configs/application.production.ini
index 909a00e..c0ac899 100644
--- a/yohobuy/huodong.m.yohobuy.com/configs/application.production.ini
+++ b/yohobuy/huodong.m.yohobuy.com/configs/application.production.ini
@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
-application.version = "1.0.0"
+application.version = "1.0.1"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -59,4 +59,5 @@ application.seo.description = "YOHO! 有货，年轻人潮流购物中心，中�
; 网站静态资源
application.js.url = "http://cdn.yoho.cn/huodong"
-application.css.url = "http://cdn.yoho.cn/huodong"
\ No newline at end of file
+application.css.url = "http://cdn.yoho.cn/huodong"
+application.img.url = "http://cdn.yoho.cn/huodong"
\ No newline at end of file
diff --git a/yohobuy/huodong.m.yohobuy.com/configs/application.testing.ini b/yohobuy/huodong.m.yohobuy.com/configs/application.testing.ini
index 9f1cc05..1bf66c8 100644
--- a/yohobuy/huodong.m.yohobuy.com/configs/application.testing.ini
+++ b/yohobuy/huodong.m.yohobuy.com/configs/application.testing.ini
@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
-application.version = "1.0.0"
+application.version = "1.0.1"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -59,4 +59,5 @@ application.seo.description = "YOHO! 有货，年轻人潮流购物中心，中�
; 网站静态资源
application.js.url = "http://static.buy.test.yoho.cn/huodong"
-application.css.url = "http://static.buy.test.yoho.cn/huodong"
\ No newline at end of file
+application.css.url = "http://static.buy.test.yoho.cn/huodong"
+application.img.url = "http://static.buy.test.yoho.cn/huodong"
\ No newline at end of file