xiezuo001
/
palletApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiezuo001:c2d02fb43dcec3eefb18a51fb0b88d6ef84ea410
Branches Tags
xiezuo001:main
..
compare: xiezuo001:17a9790f993314e39a4438dfa6fa4c3f3bf2be6f
Branches Tags
xiezuo001:main

3 Commits
c2d02fb43d ... 17a9790f99

Author SHA1 Message Date
zouyanyan 17a9790f99 upbugbtnsubmit
1 month ago
zouyanyan 6d078bc6d1 Merge branch 'main' of https://www.sanduolantoyoga.com/xiezuo001/palletApp
1 month ago
zouyanyan 7efdb8ea7c upbug
1 month ago
5 changed files with 68 additions and 144 deletions
Show Stats

120
App.vue
Unescape View File

@ -1,23 +1,17 @@
<script>
// 引入检查更新
//import checkupdate from "@/uni_modules/uni-upgrade-center-app/utils/check-update.js"
//引进检查版本
// import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version';
//#ifdef APP-PLUS
// const jpushModule = uni.requireNativePlugin('JG-JPush');
//#endif
export default {
async onLaunch() {
//#ifdef H5
var token= uni.getStorageSync("token");
if(token){
uni.redirectTo({
url: '/pages/index/index'
});
return false;
}
console.log("APPonLaunch");
// 每次进入托盘模块都需要重新登录，不保留上次token
// var token= uni.getStorageSync("token");
// if(token){
// uni.redirectTo({
// url: '/pages/index/index'
// });
// return false;
// }
const queryString = window.location.search;
const searchParams = new URLSearchParams(queryString);
@ -29,50 +23,14 @@
ticket=params.get('ticket');
}
if (!ticket){
this.closeWindow()
}
// if (!ticket){
// this.closeWindow()
// }
// alert(ticket)
if(ticket){
uni.showLoading({
title: '登录跳转中...'
});
// const {data: res} = await uni.$http.post('/loginBySSO?ticket='+ticket);
// if(res.success){
// if(res.data){
// console.log(res.data)
// uni.setStorageSync('expires', res.data.expires);
// uni.setStorageSync('token', res.data.token);
// uni.setStorageSync('user', JSON.stringify(res.data.user));
// uni.setStorageSync('menu', JSON.stringify(res.data.btns));
// this.getdept();
// // 跳转 首页
// uni.switchTab({
// url: '/pages/index/index'
// });
// }
// else{
// uni.showModal({
// title: '提示',
// content: '获取登录token失败，请重新登录后进入！',
// cancelText: '取消',
// confirmText: '确定',
// success: ress => {
// }
// });
// }
// }
// else{
// uni.showModal({
// title: '提示',
// content: '获取登录token失败，请重新登录后进入！',
// cancelText: '取消',
// confirmText: '确定',
// success: ress => {
// }
// });
// }
uni.request({
header: {
"Content-Type": "application/json",
@ -137,60 +95,8 @@
});
}
//#endif
// 判断版本更新 需要真机进行测试
//checkupdate();
//#ifdef APP-PLUS
// // 消息推送
// jpushModule.setLoggerEnable(true);
// jpushModule.initJPushService()
// jpushModule.addConnectEventListener(result=>{
// let connectEnable = result.connectEnable
// console.log("jpush连接", connectEnable)
// });
// jpushModule.addTagAliasListener(result => {
// let code = result.code
// let sequence = result.sequence
// let tags = result.tags
// let tag = result.tag
// let tagEnable = result.tagEnable
// let alias = result.alias
// console.log(alias, '别名')
// });
// // 通知事件回调
// jpushModule.addNotificationListener(result => {
// let notificationEventType = result.notificationEventType
// let messageID = result.messageID
// let title = result.title
// let content = result.content
// let extras = result.extras
// console.log("通知", result)
// // 点击事件
// if (notificationEventType == 'notificationOpened') {
// uni.reLaunch({
// url: `/pages/message/newMsg`
// });
// }
// })
// jpushModule.getRegistrationID(result => {
// console.log("注册ID", result.registerID)
// if (result.registerID) {
// uni.setStorageSync("register_id", result.registerID)
// }
// })
// jpushModule.addCustomMessageListener(result => {
// let messageID = result.messageID
// let content = result.content
// let extras = result.extras
// console.log("自定义消息", result)
// })
//#endif
//#endif
},
methods: {
async getdept(){

17
pages/pallet/js.vue
Unescape View File

@ -94,7 +94,9 @@
<!-- 底部操作栏 -->
<view class="bottom-actions">
<button class="action-btn complete-btn" @click="finishLoading">接收</button>
<!-- <button class="action-btn complete-btn" @click="finishLoading">接收</button> -->
<button v-if="ifsumbit" class="action-btn continue-btn" loading="true"> {{subtxt}} </button>
<button v-else class="action-btn complete-btn" @click="finishLoading">接收</button>
</view>
<!-- 提示窗示例 -->
@ -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 {

41
pages/pallet/ps.vue
Unescape View File

@ -210,7 +210,8 @@
<!-- 底部操作栏 -->
<view class="bottom-actions">
<button class="action-btn complete-btn" @click="finishLoading">接收</button>
<button v-if="ifsumbit" class="action-btn continue-btn" loading="true"> {{subtxt}} </button>
<button v-else class="action-btn complete-btn" @click="finishLoading">接收</button>
</view>
<!-- 查看托盘详情 -->
@ -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 {

17
pages/pallet/xp.vue
Unescape View File

@ -101,7 +101,9 @@
<!-- 底部操作栏 -->
<view class="bottom-actions">
<button class="action-btn complete-btn" @click="finishLoading">确认卸盘</button>
<!-- <button class="action-btn complete-btn" @click="finishLoading">确认卸盘</button> -->
<button v-if="ifsumbit" class="action-btn continue-btn" loading="true"> {{subtxt}} </button>
<button v-else class="action-btn complete-btn" @click="finishLoading">确认卸盘</button>
</view>
<!-- 提示窗示例 -->
@ -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 {

17
pages/pallet/yz.vue
Unescape View File

@ -161,7 +161,9 @@
</view>
<!-- 底部操作栏 -->
<view class="bottom-actions">
<button class="action-btn complete-btn" @click="finishLoading">确认转运</button>
<!-- <button class="action-btn complete-btn" @click="finishLoading">确认转运</button> -->
<button v-if="ifsumbit" class="action-btn continue-btn" loading="true"> {{subtxt}} </button>
<button v-else class="action-btn complete-btn" @click="finishLoading">确认转运</button>
</view>
<!-- 提示窗示例 -->
@ -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 {

Write Preview
Loading…
Cancel
Save