Commit ece6f3c5 authored by Facius's avatar Facius

第一轮部分bug修复

parent 230979e2
......@@ -5,7 +5,7 @@
<text class="title-text">{{title}}</text>
<view>
<text>退件时间:</text>
<text>{{info.createTime}}</text>
<text>{{info.createTime ? $u.timeFormat(info.createTime, 'yyyy.mm.dd hh:MM:ss') : ''}}</text>
</view>
</view>
<view class="line-view"></view>
......@@ -18,7 +18,7 @@
<view class="info-item">
<view>
<text>退件编号:</text>
<text @longpress="handleLongpress">{{info.number}}</text>
<text @longpress="handleLongpress">{{info.batchNumber}}</text>
</view>
<text class="copy-view" @click="$u.throttle(handleLongpress, 500)">复制</text>
</view>
......
......@@ -215,13 +215,16 @@
title: message,
type: type,
duration: 1500,
callback: function() {}
callback: ()=> {
var pages = getCurrentPages();
if (pages.length >= 2) {
var page = pages[pages.length - 2];
page.needApplyList = true
uni.navigateBack()
}
}
})
var pages = getCurrentPages();
if (pages.length >= 2) {
var page = pages[pages.length - 2];
page.needApplyList = true
}
})
},
// 查看物流
......
......@@ -143,7 +143,6 @@
let list = res.data || []
for (var item of list) {
item.selected = false
item.stock = 12
this.partsList.push(item)
}
......
......@@ -6,7 +6,7 @@
<view class="title">{{nodeInfo.title}}</view>
<view v-show="isReturn" class="return">
<u-divider color="#F4F5F7" half-width="345" margin-top="30" :use-slot="false"></u-divider>
<view class="return-title u-text-center">件编号</view>
<view class="return-title u-text-center">退件编号</view>
<view class="u-flex u-row-between return-row">
<view class="return-no">{{returnNo}}</view>
<view class="vertical-bar"></view>
......@@ -37,8 +37,8 @@
{
type: 'return',
icon: 'successful.png',
title: '您的件信息已提交成功',
message: '请将件编号复制发给唯修汇对接人',
title: '您的退件信息已提交成功',
message: '请将退件编号复制发给唯修汇对接人',
btnTxt: '我知道了'
}
]
......@@ -58,7 +58,7 @@
computed: {
title() {
if (this.nodeInfo.type == 'parts') return '备件申请结果页'
if (this.nodeInfo.type == 'return') return '件结果页'
if (this.nodeInfo.type == 'return') return '退件结果页'
return '备件申请结果页'
},
nodeInfo() {
......@@ -85,14 +85,27 @@
this.$u.route({type:'back'})
}
if(this.isReturn){
var pages = getCurrentPages();
if(pages.length >= 4) {
var prevPage = pages[pages.length - 4];
this.$u.route({type:'back', delta: 3})
prevPage.$vm.$u.route({url: 'pages/mine/warehouse/return'})
} else {
this.$u.route({type:'back'})
}
uni.switchTab({
url: '/pages/index/mine',
complete: () => {
this.$nextTick(()=>{
uni.navigateTo({
url: 'pages/mine/warehouse/return'
});
})
}
});
// uni.redirectTo({
// url: 'pages/mine/warehouse/return'
// });
// var pages = getCurrentPages();
// if(pages.length >= 4) {
// var prevPage = pages[pages.length - 4];
// this.$u.route({type:'back', delta: 3})
// prevPage.$vm.$u.route({url: 'pages/mine/warehouse/return'})
// } else {
// this.$u.route({type:'back'})
// }
}
},
copyText(e) {
......
......@@ -98,6 +98,7 @@
this.$u.api.returnParts(params).then((res) => {
if(res.code == 200 && res.data) {
this.$u.route({
type: 'redirect',
url: 'pages/parts/nodes',
params: {
type: 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment