|
@@ -69,7 +69,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 付款弹框 -->
|
|
|
- <payModal v-if="hasPay" :showPopu="showPopu" :closeCurPage="true" :payInfo="payInfo" :payData="payData" @close="showPopu=false" @payComplete="payComplete"></payModal>
|
|
|
+ <payModal v-if="hasPay" :showPopu="showPopu" :payInfo="payInfo" :payData="payData" @close="showPopu=false" @payComplete="payComplete"></payModal>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
@@ -101,6 +101,8 @@
|
|
|
onUnload() {
|
|
|
this.$store.state.vuex_tempData = null
|
|
|
},
|
|
|
+ onShow() {
|
|
|
+ },
|
|
|
data() {
|
|
|
return {
|
|
|
loading: false,
|
|
@@ -121,7 +123,7 @@
|
|
|
statusBarHeight: 44, // 状态栏高度
|
|
|
safeAreaBottom: 0, // 底部安全区域高度
|
|
|
showPopu: false, // 弹框
|
|
|
- payData: null // 付款参数
|
|
|
+ payData: null ,// 付款参数
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -147,11 +149,6 @@
|
|
|
return this.$store.state.vuex_tempOrderData
|
|
|
}
|
|
|
},
|
|
|
- onShow() {
|
|
|
- if(this.payData){
|
|
|
- uni.navigateBack()
|
|
|
- }
|
|
|
- },
|
|
|
methods: {
|
|
|
goBack(){
|
|
|
uni.navigateBack()
|
|
@@ -290,11 +287,12 @@
|
|
|
payComplete(data){
|
|
|
// 创建成功,跳转到订单详情页
|
|
|
this.showPopu = false
|
|
|
+ uni.navigateBack()
|
|
|
setTimeout(()=>{
|
|
|
uni.navigateTo({
|
|
|
url: "/pagesB/procureOrder/orderDetail?purchaseSn="+this.$store.state.vuex_tempOrderData.purchaseSn
|
|
|
})
|
|
|
- },50)
|
|
|
+ },150)
|
|
|
},
|
|
|
// 计算总款数、合计、数量
|
|
|
getChooseHeji(){
|