update(uni-ui): uni-notice-bar showClose

Wangyaqi · Wangyaqi · commit ac6505504ba6 · 2020-02-27T11:27:01.000+08:00
diff --git a/components/uni-notice-bar/uni-notice-bar.vue b/components/uni-notice-bar/uni-notice-bar.vue
@@ -2,14 +2,14 @@
 	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
 		<!-- #ifdef MP-ALIPAY -->
 		<view v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" @click="close">
-			<uni-icons type="closefill" :color="color" size="12" />
+			<uni-icons type="closeempty" :color="color" size="12" />
 		</view>
 		<view v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon">
 			<uni-icons type="sound" :color="color" size="14" />
 		</view>
 		<!-- #endif -->
 		<!-- #ifndef MP-ALIPAY -->
-		<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" type="closefill" :color="color" size="12" @click="close" />
+		<uni-icons v-if="showClose === true || showClose === 'true'" class="uni-noticebar-close" type="closeempty" :color="color" size="12" @click="close" />
 		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound" :color="color" size="14" />
 		<!-- #endif -->
 		<view ref="textBox" class="uni-noticebar__content-wrapper" :class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
diff --git a/components/uni-tag/uni-tag.vue b/components/uni-tag/uni-tag.vue
@@ -54,22 +54,22 @@
 			disabled: {
 				// 是否为禁用状态
 				type: [Boolean, String],
-				defalut: false
+				default: false
 			},
 			inverted: {
 				// 是否为空心
 				type: [Boolean, String],
-				defalut: false
+				default: false
 			},
 			circle: {
 				// 是否为圆角样式
 				type: [Boolean, String],
-				defalut: false
+				default: false
 			},
 			mark: {
 				// 是否为标记样式
 				type: [Boolean, String],
-				defalut: false
+				default: false
 			}
 		},
 		methods: {
diff --git a/pages.json b/pages.json
@@ -253,8 +253,8 @@
 		},
 		// #ifndef H5 || MP-BAIDU
 		{
-			"path" : "pages/component/ad/ad",
-			"style" : {
+			"path": "pages/component/ad/ad",
+			"style": {
 				"navigationBarTitleText": "AD"
 			}
 		},
@@ -616,8 +616,8 @@
 				},
 				// #ifdef APP-PLUS || MP-WEIXIN
 				{
-					"path" : "rewarded-video-ad/rewarded-video-ad",
-					"style" : {
+					"path": "rewarded-video-ad/rewarded-video-ad",
+					"style": {
 						"navigationBarTitleText": "激励视频广告"
 					}
 				},
@@ -1182,4 +1182,4 @@
 			}
 		]
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -253,8 +253,8 @@`
`253`	`253`	`},`
`254`	`254`	`// #ifndef H5 \|\| MP-BAIDU`
`255`	`255`	`{`
`256`		`- "path" : "pages/component/ad/ad",`
`257`		`- "style" : {`
	`256`	`+ "path": "pages/component/ad/ad",`
	`257`	`+ "style": {`
`258`	`258`	`"navigationBarTitleText": "AD"`
`259`	`259`	`}`
`260`	`260`	`},`
`@@ -616,8 +616,8 @@`
`616`	`616`	`},`
`617`	`617`	`// #ifdef APP-PLUS \|\| MP-WEIXIN`
`618`	`618`	`{`
`619`		`- "path" : "rewarded-video-ad/rewarded-video-ad",`
`620`		`- "style" : {`
	`619`	`+ "path": "rewarded-video-ad/rewarded-video-ad",`
	`620`	`+ "style": {`
`621`	`621`	`"navigationBarTitleText": "激励视频广告"`
`622`	`622`	`}`
`623`	`623`	`},`
`@@ -1182,4 +1182,4 @@`
`1182`	`1182`	`}`
`1183`	`1183`	`]`
`1184`	`1184`	`}`
`1185`		`-}`
	`1185`	`+}`