浏览代码

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei 4 年之前
父节点
当前提交
3ce356bc5b
共有 4 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      pages/checkOut/checkOut.vue
  2. 1 1
      pages/order/order.vue
  3. 1 1
      pages/order/orderDetail.vue
  4. 1 1
      pages/toOrder/index.vue

+ 1 - 1
pages/checkOut/checkOut.vue

@@ -36,7 +36,7 @@
 			</view>
 		</view>
 		 <!-- 确认支付弹窗 -->
-		 <u-popup mode="center" closeable @close="closeModal" negative-top="300" v-model="showPayModal" width="600rpx" >
+		 <u-popup mode="center" :mask-close-able="false" closeable @close="closeModal" negative-top="300" v-model="showPayModal" width="600rpx" >
 			<view class="slot-content">
 				<view class="slot-title">请输入支付密码</view>
 				<view class="text-cont">

+ 1 - 1
pages/order/order.vue

@@ -98,7 +98,7 @@
 		@cancel="payAgain"
 		></u-modal>
 		<!-- 确认支付弹窗 -->
-		 <u-popup mode="center" closeable @close="closePayModal" v-model="showInputPsw" width="500rpx" >
+		 <u-popup mode="center" :mask-close-able="false" negative-top="300" closeable @close="closePayModal" v-model="showInputPsw" width="500rpx" >
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view class="text-cont">

+ 1 - 1
pages/order/orderDetail.vue

@@ -93,7 +93,7 @@
 		@cancel="payAgain"
 		></u-modal>
 		<!-- 确认支付弹窗 -->
-		 <u-popup mode="center" closeable @close="closePayModal" v-model="showInputPsw" width="500rpx" >
+		 <u-popup mode="center" :mask-close-able="false" negative-top="300" closeable @close="closePayModal" v-model="showInputPsw" width="500rpx" >
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view class="text-cont">

+ 1 - 1
pages/toOrder/index.vue

@@ -77,7 +77,7 @@
 		@cancel="payAgain"
 		></u-modal>
 		<!-- 确认支付弹窗 -->
-		 <u-popup mode="center" closeable @close="showLeavePsw=true" v-model="showInputPsw" width="500rpx" >
+		 <u-popup mode="center" :mask-close-able="false" negative-top="300" closeable @close="showLeavePsw=true" v-model="showInputPsw" width="500rpx" >
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view class="text-cont">