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
if (isset($getUidBrandFav['code']) && $getUidBrandFav['code'] == 200) {
$cached['getUidBrandFav'] = true;
}else{
$cached['getUidBrandFav'] = false;
//$cached['getUidBrandFav'] = false;
$getUidBrandFavResult = false;
}
}
}else{
$cached['getUidBrandFav'] = false;
$getUidBrandFavResult = false;
//$cached['getUidBrandFav'] = false;
}
//return $cached;
if (!empty($cached)) {
$cached['getUidBrandFav'] = $getUidBrandFavResult;
return $cached;
}
return $cached;
}
// 品牌详情信息
... ...
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');
require('./js/product/entry');
require('./js/me/entry');
require('./js/cart/entry');
require('./js/life/entry');
module.exports = yohobuy;
... ...
var $ = require('jquery');
require('../common.js');
$('.coupon-input').val(window.cookie('lifeCoupon') || '');
require('../plugin/wx-share')();
... ...
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
require('./login');
require('./coupon');
... ...
var $ = require('jquery');
require('../common.js');
require('../plugin/wx-share')();
$('.notice').click(function() {
$('.code').show();
$('.mark').show();
});
$('.close').click(function() {
$('.code').hide();
$('.mark').hide();
});
function get() {
$.ajax({
type: 'get',
url: '/index/life/sendCoupon',
dataType: 'json',
success: function(data) {
$('.statu').html(data.message);
$('.statu-mark').show();
$('.statu-box').show();
if (data.code === 200) {
window.setCookie('lifeCoupon', data.data);
location.href = '/life/coupon';
} else if (data.code === 401) {
$('.successed').css('display', 'block');
$('.sure').click(function() {
location.href = '/life/coupon';
});
} else if (data.code === 403) {
$('.late').css('display', 'block');
} else {
$('.faill').css('display', 'block');
}
}
});
}
$('.coupon-btn').click(function() {
get();
$('.mark').show();
});
... ...
/**
* 微信分享
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2015/10/30
*/
var $ = require('jquery');
module.exports = function() {
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 = $('#title').val();
var shareImg = $('#img').val();
var shareDesc = $('#desc').val();
var shareLink = $('#link').val();
var shareData = {
title: shareTitle,
desc: shareDesc,
imgUrl: shareImg,
link: shareLink
};
wx.onMenuShareAppMessage(shareData);
wx.onMenuShareTimeline(shareData);
wx.onMenuShareQQ(shareData);
wx.onMenuShareWeibo(shareData);
});
};
\ No newline at end of file
... ...
... ... @@ -7,12 +7,15 @@
var $ = require('jquery');
module.exports = function() {
var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage';
var _weChatInterface = '/life/getSignPackage';
$.getJSON(_weChatInterface + '?pageurl=' +
encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function (json) {
var _appId, _timestamp, _nonceStr, _signature;
if (!wx) {
return;
}
if (json !== undefined && json !== '') {
_appId = json.appId.toString();
_timestamp = json.timestamp;
... ... @@ -82,4 +85,4 @@ module.exports = function() {
wx.onMenuShareQQ(shareData);
wx.onMenuShareWeibo(shareData);
});
};
\ No newline at end of file
};
... ...
... ... @@ -287,15 +287,15 @@ function search(opt) {
if (window._yas) {
switch (navType) {
case 'newest':
window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
'', $('.new-goods .good-info .good-detail-img .good-thumb'));
break;
case 'price':
window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
'', $('.price-goods .good-info .good-detail-img .good-thumb'));
break;
case 'discount':
window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
'', $('.discount-goods .good-info .good-detail-img .good-thumb'));
break;
}
... ...
{
"name": "yohobuy",
"version": "1.3.25",
"version": "1.3.27",
"description": "yohobuy statics",
"keywords": [],
"homepage": "",
... ...
... ... @@ -192,3 +192,4 @@ iframe[height="0"] {
@import "me/index";
@import "product/index";
@import "cart/index";
@import "life/index";
... ...
html,body {
width: 100%;
height: 100%;
}
.coupon-page{
position: relative;
background-image: resolve('life/coupon/bg.jpg');
background-size: 100% 100%;
background-repeat: no-repeat;
height: 100%;
width: 100%;
margin-bottom: -32px;
.coupon-input{
width: 48%;
height: 30px;
text-align: center;
border: none;
position: absolute;
top: 62%;
left: 30%;
font-size: 24px;
background-color: #FFFFFF;
}
.share{
color: #FFFFFF;
font-size:40px;
text-align: center;
display: block;
position: absolute;
top:80%;
width: 100%;
}
}
... ...
html,body {
width: 100%;
height: 100%;
}
.life-page{
position: relative;
background-image: resolve('life/index/bg.jpg');
background-size: 100% 100%;
background-repeat: no-repeat;
height: 100%;
width: 100%;
margin-bottom: -32px;
.life-page-link-content {
width: 100%;
height: 8.13%;
position: absolute;
top: 86%;
.life-page-link {
width: 60.625%;
height: 100%;
background-image: resolve('life/index/button.png');
background-size: contain;
background-repeat: no-repeat;
display: block;
position: relative;
margin: 0 auto;
}
}
}
@import "login";
\ No newline at end of file
... ...
html,body {
width: 100%;
height: 100%;
}
.lifelogin-page{
position: relative;
background-image:resolve('life/login/bg.jpg');
background-size: contain;
background-repeat: no-repeat;
height: 1525px;
width: 100%;
margin-bottom: -32px;
.btn-input{
position: absolute;
top: 608px;
left: 168px;
border:none;
width: 370px;
height:40px;
line-height: 30px;
text-align: center;
font-size: 24px;
}
.coupon-btn{
background-image:resolve('life/login/button_1.png');
background-size: contain;
background-repeat: no-repeat;
width: 388px;
height:82px;
position: absolute;
left: 20%;
top:680px;
}
.down-app{
background-image:resolve('life/login/button_2.png');
background-size: contain;
background-repeat: no-repeat;
width: 80%;
height:8.13%;
left: 10%;
bottom: 160px;
position: absolute;
}
.notice{
background-image:resolve('life/login/button_3.png');
background-size: contain;
background-repeat: no-repeat;
width: 80%;
height:7%;
position: absolute;
left: 10%;
bottom: 20px;
}
.mark{
width: 100%;
height:1525px;
background:#69cffe;
position: fixed;
opacity: 0.5;
top:0 ;
z-index: 1;
display: none;
}
.code{
background-image:resolve('life/login/codebox.jpg');
background-size: contain;
background-repeat: no-repeat;
width: 80%;
position:fixed;
height:60%;
left:10%;
top:20%;
display: none;
z-index: 2;
.close{
background-image:resolve('life/login/close.png');
background-size: 100% 100%;
background-repeat: no-repeat;
position:absolute;
width:40px;
height:40px;
left:10px;
top:10px;
}
img{
height: 40%;
width: 50%;
position: absolute;
left: 25%;
top:40%;
}
}
.successed{
background-image:resolve('life/login/get.png');
background-size: 100% 100%;
position: absolute;
width: 80%;
height:20%;
left: 10%;
top:33%;
display: none;
z-index: 2;
}
.faill{
background-image:resolve('life/login/faill.png');
background-size: 100% 100%;
position: absolute;
width: 80%;
height:20%;
left:10%;
top:33%;
display: none;
z-index: 2;
}
.late{
background-image:resolve('life/login/late.png');
background-size: 100% 100%;
position: absolute;
width: 80%;
height:20%;
left: 10%;
top:33%;
display: none;
z-index: 2;
}
.sure{
position: absolute;
display: block;
width: 42%;
height: 23%;
left: 29%;
bottom: 3%;
color: #FFFFFF;
sborder: solid 2px #FFFFFF;
}
}
@import "coupon";
\ No newline at end of file
... ...
... ... @@ -37,58 +37,68 @@
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/07.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/08.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/08.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_more}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="22546"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="22542"></span>
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23714
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23716
"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/10.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/10.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_more}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="22544"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="22548"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23718
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23720
"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/12.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/12.jpg">
<a class="href href-left" href="{{url_1}}"></a>
<a class="href href-right" href="{{url_2}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="22550"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="22552"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23734
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23742
"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/14.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/14.jpg">
<a class="href href-left" href="{{url_3}}"></a>
<a class="href href-right" href="{{url_4}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="22554"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="22556"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23744
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23746
"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/16.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/16.jpg">
<a class="href href-left" href="{{url_5}}"></a>
<a class="href href-right" href="{{url_6}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="22558"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="22560"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23748
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23750
"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
... ... @@ -96,8 +106,9 @@
<a class="href href-left" href="{{url_7}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/add2.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="22562"></span>
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/add2.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23752
"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
... ...
{{> layout/header}}
<div class="coupon-page yoho-page">
<input type="text" class="coupon-input" disabled="true">
{{#wxshare}}
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<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}}">
{{/wxshare}}
</div>
{{> layout/footer}}
... ...
{{> layout/header}}
<div class="life-page yoho-page">
<div class="life-page-link-content">
<a class="life-page-link" href="/life/login"></a>
</div>
{{#wxshare}}
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<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}}">
{{/wxshare}}
</div>
{{> layout/footer}}
<script type="text/javascript">
seajs.use('js/plugin/wx-share', function(share) {
share();
});
</script>
... ...
{{> layout/header}}
<div class="lifelogin-page yoho-page">
<div class="coupon-btn"></div>
<a class="down-app" href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho"></a>
<div class="notice"></div>
<div class="mark"></div>
<div class="code">
<div class="close"></div>
<img src="http://img01.yohoboys.com/staticimg/2016/05/26/17/010eeb57a3999e58da7ce7c6f4f6e8e252.jpg"/>
</div>
<div class="successed">
<span class="sure"></span>
</div>
<div class="faill">
<a href="/life/index" class="sure"></a>
</div>
<div class="late">
<a href="/life/index" class="sure"></a>
</div>
<img src="{{shareImg}}" style="display: none;">
{{#wxshare}}
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<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}}">
{{/wxshare}}
</div>
{{> layout/footer}}
... ...
... ... @@ -351,6 +351,7 @@
seajs.use('js/me/currency-new');
</script>
{{/if}}
{{!-- 星潮教室--}}
{{#if trendClassHomePage}}
<script>
... ... @@ -358,18 +359,21 @@
seajs.use('js/guang/calendar');
</script>
{{/if}}
{{!-- 星潮教室星搭配--}}
{{#if trendClassCollocationPage}}
<script>
seajs.use('js/guang/collocation-list');
</script>
{{/if}}
{{!-- 星潮教室星排行--}}
{{#if trendClassTopPage}}
<script>
seajs.use('js/guang/check-top');
</script>
{{/if}}
{{#if messagePage}}
<script>
seajs.use('js/me/message');
... ... @@ -380,22 +384,26 @@
seajs.use('js/me/message-detail');
</script>
{{/if}}
{{#if floorPage}}
<script>
seajs.use('js/index/coupon');
</script>
{{/if}}
{{#if jitDetailPage}}
<script>
seajs.use('js/cart/jit-detail');
</script>
{{/if}}
{{!-- 品牌分类 --}}
{{#if productCategoryPage}}
<script>
seajs.use('js/product/product-category');
</script>
{{/if}}
{{!-- 品牌店铺首页 --}}
{{#if shopPage}}
<script>
... ... @@ -409,3 +417,15 @@
seajs.use('js/me/address');
</script>
{{/if}}
{{!-- 本来生活 --}}
{{#if lifePage}}
<script>
seajs.use('js/life/login');
</script>
{{/if}}
{{#if couponPage}}
<script>
seajs.use('js/life/coupon');
</script>
{{/if}}
... ...
... ... @@ -771,13 +771,13 @@ class CouponController extends HuodongAction
'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
'url_more' => $url,
'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":"外套"}}',
'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":"春装"}}',
'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":"裙装"}}',
'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":"裤装"}}',
'url_5' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
'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":"夏装"}}',
'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":"春装"}}',
'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":"裤装"}}',
'url_4' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
'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":"裙装"}}',
'url_6' => 'http://list.m.yohobuy.com/?msort=10&openby:yohobuy={"action":"go.list","params":{"msort":"10","title":"创意生活"}}',
'url_7' => 'http://list.m.yohobuy.com/?msort=1&misort=12&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"12","title":"衬衫"}}',
'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":"衬衫"}}',
));
}
... ...
... ... @@ -3,9 +3,9 @@ use Action\AbstractAction;
/**
* 专为APP客户端调用的 hf(hotfix) Api
*
*
* @name HfController
* @package
* @package
* @copyright yoho.inc
* @version 1.1 (2016-5-23 9:57:40) 增加android接口
* @author CL
... ... @@ -14,10 +14,10 @@ class HfController extends AbstractAction
{
/* 私钥 */
const PRIVATE_KEY = 'fd4ad5fcsa0de589af23234ks1923ks';
/**
* V1版本
*
*
* 参数列表
* -------------------------------------------------------------------------
* 字段 描述 类型 示例
... ... @@ -28,14 +28,14 @@ class HfController extends AbstractAction
* udid 设备唯一码 string 1d123sadao3
* os_version 设备版本号 string 1d123sadao3
* patchv 补丁版本号，如果本地没有补丁，传空 string 100
*
*
* 返回列表
* -------------------------------------------------------------------------
* 字段 描述 类型 示例
* code 返回的code，200,304等，具体的服务器定义 int 200
* message 信息 string "Config Success"
* md5 当前请求的唯一码 string "1234567890123456"
* data 配置参数数据，参考data列表 object
* data 配置参数数据，参考data列表 object
* [
* url 补丁url地址，没有传空 string http://yohocdn.com/fpath/fpkk.js
* patchv 当前补丁的版本号，没有就传空 string "100"
... ... @@ -51,9 +51,9 @@ class HfController extends AbstractAction
$ios = 'ios';
$android = 'android';
// 根据版本号返回补丁文件信息
if (strcasecmp($clienttype, $ios) == 0){
switch ($version) {
... ... @@ -78,15 +78,15 @@ class HfController extends AbstractAction
// var_dump('ios 4.1');
break;
}
}
else if (strcasecmp($clienttype, $android) == 0){
switch ($version) {
case '4.4.0': // 版本
$result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/a/4.3.0/201605191600.apatch';
$result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/a/4.4.0/201605292017.apatch';
$result['data']['patchv'] = '103';
$result['data']['filecode'] = md5('c1edcb91fc0eb56a4699e0b31e942d06' . 'yohopatch2016');
$result['data']['filecode'] = '09c95791892253be61412dce0d5c1e62';
$result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
// var_dump('android 4.3.0');
break;
... ... @@ -100,7 +100,7 @@ class HfController extends AbstractAction
}
}
else
else
{
// var_dump('no found app clienttype');
... ...
<?php
use Action\AbstractAction;
use Plugin\Helpers;
use LibModels\Wap\Coupon\CouponData;
class LifeController extends AbstractAction
{
const COUPON_ID = 23360;
public function indexAction()
{
$uid = $this->getUid();
if (!$uid) {
$this->go(Helpers::url('/signin.html', array('refer' => Helpers::url('/life/index'))));
}
$this->_view->display('index', array(
'wxshare' => array(
'shareLink' => 'http://m.yohobuy.com/life/index',
'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/05/26/17/0208d70abf2b3fc94412f0e4d84f6728df.png',
'shareTitle' => 'YOHO!BUY有货清凉夏日福利券限时派送中 ',
'shareDesc' => '我已成功领取36元清凉夏日福利券，你也快来吧！',
),
));
}
//点击领券按钮
public function sendCouponAction()
{
$result = array('code' => 400, 'message' => '领取失败', 'data' => '');
do {
if (!$this->isAjax()) {
break;
}
//获取领券参数
$couponId = self::COUPON_ID;
$uid = $this->getUid();
//领取优惠券
$result = CouponData::receiveCoupon($uid, $couponId);
if (!isset($result['code'])) {
break;
}
}
while (false);
$this->echoJson($result);
}
public function loginAction()
{
$uid = $this->getUid();
if (!$uid) {
$this->go(Helpers::url('/signin.html', array('refer' => Helpers::url('/life/index'))));
}
$this->_view->display('login', array(
'wxshare' => array(
'shareLink' => 'http://m.yohobuy.com/life/index',
'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/05/26/17/0208d70abf2b3fc94412f0e4d84f6728df.png',
'shareTitle' => 'YOHO!BUY有货清凉夏日福利券限时派送中 ',
'shareDesc' => '我已成功领取36元清凉夏日福利券，你也快来吧！',
),
'lifePage' => true));
}
public function couponAction()
{
//获取手机号，传优惠码
$this->_view->display('coupon', array(
'wxshare' => array(
'shareLink' => 'http://m.yohobuy.com/life/index',
'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/05/26/17/0208d70abf2b3fc94412f0e4d84f6728df.png',
'shareTitle' => 'YOHO!BUY有货清凉夏日福利券限时派送中 ',
'shareDesc' => '我已成功领取36元清凉夏日福利券，你也快来吧！',
),
'couponPage' => true));
}
public function getSignPackageAction()
{
$curl = 'http://www.yohoshow.com/api/wechat/getSignPackage';
$pageurl = $this->get('pageurl', '');
$callback = $this->get('callback', '');
$url = $curl . '?pageurl=' . urlencode($pageurl) . "&callback=" . $callback;
$res = file_get_contents($url);
echo $res;
exit;
}
}
... ...
... ... @@ -180,9 +180,11 @@ class InfoController extends AbstractAction
// 相关品牌
if (!empty($detail['getBrand'])) {
$data['relatedBrand'] = $detail['getBrand'];
foreach ($data['relatedBrand'] as &$value) {
$value['thumb'] = strtr($value['thumb'], array('http://' => '//'));
foreach ($data['relatedBrand'] as $key => $value) {
$data['relatedBrand'][$key]['thumb'] = strtr($value['thumb'], array('http://' => '//'));
}
}
// 相关标签
... ... @@ -223,6 +225,7 @@ class InfoController extends AbstractAction
// 标识有微信分享
$data['hasWxShare'] = true;
$this->_view->display('index', $data);
$detail = array();
... ... @@ -356,6 +359,7 @@ class InfoController extends AbstractAction
$data['relatedBrand'] = $detail['getBrand'];
}
// 分享参数
if (isset($detail['getArticle']['cover_image'])) {
$data['shareLink'] = Helpers::url('/info/index', array('id' => $id), 'guang');
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.25"
application.version = "1.3.27"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.25"
application.version = "1.3.27"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.25"
application.version = "1.3.27"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.25"
application.version = "1.3.27"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...