修改以适应nvue

wlxuqu · wlxuqu · commit ffbdf8dbcd6e · 2020-08-27T09:48:07.000+08:00
diff --git a/components/page-nav/page-nav.vue b/components/page-nav/page-nav.vue
@@ -4,19 +4,21 @@
 			<image class="logo" src="https://cdn.uviewui.com/uview/common/logo.png" mode="widthFix"></image>
 			<view class="nav-info">
 				<view class="nav-title__text">
-					{{$t('common.title')}}
+					<!-- {{$t('common.title')}} -->
+					{{title}}
 				</view>
 				<view class="nav-slogan">
-					 {{$t('common.intro')}}
+					 <!-- {{$t('common.intro')}} -->
+					 {{desc}}
 				</view>
 			</view>
 		</view>
 		<view class="nav-desc">
 			{{desc}}
 		</view>
-		<view class="lang" @tap="switchLang">
+		<!-- <view class="lang" @tap="switchLang">
 			<u-icon size="46" color="warning" :name="lang"></u-icon>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -27,20 +29,20 @@
 			title: String,
 		},
 		computed: {
-			lang() {
-				return this.$i18n.locale == 'zh' ? 'zh' : 'en';
-			}
+			// lang() {
+			// 	return this.$i18n.locale == 'zh' ? 'zh' : 'en';
+			// }
 		},
 		methods: {
-			switchLang() {
-				this.$i18n.locale = this.$i18n.locale == 'en' ? 'zh' : 'en';
-				this.vuex_tabbar[0].text = this.$t('nav.components')
-				this.vuex_tabbar[1].text = this.$t('nav.js')
-				this.vuex_tabbar[2].text = this.$t('nav.template')
-				uni.setNavigationBarTitle({
-					title: this.$t(this.title)
-				});
-			}
+			// switchLang() {
+			// 	this.$i18n.locale = this.$i18n.locale == 'en' ? 'zh' : 'en';
+			// 	this.vuex_tabbar[0].text = this.$t('nav.components')
+			// 	this.vuex_tabbar[1].text = this.$t('nav.js')
+			// 	this.vuex_tabbar[2].text = this.$t('nav.template')
+			// 	uni.setNavigationBarTitle({
+			// 		title: this.$t(this.title)
+			// 	});
+			// }
 		}
 	}
 </script>
diff --git a/pages/example/components.nvue b/pages/example/components.nvue
@@ -20,7 +20,7 @@
 		data() {
 			return {
 				list: list,
-				//desc: '众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让你快速集成，开箱即用。',
+				desc: '众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让你快速集成，开箱即用。',
 			}
 		},
 		computed: {
@@ -29,29 +29,31 @@
 					return 'https://cdn.uviewui.com/uview/example/' + path + '.png';
 				}
 			},
-			desc() {
-				return this.$t('components.desc');
-			}
+			// desc() {
+			// 	return this.$t('components.desc');
+			// }
 		},
 		onShow() {
-			uni.setNavigationBarTitle({
-				title: this.$t('nav.components')
-			});
+			// uni.setNavigationBarTitle({
+			// 	title: this.$t('nav.components')
+			// });
 		},
 		created() {
-			
+			//console.log(this.abc);   
 		},
 		methods: {
 			openPage(path) {
-				this.$u.route({
+				this.$u.route({ 
 					url: path
 				})
 			},
 			getGroupTitle(item) {
-				return this.$i18n.locale == 'zh' ? item.groupName : item.groupName_en
+				// return this.$i18n.locale == 'zh' ? item.groupName : item.groupName_en
+				return item.groupName;
 			},
 			getFieldTitle(item) {
-				return this.$i18n.locale == 'zh' ? item.title : item.title_en
+				// return this.$i18n.locale == 'zh' ? item.title : item.title_en
+				return item.title;
 			}
 		}
 	}
diff --git a/uview-ui/components/u-badge/u-badge.vue b/uview-ui/components/u-badge/u-badge.vue
@@ -141,7 +141,9 @@
 	@import "../../libs/css/style.components.scss";
 	
 	.u-badge {
+		/* #ifndef APP-NVUE */
 		display: inline-flex;
+		/* #endif */
 		justify-content: center;
 		align-items: center;
 		line-height: 24rpx;
@@ -207,7 +209,7 @@
 	// }
 	
 	.u-info {
-		background: $u-type-info;
+		background-color: $u-type-info;
 		color: #fff;
 	}
 </style>
diff --git a/uview-ui/index.js b/uview-ui/index.js
@@ -113,7 +113,7 @@ const $u = {
 }
 
 const install = Vue => {
-	Vue.mixin(mixin)
+	Vue.mixin(mixin) 
 	if (Vue.prototype.openShare) {
 		Vue.mixin(mpShare);
 	}

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ const $u = {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`const install = Vue => {`
`116`		`- Vue.mixin(mixin)`
	`116`	`+ Vue.mixin(mixin)`
`117`	`117`	`if (Vue.prototype.openShare) {`
`118`	`118`	`Vue.mixin(mpShare);`
`119`	`119`	`}`