1111

uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -13,7 +13,7 @@
 				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText" :focus="focus" >
 			</slot>
 		</view>
-		<view class="uni-dialog-button-group">
+		<view class="uni-dialog-button-group" v-if="!showConfirm">
 			<view class="uni-dialog-button" @click="closeDialog">
 				<text class="uni-dialog-button-text">{{closeText}}</text>
 			</view>
@@ -21,6 +21,13 @@
 				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
 			</view>
 		</view>
+		
+		<!-- 倒计时按钮 -->
+		<view class="uni-dialog-button-group" v-if="showConfirm">
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
 
 	</view>
 </template>
@@ -96,17 +103,22 @@
 			confirmText:{
 				type: String,
 				default: ''
-			}
+			},
+			showConfirm: {
+				type: Boolean,
+				default: false
+			},
 		},
 		data() {
 			return {
-				dialogType: 'error',
+				dialogType: 'warn',
 				focus: false,
 				val: ""
 			}
 		},
 		computed: {
 			okText() {
+				console.log('confirmText',this.confirmText);
 				return this.confirmText || t("uni-popup.ok")
 			},
 			closeText() {