controller/main.js修改

Summary: controller/main.js修改

Test Plan: to see code

Reviewers: yls, wdw

Reviewed By: wdw

Subscribers: qc

Differential Revision: http://192.168.6.4/D216
修改样式

Test Plan: 1.32

Reviewers: ryl, ljlong

Reviewed By: ljlong

Subscribers: qc

Differential Revision: http://192.168.6.4/D200
修改bug

Test Plan: 1.32

Reviewers: ryl, ljlong

Reviewed By: ljlong

Subscribers: qc

Differential Revision: http://192.168.6.4/D201
修改 前面对城市残损修改冲突引起得误删代码

Summary: 修改 前面对城市残损修改冲突引起得误删代码

Test Plan: 1.3.2

Reviewers: wwb, zz, ryl, wdw, sbin

Reviewed By: sbin

Subscribers: qc

Differential Revision: http://192.168.6.4/D218
店铺设置中增加“是否显示购买过的商品”

Summary:

Test Plan: 1.4

Reviewers: ryl, ljlong

Reviewed By: ljlong

Subscribers: qc

Differential Revision: http://192.168.6.4/D201
Description： CLONE - 创建者可以修改绑定到店铺的优惠券的绑定信息 author: ryl Bug ID: MJS-1650 Release：1.4

Summary: 	CLONE - 创建者可以修改绑定到店铺的优惠券的绑定信息 author: ryl Bug ID: MJS-1650 Release：1.4

Test Plan: 	have a look

Reviewers: yls, wwb, qc, wdw, zz, sbin, ljlong

Reviewed By: ljlong

Subscribers: qc

Differential Revision: http://192.168.6.4/D235
【全局后台】在订单管理将订单转为问题订单后，订单列表会刷新，显示空列表

Test Plan: 1.32

Reviewers: ljlong

Reviewed By: ljlong

Subscribers: qc

Differential Revision: http://192.168.6.4/D246
商家端自适用手机/桌面配置框架修改

Summary: 商家端自适用手机/桌面配置框架修改

Test Plan: to see local demo

Reviewers: ljlong

Reviewed By: ljlong

Subscribers: qc

Differential Revision: http://192.168.6.4/D256
seller端最后一次添加更新

Summary: seller端最后一次添加更新

Test Plan: view code

Reviewers: wwb, wdw, ryl, yls, sbin

Reviewed By: sbin

Subscribers: qc

Differential Revision: http://192.168.6.4/D270
同一商品模板自定义分类重复添加后，重复出现BUG

Summary: 同一商品模板自定义分类重复添加后，重复出现BUG

Test Plan: view code

Reviewers: wwb, wdw, ryl, yls, sbin

Reviewed By: sbin

Subscribers: qc

Differential Revision: http://192.168.6.4/D271
用户导出数据传参数加上城市

Test Plan: 1.32

Reviewers: ljlong, wwb, ryl

Reviewed By: ryl

Subscribers: qc

Differential Revision: http://192.168.6.4/D276
为商家端'历史订单'部分增加新文件。

Summary:
1. 修改app/base/Global.js里多余的逗号，否则sencha build报warning.
2. 为商家端'历史订单'部分增加view, model和store.

Test Plan: 暂时搁置

Reviewers: ljlong, wwb

Reviewed By: wwb

Subscribers: qc

Differential Revision: http://192.168.6.4/D282
参数字母大小写修改

Test Plan: 1.32

Reviewers: ljlong

Reviewed By: ljlong

Subscribers: qc

Differential Revision: http://192.168.6.4/D285
【全局后台】【订单中心】在订单总览直接选择指定用户时，上传文件按钮会仍处于不可点击状态

Test Plan: 1.32

Reviewers: ryl

Reviewed By: ryl

Subscribers: qc

Differential Revision: http://192.168.6.4/D291
活动管理