Merge remote-tracking branch 'origin/dev' into dev

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 components/popups/popups.vue

@@ -11,10 +11,10 @@
</template>

<script>
import UIcon from '@/uview-components/uview-ui/components/u-icon/u-icon.vue';
import '@/components/uview-components/uview-ui';

export default {
  components: {UIcon},

  props: {
    maskBg: {
      type: String,