|
@@ -1240,7 +1240,21 @@ let vm = new Vue({
|
|
vm.currentOrderNo = r.resultObj.orderEntity.id;
|
|
vm.currentOrderNo = r.resultObj.orderEntity.id;
|
|
vm.pickUpCode = pickUpCode;
|
|
vm.pickUpCode = pickUpCode;
|
|
vm.tax = r.resultObj.tax;
|
|
vm.tax = r.resultObj.tax;
|
|
- vm.response = r.resultObj.response;
|
|
|
|
|
|
+ try {
|
|
|
|
+ //转换为json对象,
|
|
|
|
+ //如果转换出现异常,说明是字符串也就是海关回执报文 没有说明是json对象 页面显示为空
|
|
|
|
+ console.log(r.resultObj.response)
|
|
|
|
+ var obj = JSON.parse(r.resultObj.response);
|
|
|
|
+ console.log(obj)
|
|
|
|
+ if (typeof obj === 'object' && obj) {
|
|
|
|
+ vm.response='';
|
|
|
|
+ } else {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ } catch (error) {
|
|
|
|
+ //转换异常,返回说明是字符串---海关回执报文
|
|
|
|
+ vm.response=r.resultObj.response;
|
|
|
|
+ }
|
|
if(vm.orderProcessRecord.eleOrderStartTime){
|
|
if(vm.orderProcessRecord.eleOrderStartTime){
|
|
vm.orderProcessRecord.eleOrderStartTime = parsedate(vm.orderProcessRecord.eleOrderStartTime);
|
|
vm.orderProcessRecord.eleOrderStartTime = parsedate(vm.orderProcessRecord.eleOrderStartTime);
|
|
}
|
|
}
|
|
@@ -1652,11 +1666,11 @@ function openWebSocket() {
|
|
//无法使用wss,浏览器打开WebSocket时报错
|
|
//无法使用wss,浏览器打开WebSocket时报错
|
|
//ws对应http、wss对应https。
|
|
//ws对应http、wss对应https。
|
|
//kmall测试环境
|
|
//kmall测试环境
|
|
- // webSocket = new WebSocket("ws://183.62.225.124:3080/ws/server/"+storeId);
|
|
|
|
|
|
+ webSocket = new WebSocket("ws://183.62.225.124:3080/ws/server/"+storeId);
|
|
// 预发布环境
|
|
// 预发布环境
|
|
// webSocket = new WebSocket("ws://14.29.226.8:8080/ws/server/"+storeId);
|
|
// webSocket = new WebSocket("ws://14.29.226.8:8080/ws/server/"+storeId);
|
|
//kmall海控正式环境
|
|
//kmall海控正式环境
|
|
- webSocket = new WebSocket("ws://120.76.119.218:8080/ws/server/"+storeId);
|
|
|
|
|
|
+ // webSocket = new WebSocket("ws://120.76.119.218:8080/ws/server/"+storeId);
|
|
//kmall本地环境
|
|
//kmall本地环境
|
|
// webSocket = new WebSocket("ws://127.0.0.1:8089/ws/server/"+storeId);
|
|
// webSocket = new WebSocket("ws://127.0.0.1:8089/ws/server/"+storeId);
|
|
// webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
|
|
// webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
|