Merge branch 'v4' of https://github.com/jdf2e/nutui into v4

src/packages/__VUE/imagepreview/index.taro.vue

@@ -76,10 +76,6 @@ export default create({
       type: Boolean,
       default: false
     },
-    closeIcon: {
-      type: String,
-      default: 'circle-close'
-    },
     closeIconPosition: {
       type: String,
       default: 'top-right' // top-right  top-left

src/packages/__VUE/imagepreview/index.ts

@@ -38,7 +38,7 @@ class ImagePreviewFunction {
   constructor(_options: ImagePreviewOptions) {
     const options = Object.assign(this.options, _options);
     const { instance, unmount } = CreateComponent(options, {
-      name: 'imagepreview',
+      name: 'image-preview',
       components: [Popup, Video, Swiper, SwiperItem, Overlay],
       wrapper: () => {
         return {

src/packages/__VUE/imagepreview/index.vue

@@ -73,10 +73,6 @@ export default create({
       type: Boolean,
       default: false
     },
-    closeIcon: {
-      type: String,
-      default: 'circle-close'
-    },
     closeIconPosition: {
       type: String,
       default: 'top-right' // top-right  top-left
@@ -141,6 +137,7 @@ export default create({
     const init = () => {
       if (swipeRef.value) {
         const rect = useRect(swipeRef.value);
+        console.log('show');
         state.rootHeight = rect.height;
         state.rootWidth = rect.width;
       }
@@ -149,6 +146,7 @@ export default create({
     watch(
       () => props.show,
       (val) => {
+        console.log('展示', val);
         state.showPop = val;
         init();
       }

src/packages/__VUE/popup/index.vue

@@ -7,8 +7,6 @@
       :z-index="zIndex"
       :lock-scroll="lockScroll"
       :duration="duration"
-      :overlay-class="overlayClass"
-      :overlay-style="overlayStyle"
       @click="onClickOverlay"
       v-bind="$attrs"
     />

src/packages/__VUE/popup/props.ts

@@ -71,12 +71,5 @@ export const popupProps = {
   safeAreaInsetBottom: {
     type: Boolean,
     default: false
-  },
-  overlayClass: {
-    type: String,
-    default: ''
-  },
-  overlayStyle: {
-    type: Object as PropType<CSSProperties>
   }
 };

src/packages/__VUE/price/doc.md

@@ -112,8 +112,8 @@ app.use(Price);
 | symbol         | 符号类型                                | String           | ¥  |
 | decimal-digits | 小数位位数                              | Number  | 2     |
 | thousands      | 是否按照千分号形式显示                    | Boolean          | false  |
-| position       | 符号显示在价格前或者后，`before`、`after`  | String           | before |
-| size           | 价格尺寸，`large`、`normal`、`small`     | String           | large |
+| position       | 符号显示在价格前或者后，`before`、`after`  | String           | `before` |
+| size           | 价格尺寸，`large`、`normal`、`small`     | String           | `large` |
 
 
 ## 主题定制

src/packages/__VUE/pullrefresh/index.scss

@@ -18,8 +18,9 @@
       justify-content: center;
 
       &-icon {
-        width: 28px;
-        height: 24px;
+        margin-right: 4px;
+        width: 16px;
+        height: 16px;
       }
       &-text {
         font-size: $font-size-2;