Home Explore Help
Sign In
liujiankang
/
static
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://git.iamberry.com/liujiankang/static

# Conflicts:
#	aiberle/order-list.html
qihanjiao 7 years ago
parent
3ce1e8e530 b992b1f306
commit
e4692f9475
1 changed files with 1 additions and 15 deletions
Split View Show Diff Stats
  1. 1 15
      aiberle/order-list.html

+ 1 - 15
aiberle/order-list.html
View File 

@@ -15,7 +15,6 @@
 
 		window.hiddenAllWechatMenu = true;

 	</script>

 </head>

-

 <body>

 <header class="mui-bar mui-bar-nav">

 	<div id="pro-menu" class="mui-segmented-control tab-with-orderlist">

@@ -428,19 +427,9 @@
 
             data: dataArgs,

             dataType: 'json',

             type: 'POST',

-            xhrFields: {

-				withCredentials: true

-			},

-			crossDomain: true,

             timeout: 15000,

             success: function(dt) {

-            	

-            	if(dt.resultCode == "500") {

-					mui.alert(dt.message);

-					isPay = true;

-					return;

-				};

-            	

+//              layer.closeAll();

                 if(dt.status) {

                     var str = dt.data.info;

                     var obj = JSON.parse("{" + str + "}");

@@ -458,9 +447,6 @@
 
                                 data: orderIds,

                                 dataType: 'json',

                                 type: 'post',

-                                xhrFields: {

-									withCredentials: true

-								},

                                 timeout: 15000,

                                 success: function(dt) {

                                     if(dt.status) { // 支付成功