|
@@ -10,15 +10,11 @@
|
|
|
<link rel="stylesheet" type="text/css" href="css/mui.min.css" />
|
|
|
<link rel="stylesheet" type="text/css" href="css/iconfont.css" />
|
|
|
<link rel="stylesheet" type="text/css" href="css/main.css" />
|
|
|
- <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
|
|
|
- <script>
|
|
|
- //屏蔽分享
|
|
|
- document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
|
|
|
- WeixinJSBridge.call('hideOptionMenu');
|
|
|
- });
|
|
|
+ <script type="text/javascript">
|
|
|
+ // 屏蔽分享
|
|
|
+ window.hiddenAllWechatMenu = true;
|
|
|
</script>
|
|
|
</head>
|
|
|
-
|
|
|
<body>
|
|
|
<header class="mui-bar mui-bar-nav">
|
|
|
<div id="pro-menu" class="mui-segmented-control tab-with-orderlist">
|
|
@@ -256,19 +252,17 @@
|
|
|
SetRemainTime("setName" + index, index, this.salesAdminRemark);
|
|
|
a += '<h6><span class="my-btn-orange" id="testid' + index + '"></span>分钟后,订单失效</h6>';
|
|
|
}
|
|
|
- a += '<li class="mui-table-view-cell mui-media mui-col-xs-7 mui-text-right">'
|
|
|
- //+ '<button type="button" class="my-order-btn" onclick="cancel_order(\'' + txt_order.salesOrderid + '\',\'' + txt_order.salesStatus + '\')">取消订单</button>'
|
|
|
- + '<button type="button" class="my-order-btn" onclick="goOrderPay(\'' + txt_order.salesOrderid + '\')">立即支付</button>';
|
|
|
+ a += '<li class="mui-table-view-cell mui-media mui-col-xs-7 mui-text-right"><button type="button" class="my-order-btn" onclick="goOrderPay(\'' + txt_order.salesOrderid + '\')">立即支付</button>';
|
|
|
a += orderDesc;
|
|
|
a += '</li>';
|
|
|
} else if (txt_order.salesStatus == 2) {
|
|
|
a += ali;
|
|
|
- a += '<button type="button" class="my-order-btn" onclick="warnSend(\'' + txt_order.salesOrderid + '\',\'' + txt_order.salesStatus + '\')">提醒发货</button>'
|
|
|
+ a += '<button type="button" class="my-order-btn" onclick="warnSend(\'' + txt_order.salesOrderid + '\',\'' + txt_order.salesStatus + '\')">提醒发货</button>';
|
|
|
a += orderDesc;
|
|
|
a += ali2;
|
|
|
} else if (txt_order.salesStatus == 5) {
|
|
|
a += ali;
|
|
|
- a += '<button type="button" class="my-order-btn" onclick="confirm_receipt(\'' + txt_order.salesOrderid + '\',\'' + txt_order.salesStatus + '\')">确认收货</button>'
|
|
|
+ a += '<button type="button" class="my-order-btn" onclick="confirm_receipt(\'' + txt_order.salesOrderid + '\',\'' + txt_order.salesStatus + '\')">确认收货</button>';
|
|
|
a += orderDesc;
|
|
|
a += ali2;
|
|
|
}else{
|
|
@@ -290,7 +284,7 @@
|
|
|
},
|
|
|
error: function(xhr, type, errorThrown) {
|
|
|
//异常处理;
|
|
|
- //errorfn(xhr);
|
|
|
+ console.log(xhr);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -470,7 +464,7 @@
|
|
|
});
|
|
|
} else {
|
|
|
isPay = true;
|
|
|
- //mui.alert("对不起,支付失败!请稍后重试!" + dt.data.orderId + "支付失败!");
|
|
|
+ mui.alert("对不起,支付失败!请稍后重试!" + dt.data.orderId + "支付失败!");
|
|
|
//window.location.href = "order-details.html?orderId=" + dt.data.orderId; // 前往订单详情
|
|
|
}
|
|
|
});
|