fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by Lynnic
Commit db8f558d55c08f8f760ed82cdaac63fd14457bdd 2 parents d0ceaf03 315c2905

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 7 changed files with 81 additions and 214 deletions
... ... @@ -2,7 +2,7 @@
<div class="my-page yoho-page">
<div class="my-header">
{{#isLogin}}
<a class="user-info" href="/home/personaldetails">
<a class="user-info" href="/home/mydetails">
<img class="user-avatar" src="{{head_ico}}">
<span class="username">{{profile_name}}</span>
{{#vip_info}}
... ... @@ -13,7 +13,7 @@
{{/isLogin}}
{{^isLogin}}
<div class="user-info">
<a class="login-btn" href="http://m.dev.yohobuy.com/signin.html">
<a class="login-btn" href="/signin.html">
登录/注册
</a>
</div>
... ... @@ -41,15 +41,15 @@
</a>
</div>
<div class="order-type clearfix">
<a class="type-item" href="/home/order">
<a class="type-item" href="/home/order?type=2">
<span class="iconfont">&#xe634;</span>
<br>待付款
</a>
<a class="type-item" href="/home/order">
<a class="type-item" href="/home/order?type=3">
<span class="iconfont">&#xe63b;</span>
<br>待发货
</a>
<a class="type-item" href="/home/order">
<a class="type-item" href="/home/order?type=4">
<span class="iconfont">&#xe633;</span>
<br>待收货
</a>
... ... @@ -94,7 +94,7 @@
</a>
</div>
<div class="group-list">
<a class="list-item" href="/home/">
<a class="list-item" href="/help.html">
<span class="iconfont icon">&#xe639;</span>
帮助
<span class="iconfont num">&#xe604;</span>
... ...
{{> layout/header}}
<div class="yoho-suggest-sub-page yoho-page">
{{# suggestSub}}
<div class="suggest-sub-form">
<textarea name="" id="suggest-textarea" placeholder="请输入意见反馈，我们会以消息形式回复您的建议或意见，改进产品体验，谢谢！"></textarea>
<div id="img-form" class="img-form">
<ul class="upload-img-list"></ul>
<span class="img-add">
<input id="upload-img" type="file" />
</span>
</div>
</div>
{{/ suggestSub}}
</div>
{{> layout/header}}
<div class="yoho-suggest-sub-page yoho-page">
{{# suggestSub}}
<div class="suggest-sub-form">
<textarea name="" id="suggest-textarea" placeholder="请输入意见反馈，我们会以消息形式回复您的建议或意见，改进产品体验，谢谢！"></textarea>
<div id="img-form" class="img-form">
<ul class="upload-img-list"></ul>
<span class="img-add">
<input id="upload-img" type="file" />
</span>
</div>
</div>
{{/ suggestSub}}
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -14,9 +14,7 @@
{{/detail}}
<div class="desc-text">{{desc}}</div>
</div>
{{/goodsDescription}}
<!-- <div class="gap-block"></div> -->
{{/goodsDescription}}
{{#sizeInfo}}
<div class="size-info page-block">
... ... @@ -43,8 +41,6 @@
</div>
{{/sizeInfo}}
<!-- <div class="gap-block"></div> -->
{{#measurementMethod}}
<div class="measurement-method page-block">
<h1 class="title">
... ...
{{#goodsDescription}}
<div class="goods-desc page-block">
<img class="service lazy" data-original="http://static.dev.yohobuy.com/img/product/service.png" alt="">
<h1 class="title">
{{title}}
<span class="en-title">{{enTitle}}</span>
</h1>
{{#detail}}
<ul class="detail table clearfix">
{{#list}}
<div class="column">{{param}}</div>
{{/list}}
</ul>
{{/detail}}
<div class="desc-text">{{desc}}</div>
</div>
{{/goodsDescription}}
{{#sizeInfo}}
<div class="size-info page-block">
<h1 class="title">
{{title}}
<span class="en-title">{{enTitle}}</span>
</h1>
{{#detail}}
<div class="detail">
<div class="swiper-container detail-swiper" id="size-swiper-container">
<div class="swiper-wrapper">
{{#list}}
<div class="swiper-slide " >
{{#params}}
<div class="cell">{{param}}</div>
{{/params}}
</div>
{{/list}}
</div>
</div>
<p class="tips">提示：左滑查看完整表格信息</p>
</div>
{{/detail}}
</div>
{{/sizeInfo}}
{{#measurementMethod}}
<div class="measurement-method page-block">
<h1 class="title">
{{title}}
<span class="en-title">{{enTitle}}</span>
</h1>
<div class="detail" style="width:100%">
<img class="lazy" data-original="{{img}}" alt="">
</div>
</div>
{{/measurementMethod}}
{{#reference}}
<div class="size-info page-block">
<h1 class="title">
{{title}}
<span class="en-title">{{enTitle}}</span>
</h1>
{{#detail}}
<div class="detail">
<div class="swiper-container detail-swiper" id="reference-swiper-container">
<div class="swiper-wrapper">
{{#list}}
{{#if @first}}
<div class="swiper-slide first-group" >
</div>
{{else}}
<div class="swiper-slide" >
{{#params}}
<div class=" cell">{{param}}</div>
{{/params}}
</div>
{{/if}}
{{/list}}
</div>
</div>
<p class="tips">提示:左滑查看完整表格信息</p>
</div>
{{/detail}}
</div>
{{/reference}}
{{#materials}}
<div class="materials page-block">
<h1 class="title">
{{title}}
<span class="en-title">{{enTitle}}</span>
</h1>
<div class="detail">
{{#list}}
<div class="material-item">
<img class="lazy" data-original="{{img}}" alt="">
<p class="material-desc">
{{desc}}
</p>
</div>
{{/list}}
</div>
</div>
{{/materials}}
{{#washTips}}
<div class="wash-tips page-block">
<div class="detail table clearfix">
{{#list}}
<div class="tip">
<img src="{{img}}" alt="">
<span class="caption">{{caption}}</span>
</div>
{{/list}}
</div>
</div>
{{/washTips}}
{{#productDetail}}
<div class="product-detail page-block">
<h1 class="title">
{{{title}}}
<span class="en-title">{{{enTitle}}}</span>
</h1>
<div class="detail">
<p>{{{desc}}}</p>
{{#list}}
<img class="lazy" data-original="{{img}}" alt="">
{{/list}}
</div>
</div>
{{/productDetail}}
\ No newline at end of file
... ... @@ -32,7 +32,7 @@ class HomeController extends AbstractAction
if (!$uid && $action !== 'index') {
$this->go(Helpers::url('/signin.html'));
}
parent::init();
}
... ... @@ -51,12 +51,12 @@ class HomeController extends AbstractAction
);
$uid = $this->getUid();
if ($uid) {
// 优选新品数据
$channel = Helpers::getChannelByCookie();
$data['isLogin'] = true;
$data += UserModel::getUserProfileData($uid);
$data += UserModel::getInfoNumData($uid);
// 优选新品数据
$channel = Helpers::getChannelByCookie();
$data['recommendForYou'] = UserModel::getPreferenceData($channel);
}
... ... @@ -84,9 +84,9 @@ class HomeController extends AbstractAction
'pageFooter' => true,
'favorite' => true,
'hasFavProduct' => $favProducts,
'productUrl' => '/product/new',
'productUrl' => '/product/new',
'hasFavBrand' => $favBrands,
'brandUrl' => '/product/new'
'brandUrl' => '/product/new'
);
// 判断是否为品牌收藏页
if ($tab === 'brand') {
... ... @@ -143,10 +143,10 @@ class HomeController extends AbstractAction
/**
* 个人信息
*/
public function personalDetailsAction()
public function mydetailsAction()
{
$this->setTitle('个人信息');
$this->setNavHeader('个人信息', true, SITE_MAIN);
$this->setNavHeader('个人信息');
$uid = $this->getUid();
$data = UserModel::getUserProfileData($uid);
... ... @@ -177,7 +177,7 @@ class HomeController extends AbstractAction
{
$this->setTitle('优惠券');
$this->setNavHeader('优惠券');
$uid = $this->getUid();
$coupons = array(
'couponsUrl' => UserModel::getCouponData($uid),
... ... @@ -188,16 +188,16 @@ class HomeController extends AbstractAction
/**
* 我的消息
*
* 暂时使用老的，因后面APP、PC、WAP会进行一次改版
*/
public function messageAction()
{
$uid = $this->getUid();
$page = $this->get('page', 0);
$size = $this->get('size', 10);
$messages = UserModel::getMessageData($uid, $page, $size);
print_r($messages);
// $uid = $this->getUid();
// $page = $this->get('page', 0);
// $size = $this->get('size', 10);
//
// $messages = UserModel::getMessageData($uid, $page, $size);
}
/**
... ... @@ -289,7 +289,9 @@ class HomeController extends AbstractAction
}
}
//在线客服
/**
* 在线客服
*/
public function onlineServiceAction()
{
// 设置网站标题
... ... @@ -305,7 +307,9 @@ class HomeController extends AbstractAction
));
}
//在线客服-具体详情
/**
* 在线客服-具体详情
*/
public function onlineServiceDetailAction()
{
$service = array();
... ... @@ -322,7 +326,7 @@ class HomeController extends AbstractAction
/**
* 我的逛
*/
public function myGuangAction()
public function myguangAction()
{
$page = $this->get('page', 1);
$limit = $this->get('limit', 10);
... ... @@ -331,7 +335,6 @@ class HomeController extends AbstractAction
$yh_channel = Helpers::getChannelByCookie();
$guangInfo = \Home\GuangModel::getMyGuang($uid, $page, $yh_channel, $gender, $limit);
$totalPage = $guangInfo['totalPage'];
unset($guangInfo['totalPage']);
if ($page == 1) {
$this->setTitle('我收藏的');
$this->setNavHeader('我收藏的', true, '');
... ... @@ -385,7 +388,7 @@ class HomeController extends AbstractAction
'pageFooter' => true
);
$this->_view->display('suggest_sub', $data);
$this->_view->display('suggest-sub', $data);
}
/**
... ... @@ -445,6 +448,7 @@ class HomeController extends AbstractAction
$uid = $this->getUid();
$data = GradeModel::getGrade($gender, $channel, $uid);
$data['pageFooter'] = true;
$this->_view->display('vip-grade', $data);
}
... ... @@ -462,7 +466,7 @@ class HomeController extends AbstractAction
$uid = $this->getUid();
$data = GradeModel::getPreferential($channel, $uid);
$data['pageFooter'] = true;
$this->_view->display('privilege', $data);
}
... ... @@ -489,7 +493,9 @@ class HomeController extends AbstractAction
));
}
//ajax请求订单页面
/**
* ajax请求订单页面
*/
public function getOrdersAction()
{
//判断是不是ajax请求
... ... @@ -527,10 +533,8 @@ class HomeController extends AbstractAction
/*
* 我的订单-取消订单
*/
public function cancelOrderAction()
{
//判断是不是ajax请求
if (!$this->isAjax()) {
$this->error();
... ... @@ -549,7 +553,6 @@ class HomeController extends AbstractAction
/*
* 我的订单-删除订单
*/
public function delOrderAction()
{
//判断是不是ajax请求
... ... @@ -570,7 +573,6 @@ class HomeController extends AbstractAction
/*
* 我的订单-支付链接获取
*/
private function paymentAction()
{
$gender = Helpers::getGenderByCookie();
... ... @@ -581,7 +583,6 @@ class HomeController extends AbstractAction
/*
* 我的订单-随便逛逛链接获取
*/
private function strollAction()
{
//获取性别、频道数据
... ...
... ... @@ -201,14 +201,16 @@ class DetailModel
'title' => '商品信息',
'enTitle' => 'PRODUCT INFO',
'detail' => array(
array('param' => '编号：' . $sizeInfo['productDescBo']['erpProductId']),
array('param' => '颜色：' . $sizeInfo['productDescBo']['colorName']),
'list' => array(
array('param' => '编号：' . $sizeInfo['productDescBo']['erpProductId']),
array('param' => '颜色：' . $sizeInfo['productDescBo']['colorName']),
)
),
);
}
if (!empty($sizeInfo['productDescBo']['standardBos'])) {
foreach ($sizeInfo['productDescBo']['standardBos'] as $value) {
$result['goodsDescription']['detail'][] = $value['standardName'] . '：' . $value['standardVal'];
$result['goodsDescription']['detail']['list'][] = array('param' => $value['standardName'] . '：' . $value['standardVal']);
}
}
if (isset($sizeInfo['phrase'])) {
... ... @@ -216,28 +218,28 @@ class DetailModel
}
// 尺码信息
if (!empty($sizeInfo['productIntroBo']['sizeInfoBo'])) {
if (!empty($sizeInfo['sizeInfoBo'])) {
$result['sizeInfo'] = array(
'title' => '尺码信息',
'enTitle' => 'SIZE INFO',
'detail' => array('list' => array()),
);
$sizeNameList = array(0 => array('param' => '吊牌尺码') ); // 尺码名称
$sizeNameList = array(0 => array('param' => '吊牌尺码')) ; // 尺码名称
$sizeBoGroup = array(); // 尺码按ID分组
foreach ($sizeInfo['productIntroBo']['sizeInfoBo']['sizeAttributeBos'] as $attr) {
$sizeBoGroup[ $attr['id'] ][0] = array('param' => $value['attributeName']);
foreach ($sizeInfo['sizeInfoBo']['sizeAttributeBos'] as $attr) {
$sizeBoGroup[ $attr['id'] ][0] = array('param' => $attr['attributeName']);
}
foreach ($sizeInfo['productIntroBo']['sizeInfoBo']['sizeBoList'] as $value) {
foreach ($sizeInfo['sizeInfoBo']['sizeBoList'] as $value) {
$sizeNameList[] = array('param' => $value['sizeName']);
foreach ($value['sortAttributes'] as $attr) {
$sizeBoGroup[ $attr['id'] ][] = array('param' => $attr['sizeValue']);
$sizeNameList[] = array('param' => $value['sizeName']);
}
}
// 根据模板页面的显示，按表格一列一列来显示
$result['detail']['list'][0] = $sizeNameList;
$result['sizeInfo']['detail']['list'][0]['params'] = $sizeNameList;
foreach ($sizeBoGroup as $value) {
$result['detail']['list'][] = $value;
$result['sizeInfo']['detail']['list'][]['params'] = $value;
}
}
... ... @@ -250,28 +252,28 @@ class DetailModel
);
}
// 模特试穿
// 模特试穿, 竖着输出排列显示
if (!empty($sizeInfo['modelBos'])) {
$result['reference'] = array(
'title' => '模特试穿',
'enTitle' => 'REFERENCE',
'detail' => array('list' => array()),
);
$result['reference']['detail']['list'][0] = array(0 => array('param' => '')); // 头像列表
$result['reference']['detail']['list'][1] = array(0 => array('param' => '模特')); // 模特名字列表
$result['reference']['detail']['list'][2] = array(0 => array('param' => '身高')); // 身高列表
$result['reference']['detail']['list'][3] = array(0 => array('param' => '体重')); // 体重列表
$result['reference']['detail']['list'][4] = array(0 => array('param' => '三围')); // 三围列表
$result['reference']['detail']['list'][5] = array(0 => array('param' => '吊牌尺码')); // 吊牌尺码
$result['reference']['detail']['list'][6] = array(0 => array('param' => '试穿描述')); // 试穿描述
$result['reference']['detail']['list'][0]['params'] = array(0 => array('param' => '')); // 头像列表
$result['reference']['detail']['list'][1]['params'] = array(0 => array('param' => '模特')); // 模特名字列表
$result['reference']['detail']['list'][2]['params'] = array(0 => array('param' => '身高')); // 身高列表
$result['reference']['detail']['list'][3]['params'] = array(0 => array('param' => '体重')); // 体重列表
$result['reference']['detail']['list'][4]['params'] = array(0 => array('param' => '三围')); // 三围列表
$result['reference']['detail']['list'][5]['params'] = array(0 => array('param' => '吊牌尺码')); // 吊牌尺码
$result['reference']['detail']['list'][6]['params'] = array(0 => array('param' => '试穿描述')); // 试穿描述
foreach ($sizeInfo['modelBos'] as $value) {
$result['reference']['detail']['list'][0][] = array('param' => $value['avatar']);
$result['reference']['detail']['list'][1][] = array('param' => $value['modelName']);
$result['reference']['detail']['list'][2][] = array('param' => $value['height']);
$result['reference']['detail']['list'][3][] = array('param' => $value['weight']);
$result['reference']['detail']['list'][4][] = array('param' => $value['vitalStatistics']);
$result['reference']['detail']['list'][5][] = array('param' => $value['fitModelBo']['fit_size']);
$result['reference']['detail']['list'][6][] = array('param' => $value['fitModelBo']['feel']);
$result['reference']['detail']['list'][0]['params'][] = array('param' => $value['avatar']);
$result['reference']['detail']['list'][1]['params'][] = array('param' => $value['modelName']);
$result['reference']['detail']['list'][2]['params'][] = array('param' => $value['height']);
$result['reference']['detail']['list'][3]['params'][] = array('param' => $value['weight']);
$result['reference']['detail']['list'][4]['params'][] = array('param' => $value['vitalStatistics']);
$result['reference']['detail']['list'][5]['params'][] = array('param' => $value['fitModelBo']['fit_size']);
$result['reference']['detail']['list'][6]['params'][] = array('param' => $value['fitModelBo']['feel']);
}
}
... ... @@ -316,7 +318,7 @@ class DetailModel
}
}
return $result;
}
... ...
... ... @@ -49,10 +49,11 @@ class DetailController extends AbstractAction
public function introAction()
{
$productSkn = $this->param('productSkn');
$productSkn = 50027562;
if (!is_numeric($productSkn)) {
$this->error();
}
$data = \Product\DetailModel::getSizeInfo($productSkn);
$data = \Product\DetailModel::getSizeInfo($productSkn);
if (array() === $data) {
echo ' ';
exit();
... ...