Merge branch 'dev' of https://github.com/didi/mand-mobile into dev

didi · Jan 5, 2024 · a222451 · a222451
2 parents d7dcf4b + 913ffe4
commit a222451
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/components/dialog/index.js b/components/dialog/index.js
@@ -174,6 +174,7 @@ Dialog.alert = ({
  */
 Dialog.succeed = props => {
   props.icon = 'success-color'
+  props.iconSvg = true
   return Dialog.confirm(props)
 }
 
@@ -185,6 +186,7 @@ Dialog.succeed = props => {
  */
 Dialog.failed = props => {
   props.icon = 'warn-color'
+  props.iconSvg = true
   return Dialog.confirm(props)
 }
 

diff --git a/components/license-plate/index.vue b/components/license-plate/index.vue
@@ -505,7 +505,9 @@ export default {
   .md-license-plate-input-container{
     &.popUp{
       background: #fff;
-      padding: 20px 40px 40px;
+      padding: 20px 40px 0px;
+      padding-bottom: constant(safe-area-inset-bottom);
+      padding-bottom: env(safe-area-inset-bottom);
     }
   }
 }