Showing
19 changed files
with
19 additions
and
17 deletions
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | const Promise = require('bluebird'); | 4 | const Promise = require('bluebird'); |
5 | const co = Promise.coroutine; | 5 | const co = Promise.coroutine; |
6 | 6 | ||
7 | -let CouponsModel = require('../models/CouponsModel'); | 7 | +let CouponsModel = require('../models/coupons-model'); |
8 | const helpers = global.yoho.helpers; | 8 | const helpers = global.yoho.helpers; |
9 | 9 | ||
10 | 10 |
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | const Promise = require('bluebird'); | 8 | const Promise = require('bluebird'); |
9 | const co = Promise.coroutine; | 9 | const co = Promise.coroutine; |
10 | 10 | ||
11 | -const CurrencyModel = require('../models/CurrencyModel'); | 11 | +const CurrencyModel = require('../models/currency-model'); |
12 | const moment = require('moment'); | 12 | const moment = require('moment'); |
13 | 13 | ||
14 | const convertUnitTime = (src) => { | 14 | const convertUnitTime = (src) => { |
@@ -8,8 +8,8 @@ | @@ -8,8 +8,8 @@ | ||
8 | const Promise = require('bluebird'); | 8 | const Promise = require('bluebird'); |
9 | const co = Promise.coroutine; | 9 | const co = Promise.coroutine; |
10 | 10 | ||
11 | -const OrderData = require('../models/OrderData'); | ||
12 | -const IndexModel = require('../models/IndexModel'); | 11 | +const OrderData = require('../models/order-data'); |
12 | +const IndexModel = require('../models/index-model'); | ||
13 | 13 | ||
14 | 14 | ||
15 | const index = (req, res, next)=>{ | 15 | const index = (req, res, next)=>{ |
1 | 'use strict'; | 1 | 'use strict'; |
2 | const Promise = require('bluebird'); | 2 | const Promise = require('bluebird'); |
3 | const co = Promise.coroutine; | 3 | const co = Promise.coroutine; |
4 | -const RedenvelopesModel = require('../models/RedenvelopesModel'); | 4 | +const RedenvelopesModel = require('../models/redenvelopes-model'); |
5 | 5 | ||
6 | const index = (req, res, next)=>{ | 6 | const index = (req, res, next)=>{ |
7 | let $uid = '8041246';// req.user.uid; | 7 | let $uid = '8041246';// req.user.uid; |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | 2 | ||
3 | const Promise = require('bluebird'); | 3 | const Promise = require('bluebird'); |
4 | const co = Promise.coroutine; | 4 | const co = Promise.coroutine; |
5 | -const UserData = require('../models/UserData'); | 5 | +const UserData = require('../models/user-data'); |
6 | const moment = require('moment'); | 6 | const moment = require('moment'); |
7 | const helpers = global.yoho.helpers; | 7 | const helpers = global.yoho.helpers; |
8 | 8 |
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | const Promise = require('bluebird'); | 4 | const Promise = require('bluebird'); |
5 | const co = Promise.coroutine; | 5 | const co = Promise.coroutine; |
6 | 6 | ||
7 | -const UserData = require('./UserData'); | 7 | +const UserData = require('./user-data'); |
8 | const helpers = global.yoho.helpers; | 8 | const helpers = global.yoho.helpers; |
9 | 9 | ||
10 | 10 |
@@ -11,7 +11,7 @@ const helpers = global.yoho.helpers; | @@ -11,7 +11,7 @@ const helpers = global.yoho.helpers; | ||
11 | const api = global.yoho.API; | 11 | const api = global.yoho.API; |
12 | const _ = require('lodash'); | 12 | const _ = require('lodash'); |
13 | const Image = require('../../../utils/images'); | 13 | const Image = require('../../../utils/images'); |
14 | -const CurrencyData = require('./CurrencyData'); | 14 | +const CurrencyData = require('./currency-data'); |
15 | const SearchData = require('./SearchData'); | 15 | const SearchData = require('./SearchData'); |
16 | 16 | ||
17 | // 使用 product中的分页逻辑 | 17 | // 使用 product中的分页逻辑 |
@@ -5,14 +5,14 @@ | @@ -5,14 +5,14 @@ | ||
5 | 5 | ||
6 | const Promise = require('bluebird'); | 6 | const Promise = require('bluebird'); |
7 | const co = Promise.coroutine; | 7 | const co = Promise.coroutine; |
8 | -const OrderData = require('./OrderData'); | ||
9 | -const OrderModel = require('./OrderModel'); | 8 | +const OrderData = require('./order-data'); |
9 | +const OrderModel = require('./order-model'); | ||
10 | const helpers = global.yoho.helpers; | 10 | const helpers = global.yoho.helpers; |
11 | const api = global.yoho.API; | 11 | const api = global.yoho.API; |
12 | const searchApi = global.yoho.SearchAPI; | 12 | const searchApi = global.yoho.SearchAPI; |
13 | 13 | ||
14 | const BrandData = require('./BrandData'); | 14 | const BrandData = require('./BrandData'); |
15 | -const IndexData = require('./IndexData'); | 15 | +const IndexData = require('./index-data'); |
16 | const SearchData = require('./SearchData'); | 16 | const SearchData = require('./SearchData'); |
17 | 17 | ||
18 | const HelperHome = require('./HelperHome'); | 18 | const HelperHome = require('./HelperHome'); |
1 | 'use strict'; | 1 | 'use strict'; |
2 | const Promise = require('bluebird'); | 2 | const Promise = require('bluebird'); |
3 | const co = Promise.coroutine; | 3 | const co = Promise.coroutine; |
4 | -const RedenvelopesData = require('./RedenvelopesData.js'); | 4 | +const RedenvelopesData = require('./redenvelopes-data.js'); |
5 | 5 | ||
6 | const redenvelopesList = uid=>{ | 6 | const redenvelopesList = uid=>{ |
7 | return co(function*() { | 7 | return co(function*() { |
@@ -20,13 +20,13 @@ const commentController = require(`${cRoot}/comment`); | @@ -20,13 +20,13 @@ const commentController = require(`${cRoot}/comment`); | ||
20 | const messageController = require(`${cRoot}/message`); | 20 | const messageController = require(`${cRoot}/message`); |
21 | 21 | ||
22 | // const returnsController = require(`${cRoot}/returns`); | 22 | // const returnsController = require(`${cRoot}/returns`); |
23 | -// const IndexController = require(`${cRoot}/Index`); | ||
24 | -// const CurrencyController = require(`${cRoot}/Currency`); | 23 | +// const IndexController = require(`${cRoot}/index`); |
24 | +// const CurrencyController = require(`${cRoot}/currency`); | ||
25 | const personalController = require(`${cRoot}/qrcode`); | 25 | const personalController = require(`${cRoot}/qrcode`); |
26 | 26 | ||
27 | -// const RedenvelopesController = require(`${cRoot}/Redenvelopes`); | 27 | +// const RedenvelopesController = require(`${cRoot}/redenvelopes`); |
28 | // const VipController = require(`${cRoot}/vip`); | 28 | // const VipController = require(`${cRoot}/vip`); |
29 | -// const FavoriteController = require(`${cRoot}/Favorite`); | 29 | +// const FavoriteController = require(`${cRoot}/favorite`); |
30 | // const CouponsController = require(`${cRoot}/coupons`); | 30 | // const CouponsController = require(`${cRoot}/coupons`); |
31 | 31 | ||
32 | const UserController = require(`${cRoot}/user`); | 32 | const UserController = require(`${cRoot}/user`); |
@@ -97,7 +97,7 @@ var address = { | @@ -97,7 +97,7 @@ var address = { | ||
97 | oldLi.removeClass('preferred'); | 97 | oldLi.removeClass('preferred'); |
98 | oldBtn.html('<span>设为常用地址</span>'); | 98 | oldBtn.html('<span>设为常用地址</span>'); |
99 | curBtn.attr('class', 'btn-c2 default-btn'); | 99 | curBtn.attr('class', 'btn-c2 default-btn'); |
100 | - oldBtn.html('<span>设为常用地址</span>'); | 100 | + curBtn.html('<span>已设为常用地址</span>'); |
101 | curLi.addClass('preferred'); | 101 | curLi.addClass('preferred'); |
102 | } else { | 102 | } else { |
103 | active = new Alert('设置失败'); | 103 | active = new Alert('设置失败'); |
@@ -113,6 +113,7 @@ var address = { | @@ -113,6 +113,7 @@ var address = { | ||
113 | 113 | ||
114 | the.loadAreaData(pCode, the.cityDomId, '请选择城市', pCode); | 114 | the.loadAreaData(pCode, the.cityDomId, '请选择城市', pCode); |
115 | $('#' + the.areaDomId).hide(); | 115 | $('#' + the.areaDomId).hide(); |
116 | + $('#' + the.streetsDomId).hide().empty(); | ||
116 | the.showAreaSel(domOptions.dispDomId); | 117 | the.showAreaSel(domOptions.dispDomId); |
117 | }); | 118 | }); |
118 | 119 | ||
@@ -125,6 +126,7 @@ var address = { | @@ -125,6 +126,7 @@ var address = { | ||
125 | 126 | ||
126 | the.loadAreaData(pCode, the.areaDomId, '请选择区县', pCode); | 127 | the.loadAreaData(pCode, the.areaDomId, '请选择区县', pCode); |
127 | $('#' + the.areaDomId).show(); | 128 | $('#' + the.areaDomId).show(); |
129 | + $('#' + the.streetsDomId).hide().empty(); | ||
128 | the.showAreaSel(domOptions.dispDomId); | 130 | the.showAreaSel(domOptions.dispDomId); |
129 | }); | 131 | }); |
130 | 132 |
-
Please register or login to post a comment