Browse Source

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

richard1015 4 years ago
parent
commit
1d80eceb4f

+ 12 - 0
src/packages/__VUE/tabbaritem/index.taro.vue

@@ -25,6 +25,8 @@
           class="nut-tabbar-item_icon-box_icon"
           :size="state.size"
           :name="icon"
+          :font-class-name="fontClassName"
+          :class-prefix="classPrefix"
         ></nut-icon>
       </view>
       <view
@@ -69,10 +71,20 @@ export default create({
       // 页签右上角的数字角标
       type: String,
       default: ''
+    },
+    classPrefix: {
+      type: String,
+      default: 'nut-icon'
+    },
+    fontClassName: {
+      type: String,
+      default: 'nutui-iconfont'
     }
   },
   setup(props, ctx) {
     const parent: any = inject('parent');
+    console.log(props.classPrefix);
+
     const state = reactive({
       size: parent.size,
       unactiveColor: parent.unactiveColor, // 未选中的颜色

+ 10 - 0
src/packages/__VUE/tabbaritem/index.vue

@@ -25,6 +25,8 @@
           class="nut-tabbar-item_icon-box_icon"
           :size="state.size"
           :name="icon"
+          :font-class-name="fontClassName"
+          :class-prefix="classPrefix"
         ></nut-icon>
       </view>
       <view
@@ -69,6 +71,14 @@ export default create({
       // 页签右上角的数字角标
       type: String,
       default: ''
+    },
+    classPrefix: {
+      type: String,
+      default: 'nut-icon'
+    },
+    fontClassName: {
+      type: String,
+      default: 'nutui-iconfont'
     }
   },
   setup(props, ctx) {

+ 1 - 1
src/sites/mobile-taro/vue/project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "dist/",
   "projectname": "%40nutui%2Fnutui-taro-mobile",
   "description": "nutui-taro-vue",
-  "appid": "wx81c95cafc368ba2d",
+  "appid": "wxf2b976b67dab3882",
   "setting": {
     "urlCheck": true,
     "scopeDataCheck": false,