lilei 7 months ago
parent
commit
2a897d51d9

+ 0 - 10
pagesB/components/payModal.vue

@@ -62,10 +62,6 @@
 			cancelPayMessage: {
 				type: String,
 				default: '您的订单在30分钟内未支付将被取消,请尽快完成支付。'
-			},
-			closeCurPage:{
-				type: Boolean,
-				default: false
 			}
 		},
 		data() {
@@ -96,9 +92,6 @@
 			// 关闭确定订单弹窗后
 			closePopu(){
 				if(!this.showModal){
-					if(this.closeCurPage){
-						// uni.navigateBack()
-					}
 					// 付款成功
 					if(this.submitOk){
 						this.$emit('payComplete',this.payInfo, true)
@@ -124,9 +117,6 @@
 								_this.showModal = false
 								_this.submitOk = false
 							}else{
-								if(_this.closeCurPage){
-									// uni.navigateBack()
-								}
 								_this.$emit('payComplete',_this.payInfo, false)
 							}
 						}

+ 6 - 8
pagesB/procureOrder/creatOrder.vue

@@ -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(){

+ 1 - 8
pagesB/procureOrder/orderDetail.vue

@@ -290,6 +290,7 @@
 		   	title: '加载中'
 		   })
 		   purchaseQueryDetailPage({purchaseSn: this.purchaseSn,pageNo:this.pageNo,pageSize:this.pageSize}).then(res => {
+			    uni.hideLoading()
 				if(res.status == 200){
 					this.partList = res.data ? res.data.list : []
 					// 是否有赠品
@@ -303,14 +304,6 @@
 					})
 					this.total = res.data ? res.data.count : 0
 				}
-				// 滚动到顶部
-				this.$nextTick(()=>{
-					uni.pageScrollTo({
-						scrollTop: 0,
-						duration: 300
-					});
-					uni.hideLoading()
-				})
 		   }) 
 		 },
 		 message(title){