fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit 32b2e8998790b873674cc1795178a3afccfb93ff 2 parents 71e8e896 137486e0

merge master 为上线做准备

Inline Side-by-side
Showing 65 changed files with 599 additions and 57 deletions
@@ -159,14 +159,21 @@ class PlusstarData @@ -159,14 +159,21 @@ class PlusstarData
159 if (isset($getUidBrandFav['code']) && $getUidBrandFav['code'] == 200) { 159 if (isset($getUidBrandFav['code']) && $getUidBrandFav['code'] == 200) {
160 $cached['getUidBrandFav'] = true; 160 $cached['getUidBrandFav'] = true;
161 }else{ 161 }else{
162 - $cached['getUidBrandFav'] = false; 162 + //$cached['getUidBrandFav'] = false;
  163 + $getUidBrandFavResult = false;
163 } 164 }
164 165
165 } 166 }
166 }else{ 167 }else{
167 - $cached['getUidBrandFav'] = false; 168 + $getUidBrandFavResult = false;
  169 + //$cached['getUidBrandFav'] = false;
  170 + }
  171 + //return $cached;
  172 +
  173 + if (!empty($cached)) {
  174 + $cached['getUidBrandFav'] = $getUidBrandFavResult;
  175 + return $cached;
168 } 176 }
169 - return $cached;  
170 } 177 }
171 178
172 // 品牌详情信息 179 // 品牌详情信息
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.
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.
@@ -10,5 +10,5 @@ require('./js/passport/entry'); @@ -10,5 +10,5 @@ require('./js/passport/entry');
10 require('./js/product/entry'); 10 require('./js/product/entry');
11 require('./js/me/entry'); 11 require('./js/me/entry');
12 require('./js/cart/entry'); 12 require('./js/cart/entry');
13 - 13 +require('./js/life/entry');
14 module.exports = yohobuy; 14 module.exports = yohobuy;
  1 +var $ = require('jquery');
  2 +
  3 +require('../common.js');
  4 +$('.coupon-input').val(window.cookie('lifeCoupon') || '');
  5 +require('../plugin/wx-share')();
  1 +/*
  2 + * To change this license header, choose License Headers in Project Properties.
  3 + * To change this template file, choose Tools | Templates
  4 + * and open the template in the editor.
  5 + */
  6 +
  7 +require('./login');
  8 +require('./coupon');
  9 +
  1 +var $ = require('jquery');
  2 +
  3 +require('../common.js');
  4 +require('../plugin/wx-share')();
  5 +$('.notice').click(function() {
  6 + $('.code').show();
  7 + $('.mark').show();
  8 +});
  9 +$('.close').click(function() {
  10 + $('.code').hide();
  11 + $('.mark').hide();
  12 +});
  13 +
  14 +function get() {
  15 + $.ajax({
  16 + type: 'get',
  17 + url: '/index/life/sendCoupon',
  18 + dataType: 'json',
  19 + success: function(data) {
  20 + $('.statu').html(data.message);
  21 + $('.statu-mark').show();
  22 + $('.statu-box').show();
  23 + if (data.code === 200) {
  24 + window.setCookie('lifeCoupon', data.data);
  25 + location.href = '/life/coupon';
  26 + } else if (data.code === 401) {
  27 + $('.successed').css('display', 'block');
  28 + $('.sure').click(function() {
  29 + location.href = '/life/coupon';
  30 + });
  31 + } else if (data.code === 403) {
  32 + $('.late').css('display', 'block');
  33 + } else {
  34 + $('.faill').css('display', 'block');
  35 + }
  36 + }
  37 + });
  38 +}
  39 +
  40 +$('.coupon-btn').click(function() {
  41 + get();
  42 + $('.mark').show();
  43 +});
  1 +/**
  2 + * 微信分享
  3 + * @author: xuqi<qi.xu@yoho.cn>
  4 + * @date: 2015/10/30
  5 + */
  6 +
  7 +var $ = require('jquery');
  8 +
  9 +module.exports = function() {
  10 + var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage';
  11 +
  12 + $.getJSON(_weChatInterface + '?pageurl=' +
  13 + encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function(json) {
  14 + var _appId, _timestamp, _nonceStr, _signature;
  15 +
  16 + if (json !== undefined && json !== '') {
  17 + _appId = json.appId.toString();
  18 + _timestamp = json.timestamp;
  19 + _nonceStr = json.nonceStr.toString();
  20 + _signature = json.signature.toString();
  21 +
  22 + wx.config({
  23 + debug: false,
  24 + appId: _appId,
  25 + timestamp: _timestamp,
  26 + nonceStr: _nonceStr,
  27 + signature: _signature,
  28 + jsApiList: [
  29 + 'checkJsApi',
  30 + 'onMenuShareTimeline',
  31 + 'onMenuShareAppMessage',
  32 + 'onMenuShareQQ',
  33 + 'onMenuShareWeibo',
  34 + 'hideMenuItems',
  35 + 'showMenuItems',
  36 + 'hideAllNonBaseMenuItem',
  37 + 'showAllNonBaseMenuItem',
  38 + 'translateVoice',
  39 + 'startRecord',
  40 + 'stopRecord',
  41 + 'onRecordEnd',
  42 + 'playVoice',
  43 + 'pauseVoice',
  44 + 'stopVoice',
  45 + 'uploadVoice',
  46 + 'downloadVoice',
  47 + 'chooseImage',
  48 + 'previewImage',
  49 + 'uploadImage',
  50 + 'downloadImage',
  51 + 'getNetworkType',
  52 + 'openLocation',
  53 + 'getLocation',
  54 + 'hideOptionMenu',
  55 + 'showOptionMenu',
  56 + 'closeWindow',
  57 + 'scanQRCode',
  58 + 'chooseWXPay',
  59 + 'openProductSpecificView',
  60 + 'addCard',
  61 + 'chooseCard',
  62 + 'openCard'
  63 + ]
  64 + });
  65 + }
  66 + });
  67 +
  68 + wx.ready(function() {
  69 + var shareTitle = $('#title').val();
  70 + var shareImg = $('#img').val();
  71 + var shareDesc = $('#desc').val();
  72 + var shareLink = $('#link').val();
  73 + var shareData = {
  74 + title: shareTitle,
  75 + desc: shareDesc,
  76 + imgUrl: shareImg,
  77 + link: shareLink
  78 + };
  79 +
  80 + wx.onMenuShareAppMessage(shareData);
  81 + wx.onMenuShareTimeline(shareData);
  82 + wx.onMenuShareQQ(shareData);
  83 + wx.onMenuShareWeibo(shareData);
  84 + });
  85 +};
