星油企业版更新

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

@@ -15,7 +15,7 @@
 		</view>
 		<view class="uni-dialog-button-group">
 			<view class="uni-dialog-button" @click="closeDialog">
-				<text class="uni-dialog-button-text">{{cancelText}}</text>
+				<text class="uni-dialog-button-text">{{closeText}}</text>
 			</view>
 			<view class="uni-dialog-button uni-border-left" @click="onOk">
 				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
@@ -31,7 +31,7 @@
 	initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from '../uni-popup/i18n/index.js'
-	const {	t	} = initVueI18n(messages)
+	const {	t } = initVueI18n(messages)
 	/**
 	 * PopUp 弹出层-对话框样式
 	 * @description 弹出层-对话框样式
@@ -84,6 +84,14 @@
 			beforeClose: {
 				type: Boolean,
 				default: false
+			},
+			cancelText:{
+				type: String,
+				default: ''
+			},
+			confirmText:{
+				type: String,
+				default: ''
 			}
 		},
 		data() {
@@ -95,10 +103,10 @@
 		},
 		computed: {
 			okText() {
-				return t("uni-popup.ok")
+				return this.confirmText || t("uni-popup.ok")
 			},
-			cancelText() {
-				return t("uni-popup.cancel")
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
 			},
 			placeholderText() {
 				return this.placeholder || t("uni-popup.placeholder")
@@ -162,7 +170,12 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+	$uni-success: #4cd964 !default;
+	$uni-warning: #f0ad4e !default;
+	$uni-error: #dd524d !default;
+	
 	.uni-popup-dialog {
 		width: 300px;
 		border-radius: 11px;
@@ -232,7 +245,7 @@
 	}
 
 	.uni-button-color {
-		color: #007aff;
+		color: $uni-primary;
 	}
 
 	.uni-dialog-input {
@@ -246,15 +259,15 @@
 	}
 
 	.uni-popup__success {
-		color: #4cd964;
+		color: $uni-success;
 	}
 
 	.uni-popup__warn {
-		color: #f0ad4e;
+		color: $uni-warning;
 	}
 
 	.uni-popup__error {
-		color: #dd524d;
+		color: $uni-error;
 	}
 
 	.uni-popup__info {