fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by whb
Commit 73544d744c51496711899cd0c51445b9a482fbac 2 parents 76c286f2 b0b1f23d

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

Inline Side-by-side
Showing 5 changed files with 46 additions and 83 deletions
@@ -1157,7 +1157,6 @@ class HelperSearch @@ -1157,7 +1157,6 @@ class HelperSearch
1157 'activities_id_desc' => 'activities.activity_id:desc', 1157 'activities_id_desc' => 'activities.activity_id:desc',
1158 'activities_id_asc' => 'activities.activity_id:asc', 1158 'activities_id_asc' => 'activities.activity_id:asc',
1159 ); 1159 );
1160 -  
1161 $param = array(); 1160 $param = array();
1162 $param['status'] = 1; // 是否上架，1表示在架，2表示不在 1161 $param['status'] = 1; // 是否上架，1表示在架，2表示不在
1163 $param['sales'] = 'Y'; // 只搜索销售的产品 1162 $param['sales'] = 'Y'; // 只搜索销售的产品
@@ -1182,7 +1181,6 @@ class HelperSearch @@ -1182,7 +1181,6 @@ class HelperSearch
1182 if (!empty($condition)) { 1181 if (!empty($condition)) {
1183 $param += $condition; 1182 $param += $condition;
1184 } 1183 }
1185 -  
1186 return Yohobuy::httpBuildQuery(self::getUrl(), $param); 1184 return Yohobuy::httpBuildQuery(self::getUrl(), $param);
1187 } 1185 }
1188 1186
@@ -1218,8 +1216,8 @@ class HelperSearch @@ -1218,8 +1216,8 @@ class HelperSearch
1218 } 1216 }
1219 1217
1220 /** 1218 /**
1221 - * 并行调接口url获取(获取品牌数据)  
1222 - */ 1219 + * 并行调接口url获取(获取品牌数据)
  1220 + */
1223 public static function getBrandUrl($customOptions = array()) 1221 public static function getBrandUrl($customOptions = array())
1224 { 1222 {
1225 // 构建必传参数 1223 // 构建必传参数
@@ -1312,8 +1310,8 @@ class HelperSearch @@ -1312,8 +1310,8 @@ class HelperSearch
1312 elseif ($type == 'shop') { 1310 elseif ($type == 'shop') {
1313 return 'http://101.200.31.165/yohosearch/shops.json'; 1311 return 'http://101.200.31.165/yohosearch/shops.json';
1314 } 1312 }
1315 - return 'http://101.200.31.165/yohosearch/search.json';  
1316 -// return 'http://192.168.10.64:8080/yohosearch/search-once.json'; 1313 +// return 'http://101.200.31.165/yohosearch/search.json';
  1314 + return 'http://192.168.10.64:8080/yohosearch/search-once.json';
1317 } 1315 }
1318 } 1316 }
1319 1317
@@ -28,9 +28,6 @@ var $chosePanel = $('#chose-panel'), @@ -28,9 +28,6 @@ var $chosePanel = $('#chose-panel'),
28 $sizeRowList, 28 $sizeRowList,
29 $curColorBlock, 29 $curColorBlock,
30 $colorRowList, 30 $colorRowList,
31 - $curSizeRow,  
32 - $curColorRow,  
33 - rowIndex,  
34 cbFn, 31 cbFn,
35 $allChoseItems, 32 $allChoseItems,
36 queryString, 33 queryString,
@@ -48,9 +45,6 @@ function init() { @@ -48,9 +45,6 @@ function init() {
48 $sizeRowList = $('.size-list ul'); 45 $sizeRowList = $('.size-list ul');
49 $colorRowList = $('.color-list ul'); 46 $colorRowList = $('.color-list ul');
50 $leftNum = $('#left-num'); 47 $leftNum = $('#left-num');
51 - $curSizeRow = $sizeRowList.eq(0);  
52 - $curColorRow = $colorRowList.eq(0);  
53 - rowIndex = 0;  
54 curColorIndex = 0; 48 curColorIndex = 0;
55 curSizeIndex = 0; 49 curSizeIndex = 0;
56 } 50 }
@@ -138,6 +132,28 @@ function displayGoodNum(curGoodNum) { @@ -138,6 +132,28 @@ function displayGoodNum(curGoodNum) {
138 } 132 }
139 } 133 }
140 134
  135 +//老的选中尺码去掉勾选,新的选中尺码加上勾选
  136 +function changeSizeChosed(oldSizeIndex) {
  137 + if (curColorIndex && $curSizeBlock && $curSizeBlock.length > 0) {
  138 + $curSizeBlock.removeClass('chosed');
  139 + $curSizeBlock = $($sizeRowList.eq(oldSizeIndex).children().get(curColorIndex - 1));
  140 + $curSizeBlock.addClass('chosed');
  141 + return $curSizeBlock.data('num');
  142 + }
  143 + return 0;
  144 +}
  145 +
  146 +//老的选中颜色去掉勾选,新的选中颜色加上勾选
  147 +function changeColorChosed(oldColorIndex) {
  148 + if (curSizeIndex && $curColorBlock && $curColorBlock.length > 0) {
  149 + $curColorBlock.removeClass('chosed');
  150 + $curColorBlock = $($colorRowList.eq(oldColorIndex).children().get(curSizeIndex - 1));
  151 + $curColorBlock.addClass('chosed');
  152 + return $curColorBlock.data('num');
  153 + }
  154 + return 0;
  155 +}
  156 +
