diff --git a/dist/dialog/dialog.d.ts b/dist/dialog/dialog.d.ts index 66769a6d..2bffd13e 100644 --- a/dist/dialog/dialog.d.ts +++ b/dist/dialog/dialog.d.ts @@ -1,47 +1,50 @@ /// declare type DialogAction = 'confirm' | 'cancel'; declare type DialogOptions = { - lang?: string; - show?: boolean; - title?: string; - width?: string | number; - zIndex?: number; - context?: WechatMiniprogram.Page.TrivialInstance | WechatMiniprogram.Component.TrivialInstance; - message?: string; - overlay?: boolean; - selector?: string; - ariaLabel?: string; - className?: string; - customStyle?: string; - transition?: string; - asyncClose?: boolean; - businessId?: number; - sessionFrom?: string; - overlayStyle?: string; - appParameter?: string; - messageAlign?: string; - sendMessageImg?: string; - showMessageCard?: boolean; - sendMessagePath?: string; - sendMessageTitle?: string; - confirmButtonText?: string; - cancelButtonText?: string; - showConfirmButton?: boolean; - showCancelButton?: boolean; - closeOnClickOverlay?: boolean; - confirmButtonOpenType?: string; + lang?: string; + show?: boolean; + title?: string; + width?: string | number; + zIndex?: number; + theme?: string; + context?: + | WechatMiniprogram.Page.TrivialInstance + | WechatMiniprogram.Component.TrivialInstance; + message?: string; + overlay?: boolean; + selector?: string; + ariaLabel?: string; + className?: string; + customStyle?: string; + transition?: string; + asyncClose?: boolean; + businessId?: number; + sessionFrom?: string; + overlayStyle?: string; + appParameter?: string; + messageAlign?: string; + sendMessageImg?: string; + showMessageCard?: boolean; + sendMessagePath?: string; + sendMessageTitle?: string; + confirmButtonText?: string; + cancelButtonText?: string; + showConfirmButton?: boolean; + showCancelButton?: boolean; + closeOnClickOverlay?: boolean; + confirmButtonOpenType?: string; }; interface Dialog { - (options: DialogOptions): Promise; - alert?: (options: DialogOptions) => Promise; - confirm?: (options: DialogOptions) => Promise; - close?: () => void; - stopLoading?: () => void; - install?: () => void; - setDefaultOptions?: (options: DialogOptions) => void; - resetDefaultOptions?: () => void; - defaultOptions?: DialogOptions; - currentOptions?: DialogOptions; + (options: DialogOptions): Promise; + alert?: (options: DialogOptions) => Promise; + confirm?: (options: DialogOptions) => Promise; + close?: () => void; + stopLoading?: () => void; + install?: () => void; + setDefaultOptions?: (options: DialogOptions) => void; + resetDefaultOptions?: () => void; + defaultOptions?: DialogOptions; + currentOptions?: DialogOptions; } declare const Dialog: Dialog; export default Dialog; diff --git a/dist/dialog/dialog.js b/dist/dialog/dialog.js index 446a4e2e..9ba35ce9 100644 --- a/dist/dialog/dialog.js +++ b/dist/dialog/dialog.js @@ -29,6 +29,7 @@ Dialog.defaultOptions = { show: false, title: '', width: null, + theme: 'default', message: '', zIndex: 100, overlay: true, diff --git a/dist/dialog/index.js b/dist/dialog/index.js index 3222d387..5aa7f8f4 100644 --- a/dist/dialog/index.js +++ b/dist/dialog/index.js @@ -1,7 +1,7 @@ import { VantComponent } from '../common/component'; import { button } from '../mixins/button'; import { openType } from '../mixins/open-type'; -import { GRAY, BLUE } from '../common/color'; +import { GRAY, RED } from '../common/color'; VantComponent({ mixins: [button, openType], props: { @@ -13,6 +13,10 @@ VantComponent({ }, title: String, message: String, + theme: { + type: String, + value: 'default', + }, useSlot: Boolean, className: String, customStyle: String, @@ -38,7 +42,7 @@ VantComponent({ }, confirmButtonColor: { type: String, - value: BLUE, + value: RED, }, cancelButtonColor: { type: String, diff --git a/dist/dialog/index.json b/dist/dialog/index.json index e2ee09ae..1b87cc89 100644 --- a/dist/dialog/index.json +++ b/dist/dialog/index.json @@ -2,6 +2,8 @@ "component": true, "usingComponents": { "van-popup": "../popup/index", - "van-button": "../button/index" + "van-button": "../button/index", + "van-goods-action": "../goods-action//index", + "van-goods-action-button": "../goods-action-button/index" } } diff --git a/dist/dialog/index.wxml b/dist/dialog/index.wxml index cbad7f6f..bcec2742 100644 --- a/dist/dialog/index.wxml +++ b/dist/dialog/index.wxml @@ -27,7 +27,49 @@ {{ message }} - + + + {{ cancelButtonText }} + + + {{ confirmButtonText }} + + + + {{ message }} - + + + {{ cancelButtonText }} + + + {{ confirmButtonText }} + + + +