修改bug

aiberle/order-list.html

@@ -432,9 +432,19 @@
             data: dataArgs,
             dataType: 'json',
             type: 'POST',
+            xhrFields: {
+				withCredentials: true
+			},
+			crossDomain: true,
             timeout: 15000,
             success: function(dt) {
-//              layer.closeAll();
+            	
+            	if(dt.resultCode == "500") {
+					mui.alert(dt.message);
+					isPay = true;
+					return;
+				};
+            	
                 if(dt.status) {
                     var str = dt.data.info;
                     var obj = JSON.parse("{" + str + "}");
@@ -452,6 +462,9 @@
                                 data: orderIds,
                                 dataType: 'json',
                                 type: 'post',
+                                xhrFields: {
+									withCredentials: true
+								},
                                 timeout: 15000,
                                 success: function(dt) {
                                     if(dt.status) { // 支付成功

aiberle/shopping-cart.html

@@ -167,7 +167,7 @@
 										var num = this.cartNum;
 										var proStatus='',disabled='';
 										var zeng = '';
-										if(this.productStatus==1){
+										if(this.productStatus==1 && this.colorStatus == 1){
 											$.each(this.salesUserGiftList, function() {
 												zeng += this.giftName + '<span class="giftItems" count="'+this.userGiftCount+'">'+(num * this.userGiftCount) + '</span>件 ';
 											});