141 init(); 157 init();
142 158
143 $yohoPage.on('touchstart', '.chose-panel', function(e) { 159 $yohoPage.on('touchstart', '.chose-panel', function(e) {
@@ -153,13 +169,9 @@ $yohoPage.on('touchstart', '.chose-panel', function(e) { @@ -153,13 +169,9 @@ $yohoPage.on('touchstart', '.chose-panel', function(e) {
153 169
154 $yohoPage.on('touchstart', '.color-list .block', function() { 170 $yohoPage.on('touchstart', '.color-list .block', function() {
155 var $this = $(this), 171 var $this = $(this),
156 - index,  
157 - curSizeBlock, 172 + index = $this.index(),
158 curGoodNum; 173 curGoodNum;
159 174
160 - $this.siblings('.chosed').removeClass('chosed');  
161 - index = $this.index();  
162 -  
163 // 当前颜色已经是选中状态,再点击时 175 // 当前颜色已经是选中状态,再点击时
164 if ($this.hasClass('chosed')) { 176 if ($this.hasClass('chosed')) {
165 177
@@ -176,38 +188,15 @@ $yohoPage.on('touchstart', '.color-list .block', function() { @@ -176,38 +188,15 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
176 188
177 curSizeIndex = 0; 189 curSizeIndex = 0;
178 190
179 - //如果尺码已经是选择状态  
180 - if (curColorIndex) {  
181 -  
182 - // 之前选中的尺码去掉勾选样式,新尺码块勾选  
183 - if ($curSizeBlock && $curSizeBlock.length > 0) {  
184 - $curSizeBlock.removeClass('chosed');  
185 - curSizeBlock = $sizeRowList.eq(0).children().get(curColorIndex - 1);  
186 - $curSizeBlock = $(curSizeBlock);  
187 - curGoodNum = $curSizeBlock.data('num');  
188 - $curSizeBlock.addClass('chosed');  
189 - }  
190 - } 191 + //老的选中尺码去掉勾选,新的选中尺码加上勾选
  192 + changeSizeChosed(0);
191 193
192 // 当前颜色不是选中状态,选中时 194 // 当前颜色不是选中状态,选中时
193 } else { 195 } else {
194 hasChooseColor = true; 196 hasChooseColor = true;
195 197
196 - //如果尺码已经是选择状态  
197 - if (curColorIndex) {  
198 -  
199 - // 之前选中的尺码去掉勾选样式,新尺码块勾选  
200 - if ($curSizeBlock && $curSizeBlock.length > 0) {  
201 - $curSizeBlock.removeClass('chosed');  
202 -  
203 - //curSizeBlock = $sizeRowList.eq(curSizeIndex + 1).children().get(curColorIndex - 1);  
204 - curSizeBlock = $sizeRowList.eq(index + 1).children().get(curColorIndex - 1);  
205 - $curSizeBlock = $(curSizeBlock);  
206 - curGoodNum = $curSizeBlock.data('num');  
207 - $curSizeBlock.addClass('chosed');  
208 - }  
209 -  
210 - } 198 + //老的选中尺码去掉勾选,新的选中尺码加上勾选
  199 + curGoodNum = changeSizeChosed(index + 1);
211 200
212 // 显示剩余数量 201 // 显示剩余数量
213 displayGoodNum(curGoodNum); 202 displayGoodNum(curGoodNum);
@@ -225,7 +214,8 @@ $yohoPage.on('touchstart', '.color-list .block', function() { @@ -225,7 +214,8 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
225 $imgsThumb.addClass('hide').eq(index).removeClass('hide'); 214 $imgsThumb.addClass('hide').eq(index).removeClass('hide');
226 } 215 }
227 216
228 - // 当前颜色块 切换勾选样式 217 + // 颜色块切换勾选样式
  218 + $this.siblings('.chosed').removeClass('chosed');
229 $this.toggleClass('chosed'); 219 $this.toggleClass('chosed');
230 $('#good-num').val(1); 220 $('#good-num').val(1);
231 221
@@ -233,13 +223,9 @@ $yohoPage.on('touchstart', '.color-list .block', function() { @@ -233,13 +223,9 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
233 updateConformButtonClassAndText(); 223 updateConformButtonClassAndText();
234 }).on('touchstart', '.size-list .block', function() { 224 }).on('touchstart', '.size-list .block', function() {
235 var $this = $(this), 225 var $this = $(this),
236 - index,  
237 - curColorBlock, 226 + index = $this.index(),
238 curGoodNum; 227 curGoodNum;
239 228
240 - $this.siblings('.chosed').removeClass('chosed');  
241 - index = $this.index();  
242 -  
243 // 当前尺码已经是选中状态,再点击时 229 // 当前尺码已经是选中状态,再点击时
244 if ($this.hasClass('chosed')) { 230 if ($this.hasClass('chosed')) {
245 231
@@ -256,35 +242,15 @@ $yohoPage.on('touchstart', '.color-list .block', function() { @@ -256,35 +242,15 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
256 242
257 curColorIndex = 0; 243 curColorIndex = 0;
258 244
259 - //如果颜色已经是选择状态  
260 - if (curSizeIndex) {  
261 -  
262 - // 之前选中的颜色去掉勾选样式,新颜色块勾选  
263 - if ($curColorBlock && $curColorBlock.length > 0) {  
264 - $curColorBlock.removeClass('chosed');  
265 - curColorBlock = $colorRowList.eq(0).children().get(curSizeIndex - 1);  
266 - $curColorBlock = $(curColorBlock);  
267 - curGoodNum = $curColorBlock.data('num');  
268 - $curColorBlock.addClass('chosed');  
269 - }  
270 - } 245 + //老的选中颜色去掉勾选,新的选中颜色加上勾选
  246 + changeColorChosed(0);
271 247
272 // 当前尺码不是选中状态,选中时 248 // 当前尺码不是选中状态,选中时
273 } else { 249 } else {
274 hasChooseSize = true; 250 hasChooseSize = true;
275 251
276 - //如果颜色已经是选择状态  
277 - if (curSizeIndex) {  
278 -  
279 - // 之前选中的颜色去掉勾选样式,新颜色块勾选  
280 - if ($curColorBlock && $curColorBlock.length > 0) {  
281 - $curColorBlock.removeClass('chosed');  
282 - curColorBlock = $colorRowList.eq(index + 1).children().get(curSizeIndex - 1);  
283 - $curColorBlock = $(curColorBlock);  
284 - curGoodNum = $curColorBlock.data('num');  
285 - $curColorBlock.addClass('chosed');  
286 - }  
287 - } 252 + //老的选中颜色去掉勾选,新的选中颜色加上勾选
  253 + curGoodNum = changeColorChosed(index + 1);
288 254
289 // 显示剩余数量 255 // 显示剩余数量
290 displayGoodNum(curGoodNum); 256 displayGoodNum(curGoodNum);
@@ -299,6 +265,8 @@ $yohoPage.on('touchstart', '.color-list .block', function() { @@ -299,6 +265,8 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
299 $curSizeBlock = $this; 265 $curSizeBlock = $this;
300 } 266 }
301 267
  268 + // 颜色块切换勾选样式
  269 + $this.siblings('.chosed').removeClass('chosed');
302 $this.toggleClass('chosed'); 270 $this.toggleClass('chosed');
303 $('#good-num').val(1); 271 $('#good-num').val(1);
304 272
@@ -110,7 +110,7 @@ class SearchModel @@ -110,7 +110,7 @@ class SearchModel
110 ); 110 );
111 //接收高级选项 111 //接收高级选项
112 foreach ($_GET as $key =>$val) { 112 foreach ($_GET as $key =>$val) {
113 - if (strpos('parameter_',$key) !== false) { 113 + if (strpos($key, 'parameter_') !== false) {
114 $condition[$key] = (int) $val; 114 $condition[$key] = (int) $val;
115 } 115 }
116 } 116 }
@@ -129,7 +129,6 @@ class SearchModel @@ -129,7 +129,6 @@ class SearchModel
129 $data['condition'] = $condition; 129 $data['condition'] = $condition;
130 $data['sortCondition'] = $sortCondition; 130 $data['sortCondition'] = $sortCondition;
131 $data['options'] = $options; 131 $data['options'] = $options;
132 -  
133 return $data; 132 return $data;
134 } 133 }
135 134
@@ -221,7 +220,7 @@ class SearchModel @@ -221,7 +220,7 @@ class SearchModel
221 $data .= '<li><a style="display: block;" href="http://search.yohobuy.com/?query='.$v['item'].'" class="clearfix clear search-item" title="'.$v['item'].'" act="http://search.yohobuy.com/?query='.$v['item'].'"><span class="searchvalue" >'.$v['item'].'</span><span class="valuenum">约'.$v['frequency'].'个商品</span></a></li>'; 220 $data .= '<li><a style="display: block;" href="http://search.yohobuy.com/?query='.$v['item'].'" class="clearfix clear search-item" title="'.$v['item'].'" act="http://search.yohobuy.com/?query='.$v['item'].'"><span class="searchvalue" >'.$v['item'].'</span><span class="valuenum">约'.$v['frequency'].'个商品</span></a></li>';
222 } 221 }
223 } 222 }
224 - echo $data; 223 + return $data;
225 } 224 }
226 225
227 /** 226 /**
@@ -49,10 +49,7 @@ class ListController extends WebAction @@ -49,10 +49,7 @@ class ListController extends WebAction
49 */ 49 */
50 public function saleAction() 50 public function saleAction()
51 { 51 {
52 - //排序  
53 - $condition['order'] = 's_n_desc';  
54 - //打折  
55 - $condition['p_d'] = '0,0.9'; 52 + $condition = array();
56 $list = SearchModel::getListData($condition); 53 $list = SearchModel::getListData($condition);
57 $data = array( 54 $data = array(
58 //初始化js 55 //初始化js
@@ -21,11 +21,13 @@ class SearchController extends WebAction @@ -21,11 +21,13 @@ class SearchController extends WebAction
21 */ 21 */
22 public function suggestAction() 22 public function suggestAction()
23 { 23 {
  24 + $suggest = '';
24 $query = rawurldecode($this->get('query')); 25 $query = rawurldecode($this->get('query'));
25 if ($query) { 26 if ($query) {
26 $param['query'] = $query; 27 $param['query'] = $query;
27 - SearchModel::getSuggest($param); 28 + $suggest = SearchModel::getSuggest($param);
28 } 29 }
  30 + echo $suggest;
29 } 31 }
30 32
31 /** 33 /**
@@ -35,7 +37,6 @@ class SearchController extends WebAction @@ -35,7 +37,6 @@ class SearchController extends WebAction
35 { 37 {
36 $condition['msort'] = $this->get('msort'); 38 $condition['msort'] = $this->get('msort');
37 $size = SearchModel::getSortSize($condition); 39 $size = SearchModel::getSortSize($condition);
38 - print_r($size); exit;  
39 $this->echoJson($size); 40 $this->echoJson($size);
40 } 41 }
41 } 42 }