shish 2 месяцев назад
Родитель
Сommit
28317c6593

+ 32 - 7
ghsPad/src/pages/home/components/console.vue

@@ -45,6 +45,16 @@
 		</view>
 	</uni-popup>
 
+	<uni-popup ref="deleteHandOrderConfirmRef" type="dialog">
+		<view style="width:60vw;height:70vh;background-color: white;padding:70upx 20upx 0 20upx;">
+			<view style="margin-bottom:40upx;text-align: center;font-size:24upx;">确认删除?</view>
+			<view style="text-align:center;">
+				<button class="admin-button-com mini-btn default" @click="cancelDeleteHandOrder">取消</button>
+				<button class="admin-button-com mini-btn default" @click="confirmDeleteHandOrder" style="margin-left:30upx;">确认</button>
+			</view>
+		</view>
+	</uni-popup>
+
     <uni-popup ref="logoutRef" type="dialog">
         <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认退出?" @confirm="confirmLogout"></uni-popup-dialog>
     </uni-popup>
@@ -142,7 +152,8 @@ export default {
 			price:0,
 			orderReachDiscountPrice:0,
 			reachDiscountPrice:0,
-			fastAction:1
+			fastAction:1,
+			pendingDeleteHandOrderId: null
         }
     },
 	computed: {
@@ -199,12 +210,26 @@ export default {
 		},
 		removeHandOrderFromPop(id){
 			this.$util.hitVoice()
-			this.$util.confirmModal({content:'确认删除挂单?'},() => {
-				let success = this.deleteHandOrder(id)
-				if(success && this.$util.isEmpty(this.globalHandOrderList)){
-					this.closeHandOrderPop()
-				}
-			})
+			this.pendingDeleteHandOrderId = id
+			this.$refs.deleteHandOrderConfirmRef.open('center')
+		},
+		cancelDeleteHandOrder(){
+			this.$util.hitVoice()
+			this.pendingDeleteHandOrderId = null
+			this.$refs.deleteHandOrderConfirmRef.close()
+		},
+		confirmDeleteHandOrder(){
+			this.$util.hitVoice()
+			const id = this.pendingDeleteHandOrderId
+			this.pendingDeleteHandOrderId = null
+			this.$refs.deleteHandOrderConfirmRef.close()
+			if(id == null){
+				return
+			}
+			let success = this.deleteHandOrder(id)
+			if(success && this.$util.isEmpty(this.globalHandOrderList)){
+				this.closeHandOrderPop()
+			}
 		},
 		part(){
 			this.$util.hitVoice()

+ 32 - 7
hdPad/src/pages/home/components/console.vue

@@ -48,6 +48,16 @@
 		</view>
 	</uni-popup>
 
+	<uni-popup ref="deleteHandOrderConfirmRef" type="dialog">
+		<view style="width:60vw;height:70vh;background-color: white;padding:70upx 20upx 0 20upx;">
+			<view style="margin-bottom:40upx;text-align: center;font-size:24upx;">确认删除?</view>
+			<view style="text-align:center;">
+				<button class="admin-button-com mini-btn default" @click="cancelDeleteHandOrder">取消</button>
+				<button class="admin-button-com mini-btn default" @click="confirmDeleteHandOrder" style="margin-left:30upx;">确认</button>
+			</view>
+		</view>
+	</uni-popup>
+
     <uni-popup ref="logoutRef" type="dialog">
         <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认退出?" @confirm="confirmLogout"></uni-popup-dialog>
     </uni-popup>
@@ -156,7 +166,8 @@ export default {
 			calc:'add',
 			settleOpenStatus:0, // 结算弹框状态
 			price:0,
-			fastAction:1
+			fastAction:1,
+			pendingDeleteHandOrderId: null
         }
     },
 	computed: {
@@ -217,12 +228,26 @@ export default {
 		},
 		removeHandOrderFromPop(id){
 			this.$util.hitVoice()
-			this.$util.confirmModal({content:'确认删除挂单?'},() => {
-				let success = this.deleteHandOrder(id)
-				if(success && this.$util.isEmpty(this.globalHandOrderList)){
-					this.closeHandOrderPop()
-				}
-			})
+			this.pendingDeleteHandOrderId = id
+			this.$refs.deleteHandOrderConfirmRef.open('center')
+		},
+		cancelDeleteHandOrder(){
+			this.$util.hitVoice()
+			this.pendingDeleteHandOrderId = null
+			this.$refs.deleteHandOrderConfirmRef.close()
+		},
+		confirmDeleteHandOrder(){
+			this.$util.hitVoice()
+			const id = this.pendingDeleteHandOrderId
+			this.pendingDeleteHandOrderId = null
+			this.$refs.deleteHandOrderConfirmRef.close()
+			if(id == null){
+				return
+			}
+			let success = this.deleteHandOrder(id)
+			if(success && this.$util.isEmpty(this.globalHandOrderList)){
+				this.closeHandOrderPop()
+			}
 		},
 		part(){
 			this.$util.hitVoice()