|
|
@ -20,7 +20,7 @@ import orderApi from "../models/order-model.js"; |
|
|
export default { |
|
|
export default { |
|
|
data() { |
|
|
data() { |
|
|
return { |
|
|
return { |
|
|
active: "", |
|
|
|
|
|
|
|
|
active: this.$route.query.active ? parseInt(this.$route.query.active) : '', |
|
|
list: [] |
|
|
list: [] |
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
@ -49,10 +49,10 @@ export default { |
|
|
this.wechat(this.list[0].merchantNo); |
|
|
this.wechat(this.list[0].merchantNo); |
|
|
} |
|
|
} |
|
|
} else if (res.code == 666) { |
|
|
} else if (res.code == 666) { |
|
|
this.$vux.toast.text("您还没登录,请先登录!", "middle"); |
|
|
|
|
|
setTimeout(function() { |
|
|
|
|
|
window.location.href = "/mall/web/user/login"; |
|
|
|
|
|
}, 2000); |
|
|
|
|
|
|
|
|
// this.$vux.toast.text("您还没登录,请先登录!", "middle"); |
|
|
|
|
|
// setTimeout(function() { |
|
|
|
|
|
// window.location.href = "/mall/web/user/login"; |
|
|
|
|
|
// }, 2000); |
|
|
} else { |
|
|
} else { |
|
|
if ( |
|
|
if ( |
|
|
res.msg == "" || |
|
|
res.msg == "" || |
|
|
@ -83,8 +83,6 @@ export default { |
|
|
}; |
|
|
}; |
|
|
</script> |
|
|
</script> |
|
|
<style lang="scss" scoped> |
|
|
<style lang="scss" scoped> |
|
|
.order-list-whole { |
|
|
|
|
|
} |
|
|
|
|
|
.state-bar { |
|
|
.state-bar { |
|
|
width: 100%; |
|
|
width: 100%; |
|
|
height: 0.8rem; |
|
|
height: 0.8rem; |
|
|
|