diff --git a/App.vue b/App.vue
index e1d2896..3a10fd6 100644
--- a/App.vue
+++ b/App.vue
@@ -4,6 +4,7 @@
//#ifdef H5
console.log("APPonLaunch");
+ // 每次进入托盘模块都需要重新登录，不保留上次token
// var token= uni.getStorageSync("token");
// if(token){
// uni.redirectTo({
@@ -22,9 +23,9 @@
ticket=params.get('ticket');
}
- if (!ticket){
- this.closeWindow()
- }
+ // if (!ticket){
+ // this.closeWindow()
+ // }
// alert(ticket)
if(ticket){
uni.showLoading({
diff --git a/pages/pallet/js.vue b/pages/pallet/js.vue
index c0aa3db..28e66f5 100644
--- a/pages/pallet/js.vue
+++ b/pages/pallet/js.vue
@@ -94,7 +94,9 @@
-
+
+
+
@@ -147,6 +149,8 @@ export default {
},
data() {
return {
+ ifsumbit:false,
+ subtxt:"接收提交中..",
current:1,
step:[
{
@@ -665,11 +669,15 @@ export default {
},
async jsdo(){
+ this.ifsumbit=true;
+ this.$forceUpdate();
uni.showLoading({
title: '接收提交中...'
});
const {data: res} = await uni.$http.post('/sendReceiveData',this.itemList);
if(res.success){
+ this.subtxt="接收提交完成";
+ this.$forceUpdate();
this.$refs.uToast.show({
title: "转运接收成功！",
type: "success",
@@ -688,6 +696,8 @@ export default {
type: "warning",
duration: 3000,
});
+ this.ifsumbit=false;
+ this.$forceUpdate();
}
},
@@ -1198,9 +1208,8 @@ page {
}
.continue-btn {
- background-color: #007aff;
- color: #fff;
- margin-right: 20rpx;
+ background-color: #d4d9e1;
+ color: #888;
}
.complete-btn {
diff --git a/pages/pallet/ps.vue b/pages/pallet/ps.vue
index 967723c..5087c83 100644
--- a/pages/pallet/ps.vue
+++ b/pages/pallet/ps.vue
@@ -210,7 +210,8 @@
-
+
+
@@ -291,6 +292,8 @@ export default {
},
data() {
return {
+ ifsumbit:false,
+ subtxt:"接收提交中..",
current:2,
step:[
{
@@ -1351,7 +1354,6 @@ export default {
this.itemList.data=data;
this.$forceUpdate();
- console.log(this.itemList)
uni.showModal({
title: '提示',
content: '确定要配送接收吗？',
@@ -1369,11 +1371,15 @@ export default {
},
async jsdo(){
+ this.ifsumbit=true;
+ this.$forceUpdate();
uni.showLoading({
title: '接收提交中...'
});
const {data: res} = await uni.$http.post('/sendReceiveData',this.itemList);
if(res.success){
+ this.subtxt="接收提交完成";
+ this.$forceUpdate();
this.$refs.uToast.show({
title: "配送接收成功！",
type: "success",
@@ -1385,6 +1391,8 @@ export default {
delta: 1,
});
}, 3000);
+ // this.ifsumbit=false;
+ // this.$forceUpdate();
}
else{
this.$refs.uToast.show({
@@ -1392,6 +1400,8 @@ export default {
type: "warning",
duration: 3000,
});
+ this.ifsumbit=false;
+ this.$forceUpdate();
}
},
getcount(){
@@ -1566,24 +1576,6 @@ page {
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
}
-.nav-left {
- width: 60rpx;
- height: 60rpx;
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.nav-title {
- font-size: 36rpx;
- font-weight: bold;
- color: #333;
-}
-
-.nav-right .complete-btn {
- font-size: 30rpx;
- color: #007aff;
-}
.stepcon{
margin: 20rpx;
}
@@ -1930,17 +1922,16 @@ page {
flex: 1;
height: 80rpx;
border-radius: 12rpx;
- font-size: 32rpx;
- font-weight: bold;
+ font-size: 30rpx;
+ font-weight: 600;
display: flex;
align-items: center;
justify-content: center;
}
.continue-btn {
- background-color: #007aff;
- color: #fff;
- margin-right: 20rpx;
+ background-color: #d4d9e1;
+ color: #888;
}
.complete-btn {
diff --git a/pages/pallet/xp.vue b/pages/pallet/xp.vue
index b18d260..ef05c03 100644
--- a/pages/pallet/xp.vue
+++ b/pages/pallet/xp.vue
@@ -101,7 +101,9 @@
-
+
+
+
@@ -158,6 +160,8 @@ export default {
},
data() {
return {
+ ifsumbit:false,
+ subtxt:"卸盘提交中..",
fcur:1,
sourceType:['album', 'camera'], // 选择图片的来源，album-从相册选图，camera-使用相机，默认二者都有（默认['album', 'camera']）
messageText:"",
@@ -664,6 +668,8 @@ export default {
});
},
async xpdo(){
+ this.ifsumbit=true;
+ this.$forceUpdate();
uni.showLoading({
title: '卸盘提交中...'
});
@@ -677,6 +683,8 @@ export default {
}
const {data: res} = await uni.$http.post('/sendFinishData',para);
if(res.success){
+ this.subtxt="卸盘提交完成";
+ this.$forceUpdate();
this.$refs.uToast.show({
title: "卸盘提交成功！",
type: "success",
@@ -695,6 +703,8 @@ export default {
type: "warning",
duration: 3000,
});
+ this.ifsumbit=false;
+ this.$forceUpdate();
}
},
@@ -1401,9 +1411,8 @@ page {
}
.continue-btn {
- background-color: #007aff;
- color: #fff;
- margin-right: 20rpx;
+ background-color: #d4d9e1;
+ color: #888;
}
.complete-btn {
diff --git a/pages/pallet/yz.vue b/pages/pallet/yz.vue
index e674019..50fd8a3 100644
--- a/pages/pallet/yz.vue
+++ b/pages/pallet/yz.vue
@@ -161,7 +161,9 @@
-
+
+
+
@@ -225,6 +227,8 @@ export default {
},
data() {
return {
+ ifsumbit:false,
+ subtxt:"转运提交中..",
current:1,
step:[
{
@@ -810,6 +814,8 @@ export default {
});
},
async yzdo(){
+ this.ifsumbit=true;
+ this.$forceUpdate();
uni.showLoading({
title: '转运提交中...'
});
@@ -830,6 +836,8 @@ export default {
}
const {data: res} = await uni.$http.post('/sendPalletCustom',para);
if(res.success){
+ this.subtxt="转运提交完成";
+ this.$forceUpdate();
this.$refs.uToast.show({
title: "转运提交成功！",
type: "success",
@@ -848,6 +856,8 @@ export default {
type: "warning",
duration: 3000,
});
+ this.ifsumbit=false;
+ this.$forceUpdate();
}
},
@@ -1570,9 +1580,8 @@ page {
}
.continue-btn {
- background-color: #007aff;
- color: #fff;
- margin-right: 20rpx;
+ background-color: #d4d9e1;
+ color: #888;
}
.complete-btn {