@@ -7,12 +7,15 @@ @@ -7,12 +7,15 @@
7 var $ = require('jquery'); 7 var $ = require('jquery');
8 8
9 module.exports = function() { 9 module.exports = function() {
10 - var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage';  
11 - 10 + var _weChatInterface = '/life/getSignPackage';
12 $.getJSON(_weChatInterface + '?pageurl=' + 11 $.getJSON(_weChatInterface + '?pageurl=' +
13 encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function (json) { 12 encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function (json) {
14 var _appId, _timestamp, _nonceStr, _signature; 13 var _appId, _timestamp, _nonceStr, _signature;
15 14
  15 + if (!wx) {
  16 + return;
  17 + }
  18 +
16 if (json !== undefined && json !== '') { 19 if (json !== undefined && json !== '') {
17 _appId = json.appId.toString(); 20 _appId = json.appId.toString();
18 _timestamp = json.timestamp; 21 _timestamp = json.timestamp;
@@ -82,4 +85,4 @@ module.exports = function() { @@ -82,4 +85,4 @@ module.exports = function() {
82 wx.onMenuShareQQ(shareData); 85 wx.onMenuShareQQ(shareData);
83 wx.onMenuShareWeibo(shareData); 86 wx.onMenuShareWeibo(shareData);
84 }); 87 });
85 -};  
  88 +};
@@ -287,15 +287,15 @@ function search(opt) { @@ -287,15 +287,15 @@ function search(opt) {
287 if (window._yas) { 287 if (window._yas) {
288 switch (navType) { 288 switch (navType) {
289 case 'newest': 289 case 'newest':
290 - window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid, 290 + window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
291 '', $('.new-goods .good-info .good-detail-img .good-thumb')); 291 '', $('.new-goods .good-info .good-detail-img .good-thumb'));
292 break; 292 break;
293 case 'price': 293 case 'price':
294 - window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid, 294 + window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
295 '', $('.price-goods .good-info .good-detail-img .good-thumb')); 295 '', $('.price-goods .good-info .good-detail-img .good-thumb'));
296 break; 296 break;
297 case 'discount': 297 case 'discount':
298 - window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid, 298 + window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
299 '', $('.discount-goods .good-info .good-detail-img .good-thumb')); 299 '', $('.discount-goods .good-info .good-detail-img .good-thumb'));
300 break; 300 break;
301 } 301 }
1 { 1 {
2 "name": "yohobuy", 2 "name": "yohobuy",
3 - "version": "1.3.25", 3 + "version": "1.3.27",
4 "description": "yohobuy statics", 4 "description": "yohobuy statics",
5 "keywords": [], 5 "keywords": [],
6 "homepage": "", 6 "homepage": "",
@@ -192,3 +192,4 @@ iframe[height="0"] { @@ -192,3 +192,4 @@ iframe[height="0"] {
192 @import "me/index"; 192 @import "me/index";
193 @import "product/index"; 193 @import "product/index";
194 @import "cart/index"; 194 @import "cart/index";
  195 +@import "life/index";
  1 +html,body {
  2 + width: 100%;
  3 + height: 100%;
  4 +}
  5 +.coupon-page{
  6 + position: relative;
  7 + background-image: resolve('life/coupon/bg.jpg');
  8 + background-size: 100% 100%;
  9 + background-repeat: no-repeat;
  10 + height: 100%;
  11 + width: 100%;
  12 + margin-bottom: -32px;
  13 + .coupon-input{
  14 + width: 48%;
  15 + height: 30px;
  16 + text-align: center;
  17 + border: none;
  18 + position: absolute;
  19 + top: 62%;
  20 + left: 30%;
  21 + font-size: 24px;
  22 + background-color: #FFFFFF;
  23 + }
  24 + .share{
  25 + color: #FFFFFF;
  26 + font-size:40px;
  27 + text-align: center;
  28 + display: block;
  29 + position: absolute;
  30 + top:80%;
  31 + width: 100%;
  32 + }
  33 +}
  1 +html,body {
  2 + width: 100%;
  3 + height: 100%;
  4 +}
  5 +
  6 +.life-page{
  7 + position: relative;
  8 + background-image: resolve('life/index/bg.jpg');
  9 + background-size: 100% 100%;
  10 + background-repeat: no-repeat;
  11 + height: 100%;
  12 + width: 100%;
  13 + margin-bottom: -32px;
  14 + .life-page-link-content {
  15 + width: 100%;
  16 + height: 8.13%;
  17 + position: absolute;
  18 + top: 86%;
  19 + .life-page-link {
  20 + width: 60.625%;
  21 + height: 100%;
  22 + background-image: resolve('life/index/button.png');
  23 + background-size: contain;
  24 + background-repeat: no-repeat;
  25 + display: block;
  26 + position: relative;
  27 + margin: 0 auto;
  28 + }
  29 + }
  30 +
  31 +}
  32 +@import "login";
  1 +html,body {
  2 + width: 100%;
  3 + height: 100%;
  4 +}
  5 +
  6 +.lifelogin-page{
  7 + position: relative;
  8 + background-image:resolve('life/login/bg.jpg');
  9 + background-size: contain;
  10 + background-repeat: no-repeat;
  11 + height: 1525px;
  12 + width: 100%;
  13 + margin-bottom: -32px;
  14 + .btn-input{
  15 + position: absolute;
  16 + top: 608px;
  17 + left: 168px;
  18 + border:none;
  19 + width: 370px;
  20 + height:40px;
  21 + line-height: 30px;
  22 + text-align: center;
  23 + font-size: 24px;
  24 + }
  25 + .coupon-btn{
  26 + background-image:resolve('life/login/button_1.png');
  27 + background-size: contain;
  28 + background-repeat: no-repeat;
  29 + width: 388px;
  30 + height:82px;
  31 + position: absolute;
  32 + left: 20%;
  33 + top:680px;
  34 + }
  35 + .down-app{
  36 + background-image:resolve('life/login/button_2.png');
  37 + background-size: contain;
  38 + background-repeat: no-repeat;
  39 + width: 80%;
  40 + height:8.13%;
  41 + left: 10%;
  42 + bottom: 160px;
  43 + position: absolute;
  44 + }
  45 + .notice{
  46 + background-image:resolve('life/login/button_3.png');
  47 + background-size: contain;
  48 + background-repeat: no-repeat;
  49 + width: 80%;
  50 + height:7%;
  51 + position: absolute;
  52 + left: 10%;
  53 + bottom: 20px;
  54 + }
  55 + .mark{
  56 + width: 100%;
  57 + height:1525px;
  58 + background:#69cffe;
  59 + position: fixed;
  60 + opacity: 0.5;
  61 + top:0 ;
  62 + z-index: 1;
  63 + display: none;
  64 + }
  65 + .code{
  66 + background-image:resolve('life/login/codebox.jpg');
  67 + background-size: contain;
  68 + background-repeat: no-repeat;
  69 + width: 80%;
  70 + position:fixed;
  71 + height:60%;
  72 + left:10%;
  73 + top:20%;
  74 + display: none;
  75 + z-index: 2;
  76 + .close{
  77 + background-image:resolve('life/login/close.png');
  78 + background-size: 100% 100%;
  79 + background-repeat: no-repeat;
  80 + position:absolute;
  81 + width:40px;
  82 + height:40px;
  83 + left:10px;
  84 + top:10px;
  85 + }
  86 + img{
  87 + height: 40%;
  88 + width: 50%;
  89 + position: absolute;
  90 + left: 25%;
  91 + top:40%;
  92 + }
  93 + }
  94 + .successed{
  95 + background-image:resolve('life/login/get.png');
  96 + background-size: 100% 100%;
  97 + position: absolute;
  98 + width: 80%;
  99 + height:20%;
  100 + left: 10%;
  101 + top:33%;
  102 + display: none;
  103 + z-index: 2;
  104 + }
  105 + .faill{
  106 + background-image:resolve('life/login/faill.png');
  107 + background-size: 100% 100%;
  108 + position: absolute;
  109 + width: 80%;
  110 + height:20%;
  111 + left:10%;
  112 + top:33%;
  113 + display: none;
  114 + z-index: 2;
  115 + }
  116 + .late{
  117 + background-image:resolve('life/login/late.png');
  118 + background-size: 100% 100%;
  119 + position: absolute;
  120 + width: 80%;
  121 + height:20%;
  122 + left: 10%;
  123 + top:33%;
  124 + display: none;
  125 + z-index: 2;
  126 + }
  127 + .sure{
  128 + position: absolute;
  129 + display: block;
  130 + width: 42%;
  131 + height: 23%;
  132 + left: 29%;
  133 + bottom: 3%;
  134 + color: #FFFFFF;
  135 + sborder: solid 2px #FFFFFF;
  136 + }
  137 +}
  138 +@import "coupon";
@@ -37,58 +37,68 @@ @@ -37,58 +37,68 @@
37 37
38 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/07.jpg"> 38 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/07.jpg">
39 <div class="img-box"> 39 <div class="img-box">
40 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/08.jpg"> 40 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/08.jpg">
41 <a class="href href-left" href="{{url_more}}"></a> 41 <a class="href href-left" href="{{url_more}}"></a>
42 <a class="href href-right" href="{{url_more}}"></a> 42 <a class="href href-right" href="{{url_more}}"></a>
43 </div> 43 </div>
44 <div class="img-box"> 44 <div class="img-box">
45 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg"> 45 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg">
46 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22546"></span>  
47 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22542"></span> 46 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23714
  47 +"></span>
  48 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23716
  49 +"></span>
48 </div> 50 </div>
49 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 51 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
50 <div class="img-box"> 52 <div class="img-box">
51 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/10.jpg"> 53 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/10.jpg">
52 <a class="href href-left" href="{{url_more}}"></a> 54 <a class="href href-left" href="{{url_more}}"></a>
53 <a class="href href-right" href="{{url_more}}"></a> 55 <a class="href href-right" href="{{url_more}}"></a>
54 </div> 56 </div>
55 <div class="img-box"> 57 <div class="img-box">
56 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/11.jpg">  
57 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22544"></span>  
58 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22548"></span> 58 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/11.jpg">
  59 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23718
  60 +"></span>
  61 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23720
  62 +"></span>
59 </div> 63 </div>
60 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 64 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
61 <div class="img-box"> 65 <div class="img-box">
62 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/12.jpg"> 66 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/12.jpg">
63 <a class="href href-left" href="{{url_1}}"></a> 67 <a class="href href-left" href="{{url_1}}"></a>
64 <a class="href href-right" href="{{url_2}}"></a> 68 <a class="href href-right" href="{{url_2}}"></a>
65 </div> 69 </div>
66 <div class="img-box"> 70 <div class="img-box">
67 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/13.jpg">  
68 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22550"></span>  
69 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22552"></span> 71 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/13.jpg">
  72 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23734
  73 +"></span>
  74 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23742
  75 +"></span>
70 </div> 76 </div>
71 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 77 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
72 <div class="img-box"> 78 <div class="img-box">
73 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/14.jpg"> 79 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/14.jpg">
74 <a class="href href-left" href="{{url_3}}"></a> 80 <a class="href href-left" href="{{url_3}}"></a>
75 <a class="href href-right" href="{{url_4}}"></a> 81 <a class="href href-right" href="{{url_4}}"></a>
76 </div> 82 </div>
77 <div class="img-box"> 83 <div class="img-box">
78 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/15.jpg">  
79 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22554"></span>  
80 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22556"></span> 84 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/15.jpg">
  85 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23744
  86 +"></span>
  87 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23746
  88 +"></span>
81 </div> 89 </div>
82 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 90 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
83 <div class="img-box"> 91 <div class="img-box">
84 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/16.jpg"> 92 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/16.jpg">
85 <a class="href href-left" href="{{url_5}}"></a> 93 <a class="href href-left" href="{{url_5}}"></a>
86 <a class="href href-right" href="{{url_6}}"></a> 94 <a class="href href-right" href="{{url_6}}"></a>
87 </div> 95 </div>
88 <div class="img-box"> 96 <div class="img-box">
89 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/17.jpg">  
90 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22558"></span>  
91 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22560"></span> 97 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/17.jpg">
  98 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23748
  99 +"></span>
  100 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23750
  101 +"></span>
92 </div> 102 </div>
93 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 103 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
94 <div class="img-box"> 104 <div class="img-box">
@@ -96,8 +106,9 @@ @@ -96,8 +106,9 @@
96 <a class="href href-left" href="{{url_7}}"></a> 106 <a class="href href-left" href="{{url_7}}"></a>
97 </div> 107 </div>
98 <div class="img-box"> 108 <div class="img-box">
99 - <img src="{{jsUrl}}/cuxiao/img/newuser/160512/add2.jpg">  
100 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22562"></span> 109 + <img src="{{jsUrl}}/cuxiao/img/newuser/160603/add2.jpg">
  110 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23752
  111 +"></span>
101 </div> 112 </div>
102 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 113 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
103 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 114 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  1 +{{> layout/header}}
  2 +<div class="coupon-page yoho-page">
  3 + <input type="text" class="coupon-input" disabled="true">
  4 + {{#wxshare}}
  5 + <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  6 + <input id="shareLink" type="hidden" value="{{shareLink}}">
  7 + <input id="shareImg" type="hidden" value="{{shareImg}}">
  8 + <input id="shareTitle" type="hidden" value="{{shareTitle}}">
  9 + <input id="shareDesc" type="hidden" value="{{shareDesc}}">
  10 + {{/wxshare}}
  11 +</div>
  12 +{{> layout/footer}}
  1 +{{> layout/header}}
  2 +<div class="life-page yoho-page">
  3 + <div class="life-page-link-content">
  4 + <a class="life-page-link" href="/life/login"></a>
  5 + </div>
  6 + {{#wxshare}}
  7 + <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  8 + <input id="shareLink" type="hidden" value="{{shareLink}}">
  9 + <input id="shareImg" type="hidden" value="{{shareImg}}">
  10 + <input id="shareTitle" type="hidden" value="{{shareTitle}}">
  11 + <input id="shareDesc" type="hidden" value="{{shareDesc}}">
  12 + {{/wxshare}}
  13 +</div>
  14 +{{> layout/footer}}
  15 +
  16 +<script type="text/javascript">
  17 + seajs.use('js/plugin/wx-share', function(share) {
  18 + share();
  19 + });
  20 +</script>
  1 +{{> layout/header}}
  2 +<div class="lifelogin-page yoho-page">
  3 + <div class="coupon-btn"></div>
  4 + <a class="down-app" href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho"></a>
  5 + <div class="notice"></div>
  6 + <div class="mark"></div>
  7 + <div class="code">
  8 + <div class="close"></div>
  9 + <img src="http://img01.yohoboys.com/staticimg/2016/05/26/17/010eeb57a3999e58da7ce7c6f4f6e8e252.jpg"/>
  10 + </div>
  11 + <div class="successed">
  12 + <span class="sure"></span>
  13 + </div>
  14 + <div class="faill">
  15 + <a href="/life/index" class="sure"></a>
  16 + </div>
  17 + <div class="late">
  18 + <a href="/life/index" class="sure"></a>
  19 + </div>
  20 + <img src="{{shareImg}}" style="display: none;">
  21 + {{#wxshare}}
  22 + <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  23 + <input id="shareLink" type="hidden" value="{{shareLink}}">
  24 + <input id="shareImg" type="hidden" value="{{shareImg}}">
  25 + <input id="shareTitle" type="hidden" value="{{shareTitle}}">
  26 + <input id="shareDesc" type="hidden" value="{{shareDesc}}">
  27 + {{/wxshare}}
  28 +</div>
  29 +{{> layout/footer}}
@@ -351,6 +351,7 @@ @@ -351,6 +351,7 @@
351 seajs.use('js/me/currency-new'); 351 seajs.use('js/me/currency-new');
352 </script> 352 </script>
353 {{/if}} 353 {{/if}}
  354 +
354 {{!-- 星潮教室--}} 355 {{!-- 星潮教室--}}
355 {{#if trendClassHomePage}} 356 {{#if trendClassHomePage}}
356 <script> 357 <script>
@@ -358,18 +359,21 @@ @@ -358,18 +359,21 @@
358 seajs.use('js/guang/calendar'); 359 seajs.use('js/guang/calendar');
359 </script> 360 </script>
360 {{/if}} 361 {{/if}}
  362 +
361 {{!-- 星潮教室星搭配--}} 363 {{!-- 星潮教室星搭配--}}
362 {{#if trendClassCollocationPage}} 364 {{#if trendClassCollocationPage}}
363 <script> 365 <script>
364 seajs.use('js/guang/collocation-list'); 366 seajs.use('js/guang/collocation-list');
365 </script> 367 </script>
366 {{/if}} 368 {{/if}}
  369 +
367 {{!-- 星潮教室星排行--}} 370 {{!-- 星潮教室星排行--}}
368 {{#if trendClassTopPage}} 371 {{#if trendClassTopPage}}
369 <script> 372 <script>
370 seajs.use('js/guang/check-top'); 373 seajs.use('js/guang/check-top');
371 </script> 374 </script>
372 {{/if}} 375 {{/if}}
  376 +
373 {{#if messagePage}} 377 {{#if messagePage}}
374 <script> 378 <script>
375 seajs.use('js/me/message'); 379 seajs.use('js/me/message');
@@ -380,22 +384,26 @@ @@ -380,22 +384,26 @@
380 seajs.use('js/me/message-detail'); 384 seajs.use('js/me/message-detail');
381 </script> 385 </script>
382 {{/if}} 386 {{/if}}
  387 +
383 {{#if floorPage}} 388 {{#if floorPage}}
384 <script> 389 <script>
385 seajs.use('js/index/coupon'); 390 seajs.use('js/index/coupon');
386 </script> 391 </script>
387 {{/if}} 392 {{/if}}
  393 +
388 {{#if jitDetailPage}} 394 {{#if jitDetailPage}}
389 <script> 395 <script>
390 seajs.use('js/cart/jit-detail'); 396 seajs.use('js/cart/jit-detail');
391 </script> 397 </script>
392 {{/if}} 398 {{/if}}
  399 +
393 {{!-- 品牌分类 --}} 400 {{!-- 品牌分类 --}}
394 {{#if productCategoryPage}} 401 {{#if productCategoryPage}}
395 <script> 402 <script>
396 seajs.use('js/product/product-category'); 403 seajs.use('js/product/product-category');
397 </script> 404 </script>
398 {{/if}} 405 {{/if}}
  406 +
399 {{!-- 品牌店铺首页 --}} 407 {{!-- 品牌店铺首页 --}}
400 {{#if shopPage}} 408 {{#if shopPage}}
401 <script> 409 <script>
@@ -409,3 +417,15 @@ @@ -409,3 +417,15 @@
409 seajs.use('js/me/address'); 417 seajs.use('js/me/address');
410 </script> 418 </script>
411 {{/if}} 419 {{/if}}
  420 +
  421 +{{!-- 本来生活 --}}
  422 +{{#if lifePage}}
  423 +<script>
  424 + seajs.use('js/life/login');
  425 +</script>
  426 +{{/if}}
  427 +{{#if couponPage}}
  428 +<script>
  429 + seajs.use('js/life/coupon');
  430 +</script>
  431 +{{/if}}
@@ -771,13 +771,13 @@ class CouponController extends HuodongAction @@ -771,13 +771,13 @@ class CouponController extends HuodongAction
771 'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}', 771 'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
772 'url_more' => $url, 772 'url_more' => $url,
773 773
774 - 'url_1' => 'http://list.m.yohobuy.com/?msort=1&misort=18,20,21,22,172,226&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22,172,226","title":"外套"}}',  
775 - 'url_2' => 'http://list.m.yohobuy.com/?msort=1&misort=12,16,257&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"12,16,257","title":"春装"}}',  
776 - 'url_3' => 'http://list.m.yohobuy.com/?gender=2,3&msort=4&misort=31,32&openby:yohobuy={"action":"go.list","params":{"msort":"4","misort":"31,32","gender":"2,3","title":"裙装"}}',  
777 - 'url_4' => 'http://list.m.yohobuy.com/?msort=3&misort=26,27,28&openby:yohobuy={"action":"go.list","params":{"msort":"3","misort":"26,27,28","title":"裤装"}}',  
778 - 'url_5' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}', 774 + 'url_1' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,12,28,46&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,12,28,46","title":"夏装"}}',
  775 + 'url_2' => 'http://list.m.yohobuy.com/?msort=1&misort=21,16,257&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"21,16,257","title":"春装"}}',
  776 + 'url_3' => 'http://list.m.yohobuy.com/?msort=3&misort=26,27,28&openby:yohobuy={"action":"go.list","params":{"msort":"3","misort":"26,27,28","title":"裤装"}}',
  777 + 'url_4' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
  778 + 'url_5' => 'http://list.m.yohobuy.com/?gender=2,3&msort=4&misort=31,32&openby:yohobuy={"action":"go.list","params":{"msort":"4","misort":"31,32","gender":"2,3","title":"裙装"}}',
779 'url_6' => 'http://list.m.yohobuy.com/?msort=10&openby:yohobuy={"action":"go.list","params":{"msort":"10","title":"创意生活"}}', 779 'url_6' => 'http://list.m.yohobuy.com/?msort=10&openby:yohobuy={"action":"go.list","params":{"msort":"10","title":"创意生活"}}',
780 - 'url_7' => 'http://list.m.yohobuy.com/?msort=1&misort=12&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"12","title":"衬衫"}}', 780 + 'url_7' => 'http://list.m.yohobuy.com/?msort=1&misort=12,13,14&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"12,13,14","title":"衬衫"}}',
781 )); 781 ));
782 } 782 }
783 783
@@ -3,9 +3,9 @@ use Action\AbstractAction; @@ -3,9 +3,9 @@ use Action\AbstractAction;
3 3
4 /** 4 /**
5 * 专为APP客户端调用的 hf(hotfix) Api 5 * 专为APP客户端调用的 hf(hotfix) Api
6 - * 6 + *
7 * @name HfController 7 * @name HfController
8 - * @package 8 + * @package
9 * @copyright yoho.inc 9 * @copyright yoho.inc
10 * @version 1.1 (2016-5-23 9:57:40) 增加android接口 10 * @version 1.1 (2016-5-23 9:57:40) 增加android接口
11 * @author CL 11 * @author CL
@@ -14,10 +14,10 @@ class HfController extends AbstractAction @@ -14,10 +14,10 @@ class HfController extends AbstractAction
14 { 14 {
15 /* 私钥 */ 15 /* 私钥 */
16 const PRIVATE_KEY = 'fd4ad5fcsa0de589af23234ks1923ks'; 16 const PRIVATE_KEY = 'fd4ad5fcsa0de589af23234ks1923ks';
17 - 17 +
18 /** 18 /**
19 * V1版本 19 * V1版本
20 - * 20 + *
21 * 参数列表 21 * 参数列表
22 * ------------------------------------------------------------------------- 22 * -------------------------------------------------------------------------
23 * 字段 描述 类型 示例 23 * 字段 描述 类型 示例
@@ -28,14 +28,14 @@ class HfController extends AbstractAction @@ -28,14 +28,14 @@ class HfController extends AbstractAction
28 * udid 设备唯一码 string 1d123sadao3 28 * udid 设备唯一码 string 1d123sadao3
29 * os_version 设备版本号 string 1d123sadao3 29 * os_version 设备版本号 string 1d123sadao3
30 * patchv 补丁版本号，如果本地没有补丁，传空 string 100 30 * patchv 补丁版本号，如果本地没有补丁，传空 string 100
31 - * 31 + *
32 * 返回列表 32 * 返回列表
33 * ------------------------------------------------------------------------- 33 * -------------------------------------------------------------------------
34 * 字段 描述 类型 示例 34 * 字段 描述 类型 示例
35 * code 返回的code，200,304等，具体的服务器定义 int 200 35 * code 返回的code，200,304等，具体的服务器定义 int 200
36 * message 信息 string "Config Success" 36 * message 信息 string "Config Success"
37 * md5 当前请求的唯一码 string "1234567890123456" 37 * md5 当前请求的唯一码 string "1234567890123456"
38 - * data 配置参数数据，参考data列表 object 38 + * data 配置参数数据，参考data列表 object
39 * [ 39 * [
40 * url 补丁url地址，没有传空 string http://yohocdn.com/fpath/fpkk.js 40 * url 补丁url地址，没有传空 string http://yohocdn.com/fpath/fpkk.js
41 * patchv 当前补丁的版本号，没有就传空 string "100" 41 * patchv 当前补丁的版本号，没有就传空 string "100"
@@ -51,9 +51,9 @@ class HfController extends AbstractAction @@ -51,9 +51,9 @@ class HfController extends AbstractAction
51 51
52 $ios = 'ios'; 52 $ios = 'ios';
53 $android = 'android'; 53 $android = 'android';
54 - 54 +
55 // 根据版本号返回补丁文件信息 55 // 根据版本号返回补丁文件信息
56 - 56 +
57 if (strcasecmp($clienttype, $ios) == 0){ 57 if (strcasecmp($clienttype, $ios) == 0){
58 58
59 switch ($version) { 59 switch ($version) {
@@ -78,15 +78,15 @@ class HfController extends AbstractAction @@ -78,15 +78,15 @@ class HfController extends AbstractAction
78 // var_dump('ios 4.1'); 78 // var_dump('ios 4.1');
79 break; 79 break;
80 } 80 }
81 - 81 +
82 } 82 }
83 else if (strcasecmp($clienttype, $android) == 0){ 83 else if (strcasecmp($clienttype, $android) == 0){
84 - 84 +
85 switch ($version) { 85 switch ($version) {
86 case '4.4.0': // 版本 86 case '4.4.0': // 版本
87 - $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/a/4.3.0/201605191600.apatch'; 87 + $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/a/4.4.0/201605292017.apatch';
88 $result['data']['patchv'] = '103'; 88 $result['data']['patchv'] = '103';
89 - $result['data']['filecode'] = md5('c1edcb91fc0eb56a4699e0b31e942d06' . 'yohopatch2016'); 89 + $result['data']['filecode'] = '09c95791892253be61412dce0d5c1e62';
90 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data'])); 90 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
91 // var_dump('android 4.3.0'); 91 // var_dump('android 4.3.0');
92 break; 92 break;
@@ -100,7 +100,7 @@ class HfController extends AbstractAction @@ -100,7 +100,7 @@ class HfController extends AbstractAction
100 } 100 }
101 101
102 } 102 }
103 - else 103 + else
104 { 104 {
105 // var_dump('no found app clienttype'); 105 // var_dump('no found app clienttype');
106 106
  1 +<?php
  2 +
  3 +use Action\AbstractAction;
  4 +use Plugin\Helpers;
  5 +use LibModels\Wap\Coupon\CouponData;
  6 +
  7 +class LifeController extends AbstractAction
  8 +{
  9 +
  10 + const COUPON_ID = 23360;
  11 +
  12 + public function indexAction()
  13 + {
  14 + $uid = $this->getUid();
  15 + if (!$uid) {
  16 + $this->go(Helpers::url('/signin.html', array('refer' => Helpers::url('/life/index'))));
  17 + }
  18 + $this->_view->display('index', array(
  19 + 'wxshare' => array(
  20 + 'shareLink' => 'http://m.yohobuy.com/life/index',
  21 + 'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/05/26/17/0208d70abf2b3fc94412f0e4d84f6728df.png',
  22 + 'shareTitle' => 'YOHO!BUY有货清凉夏日福利券限时派送中 ',
  23 + 'shareDesc' => '我已成功领取36元清凉夏日福利券，你也快来吧！',
  24 + ),
  25 + ));
  26 + }
  27 +
  28 + //点击领券按钮
  29 + public function sendCouponAction()
  30 + {
  31 + $result = array('code' => 400, 'message' => '领取失败', 'data' => '');
  32 + do {
  33 + if (!$this->isAjax()) {
  34 + break;
  35 + }
  36 + //获取领券参数
  37 + $couponId = self::COUPON_ID;
  38 + $uid = $this->getUid();
  39 + //领取优惠券
  40 + $result = CouponData::receiveCoupon($uid, $couponId);
  41 + if (!isset($result['code'])) {
  42 + break;
  43 + }
  44 + }
  45 + while (false);
  46 + $this->echoJson($result);
  47 + }
  48 +
  49 + public function loginAction()
  50 + {
  51 + $uid = $this->getUid();
  52 + if (!$uid) {
  53 + $this->go(Helpers::url('/signin.html', array('refer' => Helpers::url('/life/index'))));
  54 + }
  55 +
  56 + $this->_view->display('login', array(
  57 + 'wxshare' => array(
  58 + 'shareLink' => 'http://m.yohobuy.com/life/index',
  59 + 'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/05/26/17/0208d70abf2b3fc94412f0e4d84f6728df.png',
  60 + 'shareTitle' => 'YOHO!BUY有货清凉夏日福利券限时派送中 ',
  61 + 'shareDesc' => '我已成功领取36元清凉夏日福利券，你也快来吧！',
  62 + ),
  63 + 'lifePage' => true));
  64 + }
  65 +
  66 + public function couponAction()
  67 + {
  68 + //获取手机号，传优惠码
  69 + $this->_view->display('coupon', array(
  70 + 'wxshare' => array(
  71 + 'shareLink' => 'http://m.yohobuy.com/life/index',
  72 + 'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/05/26/17/0208d70abf2b3fc94412f0e4d84f6728df.png',
  73 + 'shareTitle' => 'YOHO!BUY有货清凉夏日福利券限时派送中 ',
  74 + 'shareDesc' => '我已成功领取36元清凉夏日福利券，你也快来吧！',
  75 + ),
  76 + 'couponPage' => true));
  77 + }
  78 +
  79 + public function getSignPackageAction()
  80 + {
  81 + $curl = 'http://www.yohoshow.com/api/wechat/getSignPackage';
  82 + $pageurl = $this->get('pageurl', '');
  83 + $callback = $this->get('callback', '');
  84 + $url = $curl . '?pageurl=' . urlencode($pageurl) . "&callback=" . $callback;
  85 + $res = file_get_contents($url);
  86 + echo $res;
  87 + exit;
  88 + }
  89 +
  90 +}
@@ -180,9 +180,11 @@ class InfoController extends AbstractAction @@ -180,9 +180,11 @@ class InfoController extends AbstractAction
180 // 相关品牌 180 // 相关品牌
181 if (!empty($detail['getBrand'])) { 181 if (!empty($detail['getBrand'])) {
182 $data['relatedBrand'] = $detail['getBrand']; 182 $data['relatedBrand'] = $detail['getBrand'];
183 - foreach ($data['relatedBrand'] as &$value) {  
184 - $value['thumb'] = strtr($value['thumb'], array('http://' => '//')); 183 +
  184 + foreach ($data['relatedBrand'] as $key => $value) {
  185 + $data['relatedBrand'][$key]['thumb'] = strtr($value['thumb'], array('http://' => '//'));
185 } 186 }
  187 +
186 } 188 }
187 189
188 // 相关标签 190 // 相关标签
@@ -223,6 +225,7 @@ class InfoController extends AbstractAction @@ -223,6 +225,7 @@ class InfoController extends AbstractAction
223 // 标识有微信分享 225 // 标识有微信分享
224 $data['hasWxShare'] = true; 226 $data['hasWxShare'] = true;
225 227
  228 +
226 $this->_view->display('index', $data); 229 $this->_view->display('index', $data);
227 230
228 $detail = array(); 231 $detail = array();
@@ -356,6 +359,7 @@ class InfoController extends AbstractAction @@ -356,6 +359,7 @@ class InfoController extends AbstractAction
356 $data['relatedBrand'] = $detail['getBrand']; 359 $data['relatedBrand'] = $detail['getBrand'];
357 } 360 }
358 361
  362 +
359 // 分享参数 363 // 分享参数
360 if (isset($detail['getArticle']['cover_image'])) { 364 if (isset($detail['getArticle']['cover_image'])) {
361 $data['shareLink'] = Helpers::url('/info/index', array('id' => $id), 'guang'); 365 $data['shareLink'] = Helpers::url('/info/index', array('id' => $id), 'guang');
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.25" 53 +application.version = "1.3.27"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.25" 53 +application.version = "1.3.27"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.25" 53 +application.version = "1.3.27"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.25" 53 +application.version = "1.3.27"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"