Merge branch 'master' into develop

feat/task1-c-wallet
gongfuxiang 2018-12-31 12:23:14 +08:00
commit 3fb88327d8
2 changed files with 8 additions and 2 deletions

View File

@ -186,7 +186,7 @@ $(function()
html += '<a href="'+result.data.data[i]['goods_url']+'" target="_blank">';
html += '<p class="title fl">'+result.data.data[i]['title']+'</p>';
html += '</a>';
html += '<p class="price fl"><b>¥</b><strong>'+result.data.data[i]['price']+'</strong></p>';
html += '<p class="price fl"><b>¥</b><strong>'+result.data.data[i]['min_price']+'</strong></p>';
html += '<p class="number fl">销量<span>'+result.data.data[i]['sales_count']+'</span></p>';
html += '</div></li>';

View File

@ -10,5 +10,11 @@
// +----------------------------------------------------------------------
// 首页
Route::get('/', 'index/index');
// Route::get('/', 'index/index');
// // 商品详情
// Route::get('goods-:id', 'index/goods/index');
// // 搜索
// Route::get('search-:category_id', 'index/search/index');
?>