im-ui-mobile 0.1.35 → 0.1.37

package/components/im-avatar/im-avatar.vue

@@ -56,18 +56,14 @@
         <view v-if="showStatus && status" class="im-avatar__status" :class="`im-avatar__status--${status}`" />
 
         <!-- 角标 -->
-        <im-badge v-if="badge" :value="badgeText" :dot="badgeDot" :class="[`im-avatar__badge`]" :size="badgeSize" />
+        <im-badge v-if="badge" :value="badgeText" :dot="badgeDot" :class="[`im-avatar__badge`
+            // #ifdef MP-WEIXIN
+            , `im-avatar__badge--${size}`
+            // #endif
+        ]" :size="badgeSize" />
 
         <!-- 加载状态 -->
-        <view v-if="loading" class="im-avatar__loading">
-            <im-loading v-if="loading" :size="32" text="" :mask="true" :class="[
-                {
-                    'im-avatar__loading--square': shape === 'square',
-                    'im-avatar__loading--rounded': shape === 'rounded',
-                    'im-avatar__loading--circle': shape === 'circle'
-                }
-            ]" />
-        </view>
+        <im-loading v-if="loading" class="im-avatar__loading" :size="32" text="" :mask="true" />
     </view>
 </template>
 
@@ -202,25 +198,6 @@ const textStyle = computed(() => {
     return style
 })
 
-// const iconStyle = computed(() => {
-//     const style: Record<string, string> = {
-//         color: props.iconColor
-//     }
-
-//     if (props.iconSize) {
-//         style.fontSize = `${props.iconSize}rpx`
-//     }
-
-//     return style
-// })
-
-// const badgeClass = computed(() => {
-//     if (props.badgeColor) {
-//         return ''
-//     }
-//     return 'im-avatar__badge--default'
-// })
-
 const badgeSize = computed(() => {
     switch (props.size) {
         case 'mini':
@@ -487,6 +464,10 @@ const handleImageError = (error: any) => {
     &__badge {
 
         // 尺寸
+
+        // #ifdef MP-WEIXIN
+        &--mini,
+        // #endif
         .im-avatar--mini & {
             top: -30rpx;
             right: -6rpx;
@@ -516,32 +497,48 @@ const handleImageError = (error: any) => {
             top: -88rpx;
             right: -30rpx;
         }
+
+        // #ifdef MP-WEIXIN
+
+        // #endif
     }
 
     // 加载状态
     &__loading {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        z-index: 2;
+        // position: absolute;
+        // top: 0;
+        // left: 0;
+        // width: 100%;
+        // height: 100%;
+        // display: flex;
+        // align-items: center;
+        // justify-content: center;
+        // z-index: 2;
 
         // 形状
-        &--circle {
+        .im-avatar--circle & {
             border-radius: 50%;
         }
 
-        &--square {
+        // &--circle {
+        //     border-radius: 50%;
+        // }
+
+        .im-avatar--square & {
             border-radius: 8rpx;
         }
 
-        &--rounded {
+        // &--square {
+        //     border-radius: 8rpx;
+        // }
+
+        .im-avatar--rounded & {
             border-radius: 20%;
         }
+
+        // &--rounded {
+        //     border-radius: 20%;
+        // }
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "im-ui-mobile",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "description": "A Vue3.0 + Typescript instant messaging component library for Uniapp",
   "type": "module",
   "main": "index.js",