fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by hf
Commit d5992f61c4312f2d692ae9802e60f7a2a08e5079 2 parents 626957b3 6ee29688

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

Inline Side-by-side
Showing 5 changed files with 6 additions and 5 deletions
@@ -66,7 +66,8 @@ $consultForm.on('submit', function() { @@ -66,7 +66,8 @@ $consultForm.on('submit', function() {
66 isSubmiting = false; 66 isSubmiting = false;
67 loading.hideLoadingMask(); 67 loading.hideLoadingMask();
68 } else { 68 } else {
69 - window.history.go(-1); 69 + tip.show('提交成功~');
  70 + setTimeout(window.history.go(-1), 3000);
70 } 71 }
71 }).fail(function() { 72 }).fail(function() {
72 tip.show('网络出了点问题~'); 73 tip.show('网络出了点问题~');
@@ -42,7 +42,6 @@ $basicBtnC:#eb0313; @@ -42,7 +42,6 @@ $basicBtnC:#eb0313;
42 box-sizing: border-box; 42 box-sizing: border-box;
43 //padding: pxToRem(20px) pxToRem(12px); 43 //padding: pxToRem(20px) pxToRem(12px);
44 padding: 4% 3%; 44 padding: 4% 3%;
45 - height:pxToRem(50px);  
46 //width: 50%; 45 //width: 50%;
47 border-bottom: pxToRem(4px) solid #fff; 46 border-bottom: pxToRem(4px) solid #fff;
48 border-right: pxToRem(4px) solid #fff; 47 border-right: pxToRem(4px) solid #fff;
1 {{> layout/header}} 1 {{> layout/header}}
2 -<div class="consult-form-page"> 2 +<div class="consult-form-page yoho-page">
3 <form class="consult-form" url="{{formUrl}}"> 3 <form class="consult-form" url="{{formUrl}}">
4 <textarea id="content" name="content">请输入咨询内容</textarea> 4 <textarea id="content" name="content">请输入咨询内容</textarea>
5 <input type="hidden" id="product_id" value="{{productId}}"> 5 <input type="hidden" id="product_id" value="{{productId}}">
@@ -137,7 +137,8 @@ class HomeController extends AbstractAction @@ -137,7 +137,8 @@ class HomeController extends AbstractAction
137 if ($this->isAjax()) { 137 if ($this->isAjax()) {
138 $uid = $this->getUid(true); 138 $uid = $this->getUid(true);
139 $page = $this->post('page', 1); 139 $page = $this->post('page', 1);
140 - $result = UserModel::getFavBrandData($uid, 10, $page, 10); 140 + $gender = Helpers::getGenderByCookie();
  141 + $result = UserModel::getFavBrandData($uid, $gender, $page, 10);
141 } 142 }
142 143
143 if (empty($result)) { 144 if (empty($result)) {
@@ -248,7 +248,7 @@ class UserModel @@ -248,7 +248,7 @@ class UserModel
248 $product = array(); 248 $product = array();
249 foreach ($val['new_product'] as $one) { 249 foreach ($val['new_product'] as $one) {
250 $product = array(); 250 $product = array();
251 - $product['link'] = isset($val['goodsList'][0]) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsList'][0]['id'] . '/' . $val['cnAlphabet'] . '.html') : ''; 251 + $product['link'] = isset($one['goods'][0]) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : '';
252 $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : ''; 252 $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
253 $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0; 253 $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
254 $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0; 254 $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0;