fix bug
搭配添加商品不能重复
Merge branch 'master' into ims
修改订单列表和订单详情 颜色和尺码的显示颜色加深
Merge branch 'ims' of github.com:victorgong/intime into ims
Merge branch 'master' into ims
商品搜索
Merge branch 'ims' of github.com:victorgong/intime into ims
减小了两位
调整大小
增加用户首页
商品为空时无法添加商品bug
Merge branch 'ims' of github.com:victorgong/intime into ims
上传商品时，不提交商品数据
去掉binding.pry
修改下订单float价格bug
卡号修改order
Merge branch 'master' of github.com:victorgong/intime