merge from develop
Showing
63 changed files
with
3833 additions
and
252 deletions
Too many changes to show.
To preserve performance only 63 of 63+ files are displayed.
apps/activity/controllers/coupon.js
0 → 100644
apps/activity/controllers/wechat.js
0 → 100644
apps/activity/index.js
0 → 100644
apps/activity/models/coupon.js
0 → 100644
apps/activity/models/wechat.js
0 → 100644
apps/activity/router.js
0 → 100644
apps/activity/views/action/coupon.hbs
0 → 100644
apps/guang/controllers/star.js
0 → 100644
apps/guang/index.js
0 → 100644
apps/guang/models/star.js
0 → 100644
apps/guang/router.js
0 → 100644
apps/guang/views/action/star/collocation.hbs
0 → 100644
apps/guang/views/action/star/detail.hbs
0 → 100644
apps/guang/views/action/star/index-html.hbs
0 → 100644
apps/guang/views/action/star/index.hbs
0 → 100644
apps/guang/views/action/star/list.hbs
0 → 100644
apps/guang/views/action/star/special.hbs
0 → 100644
apps/guang/views/partial/star/head-tab.hbs
0 → 100644
apps/guang/views/partial/star/index-html.hbs
0 → 100644
apps/guang/views/partial/star/list.hbs
0 → 100644
apps/passport/auth.js
0 → 100644
apps/passport/controllers/back.js
0 → 100644
apps/passport/controllers/bind.js
0 → 100644
apps/passport/controllers/login.js
0 → 100644
apps/passport/controllers/reg.js
0 → 100644
apps/passport/index.js
0 → 100644
apps/passport/models/auth-helper.js
0 → 100644
apps/passport/models/back-api.js
0 → 100644
apps/passport/models/back-service.js
0 → 100644
apps/passport/models/bind-service.js
0 → 100644
apps/passport/models/passport-alipay.js
0 → 100644
apps/passport/models/reg-service.js
0 → 100644
apps/passport/router.js
0 → 100644
apps/passport/views/action/back/email.hbs
0 → 100644
apps/passport/views/action/back/mobile.hbs
0 → 100644
apps/passport/views/action/bind/code.hbs
0 → 100644
apps/passport/views/action/bind/index.hbs
0 → 100644
apps/passport/views/action/bind/password.hbs
0 → 100644
apps/passport/views/action/bind/success.hbs
0 → 100644
apps/passport/views/action/login.hbs
0 → 100644
apps/passport/views/action/reg/code.hbs
0 → 100644
apps/passport/views/action/reg/index.hbs
0 → 100644
apps/passport/views/action/reg/password.hbs
0 → 100644
apps/product/controllers/outlet.js
0 → 100644
apps/product/models/outlet.js
0 → 100644
-
Please register or login to post a comment