Browse Source

fix:排号信息弹窗样式修改,预约订单未支付关闭支付组件时跳转到订单列表

zhanghui 2 years ago
parent
commit
65ab06436b
3 changed files with 16 additions and 4 deletions
  1. 6 1
      components/pay/pay.vue
  2. 8 1
      orderPages/bookService/index.vue
  3. 2 2
      pages/order/index.rpx.scss

+ 6 - 1
components/pay/pay.vue

@@ -1,7 +1,7 @@
 <template>
 	<!--支付组件-->
 	<view>
-		<uni-popup ref="popup" type="bottom" :catchtouchmove="true">
+		<uni-popup ref="popup" type="bottom" @maskClick="maskClick()" :catchtouchmove="true">
 			<view class=" payView">
 				<view class="flex-row justify-between">
 					<text class="payType">请选择支付方式</text>
@@ -79,6 +79,7 @@
 	 *
 	 *   function 回调函数
 	 * 1,payResult(e),支付结果回调。
+	 * 2,improperClose 点击遮罩层和关闭按钮x 关闭弹窗时的回调
 	 */
 	export default {
 		name: "myPay",
@@ -136,6 +137,7 @@
 		methods: {
 			closePayPopup() {
 				this.$refs.popup.close()
+				this.$emit('improperClose')
 			},
 			openPopup() {
 				this.password = ''
@@ -147,6 +149,9 @@
 				}
 				this.curServiceTab = num
 			},
+			maskClick(){
+				this.$emit('improperClose')
+			},
 
 			payment() {
 				this.$refs.popup.close()

+ 8 - 1
orderPages/bookService/index.vue

@@ -122,7 +122,7 @@
 				</view>
 			</view>
 		</view>
-		<myPay ref="myPay" :blPay="false" :orderNo="subOrderNo" @payResult="payResult"></myPay>
+		<myPay ref="myPay" :blPay="false" :orderNo="subOrderNo" @payResult="payResult" @improperClose="improperClose"></myPay>
 	</view>
 </template>
 
@@ -192,6 +192,13 @@
 
 		},
 		methods: {
+
+			improperClose(){
+				uni.switchTab({
+					url: '/pages/order/index'
+				})
+			},
+
 			bindPickerChange(e){
 				console.log(e)
 				if (e.detail.value == this.periodDateIndex){

+ 2 - 2
pages/order/index.rpx.scss

@@ -35,8 +35,8 @@
   }
 
   .text {
-    font-size: 26rpx;
-    color: #FFC000;
+    font-size: 30rpx;
+    //color: #FFC000;
     line-height: 80rpx;
   }