@@ -9,6 +9,7 @@ define(function(require, exports) {
9
9
var Order = require ( '../model/order' ) ;
10
10
var Popup = require ( '../widget/popup' ) ;
11
11
var cart = require ( '../widget/cart' ) ;
12
+ var Category = require ( '../model/category' ) ;
12
13
13
14
var Address = require ( '../proto/scene' ) . sub ( {
14
15
@@ -23,7 +24,8 @@ define(function(require, exports) {
23
24
util . finish ( [
24
25
25
26
Transfee . fetch . bind ( Transfee , params ) ,
26
- AddressModel . fetch . bind ( AddressModel , params )
27
+ AddressModel . fetch . bind ( AddressModel , params ) ,
28
+ Category . fetch . bind ( Category , params )
27
29
28
30
] , function ( transfee , addressList ) {
29
31
@@ -78,12 +80,14 @@ define(function(require, exports) {
78
80
return ;
79
81
}
80
82
81
- Popup . loading ( '正在提交...' ) ;
83
+ var loading = Popup . loading ( '正在提交...' ) ;
82
84
83
85
if ( me . addressId !== - 1 ) {
84
86
me . submitOrder ( params ) ;
85
87
} else {
86
88
me . createAddress ( function ( err , address ) {
89
+ loading . hide ( ) ;
90
+
87
91
if ( err ) {
88
92
Popup . alert ( err ) ;
89
93
} else {
@@ -106,7 +110,7 @@ define(function(require, exports) {
106
110
} ;
107
111
108
112
if ( ! ( address . city && address . country && address . detail && address . consignee && address . phone ) ) {
109
- Popup . alert ( '请填写正确的地址信息!' ) ;
113
+ callback ( '请填写正确的地址信息!' ) ;
110
114
return ;
111
115
}
112
116
0 commit comments