浏览代码

修复bug

wangxiaoming 7 年之前
父节点
当前提交
bb47bfecef
共有 5 个文件被更改,包括 35 次插入6 次删除
  1. 1 1
      aiberle/customer-service.html
  2. 1 1
      aiberle/exchange-goods.html
  3. 1 1
      aiberle/js/main.js
  4. 11 2
      aiberle/order-details.html
  5. 21 1
      aiberle/order-list.html

+ 1 - 1
aiberle/customer-service.html

@@ -88,7 +88,7 @@
 							}
 							var str = "";
 							mui.each(order.orderItemList, function(index) {
-								str += '<div class="mui-table"><div class="mui-table-cell mui-col-xs-5"><img class="mui-media-object wh-100" src="'+ this.itemProductPic +'"></div><div class="mui-table-cell table-middle mui-col-xs-7" style="line-height:2.5">'+ this.itemProductName +'<h6>颜色:'+ this.productColor +'<span class="center">数量:'+ this.itemNum +'</span></h6><div>¥'+ (this.itemProductDiscount / 100).toFixed(2) +'</div></div></div>';
+								str += '<div class="mui-table"><div class="mui-table-cell mui-col-xs-5"><img class="mui-media-object wh-100" src="'+ this.itemProductPic +'"></div><div class="mui-table-cell table-middle mui-col-xs-7" style="line-height:2.5">'+ this.itemProductName +'<h6>颜色:'+ this.itemProductColor +'<span class="center">数量:'+ this.itemNum +'</span></h6><div>¥'+ (this.itemProductDiscount / 100).toFixed(2) +'</div></div></div>';
 							});
 							document.querySelector('.shopping-cart-list').innerHTML = str;
 							

+ 1 - 1
aiberle/exchange-goods.html

@@ -125,7 +125,7 @@
 							}
 							var str = "";
 							mui.each(order.orderItemList, function(index) {
-								str += '<div class="mui-table"><div class="mui-table-cell mui-col-xs-5"><img class="mui-media-object wh-100" src="'+ this.itemProductPic +'"></div><div class="mui-table-cell table-middle mui-col-xs-7" style="line-height:2.5">'+ this.itemProductName +'<h6>颜色:'+ this.productColor +'<span class="center">数量:'+ this.itemNum +'</span></h6><div>¥'+ (this.itemProductDiscount / 100).toFixed(2) +'</div></div></div>';
+								str += '<div class="mui-table"><div class="mui-table-cell mui-col-xs-5"><img class="mui-media-object wh-100" src="'+ this.itemProductPic +'"></div><div class="mui-table-cell table-middle mui-col-xs-7" style="line-height:2.5">'+ this.itemProductName +'<h6>颜色:'+ this.itemProductColor +'<span class="center">数量:'+ this.itemNum +'</span></h6><div>¥'+ (this.itemProductDiscount / 100).toFixed(2) +'</div></div></div>';
 							});
 							document.querySelector('.shopping-cart-list').innerHTML = str;
 							

+ 1 - 1
aiberle/js/main.js

@@ -7,7 +7,7 @@ window.addEventListener('pageshow', function(e) {
 var domanUrl = "//" + window.location.host;
 var base_path = "//h5.iamberry.com/iamberry";
 
-var web_url_path = "https://h5.iamberry.com";
+var web_url_path = "http://h5.iamberry.com";
 
 //var base_path = "/iamberry";
 

+ 11 - 2
aiberle/order-details.html

@@ -83,6 +83,7 @@
 		<script src="js/mui.min.js"></script>
 		<script src="js/jquery-2.1.1.min.js"></script>
 		<script src="js/main.js"></script>
+		<script src="js/wechat-utils-1.0.js"></script>
 		<script>
 			var orderId = getParam("orderId");
 			var status;
@@ -113,7 +114,7 @@
 							location.href = dt.redirectURL;
 						} else {
 							if(dt.status) {
-								//console.log(dt)
+								console.log(dt)
 								var order = dt.data;
 								
 								status = order.salesStatus;
@@ -126,7 +127,7 @@
 								var num = 0;
 								mui.each(order.orderItemList, function(index) {
 									num += this.itemNum;
-									str += '<div class="mui-table"><div class="mui-table-cell mui-col-xs-5"><img class="mui-media-object wh-100" src="'+ this.itemProductPic +'"></div><div class="mui-table-cell table-middle mui-col-xs-7" style="line-height:2.5">'+ this.itemProductName +'<h6>颜色:'+ this.productColor +'<span class="center">数量:'+ this.itemNum +'</span></h6><div>¥'+ accDiv(this.itemProductDiscount,100) +'</div></div></div>';
+									str += '<div class="mui-table"><div class="mui-table-cell mui-col-xs-5"><img class="mui-media-object wh-100" src="'+ this.itemProductPic +'"></div><div class="mui-table-cell table-middle mui-col-xs-7" style="line-height:2.5">'+ this.itemProductName +'<h6>颜色:'+ this.itemProductColor +'<span class="center">数量:'+ this.itemNum +'</span></h6><div>¥'+ accDiv(this.itemProductDiscount,100) +'</div></div></div>';
 								});
 								document.querySelector('.shopping-cart-list').innerHTML = str;
 								document.querySelector('.loading-bg').style.display = 'none';
@@ -337,6 +338,10 @@
             data: dataArgs,
             dataType: 'json',
             type: 'POST',
+             xhrFields: {
+				withCredentials: true
+			},
+			crossDomain: true,
             timeout: 15000,
             success: function(dt) {
 //              layer.closeAll();
@@ -357,6 +362,10 @@
                                 data: orderIds,
                                 dataType: 'json',
                                 type: 'post',
+                                 xhrFields: {
+									withCredentials: true
+								},
+								crossDomain: true,
                                 timeout: 15000,
                                 success: function(dt) {
                                     if(dt.status) { // 支付成功

+ 21 - 1
aiberle/order-list.html

@@ -336,7 +336,7 @@
                     tabindex = 2;
                     break;
                 case 2:
-                    tabindex = 3;
+                    tabindex = 5;
                     break;
                 default:
                     tabindex = -1;
@@ -358,6 +358,10 @@
             data: dataArgs,
             dataType: 'json',
             type: 'POST',
+             xhrFields: {
+				withCredentials: true
+			},
+			crossDomain: true,
             timeout: 15000,
             success: function (dt) {
                 mui.alert(dt.message);
@@ -377,6 +381,10 @@
             data: dataArgs,
             dataType: 'json',
             type: 'POST',
+             xhrFields: {
+				withCredentials: true
+			},
+			crossDomain: true,
             timeout: 15000,
             success: function (dt) {
                 mui.alert(dt.message);
@@ -396,6 +404,10 @@
             data: dataArgs,
             dataType: 'json',
             type: 'POST',
+             xhrFields: {
+				withCredentials: true
+			},
+			crossDomain: true,
             timeout: 15000,
             success: function (dt) {
                 mui.alert(dt.message);
@@ -427,6 +439,10 @@
             data: dataArgs,
             dataType: 'json',
             type: 'POST',
+            xhrFields: {
+				withCredentials: true
+			},
+			crossDomain: true,
             timeout: 15000,
             success: function(dt) {
 //              layer.closeAll();
@@ -447,6 +463,10 @@
                                 data: orderIds,
                                 dataType: 'json',
                                 type: 'post',
+                                 xhrFields: {
+									withCredentials: true
+								},
+								crossDomain: true,
                                 timeout: 15000,
                                 success: function(dt) {
                                     if(dt.status) { // 支付成功