新增多语言切换教程

common/locales/en.js

+export default {
+	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
+	components: {
+		desc: 'Numerous components cover the various requirements of the development process, and the components are rich in functions and compatible with multiple terminals. Let you integrate quickly, out of the box'
+	},
+	js: {
+		desc: 'Numerous intimate gadgets are a weapon that you can call upon during the development process, allowing you to dart in your hand and pierce the Yang with a hundred steps'
+	},
+	template: {
+		desc: 'Collection of many commonly used pages and layouts, reducing the repetitive work of developers, allowing you to focus on logic and get twice the result with half the effort'
+	},
+	nav: {
+		components: 'Comonents',
+		js: 'JS',
+		template: 'Template'
+	},
+	common: {
+		intro: 'UI framework for rapid development of multiple platforms',
+		title: 'uView UI',
+	},
+}
\ No newline at end of file

common/locales/zh.js

+export default {
+	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
+	components: {
+		desc: '众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让你快速集成，开箱即用'
+	},
+	js: {
+		desc: '众多的贴心小工具，是你开发过程中召之即来的利器，让你飞镖在手，百步穿杨'
+	},
+	template: {
+		desc: '收集众多的常用页面和布局，减少开发者的重复工作，让你专注逻辑，事半功倍'
+	},
+	nav: {
+		components: '组件',
+		js: '工具',
+		template: '模板'
+	},
+	common: {
+		intro: '多平台快速开发的UI框架',
+		title: 'uView UI',
+	},
+}
\ No newline at end of file

components/page-nav/page-nav.vue

@@ -4,23 +4,43 @@
 			<image class="logo" src="https://cdn.uviewui.com/uview/common/logo.png" mode="widthFix"></image>
 			<view class="nav-info">
 				<view class="nav-title__text">
-					uView UI
+					{{$t('common.title')}}
 				</view>
 				<view class="nav-slogan">
-					 多平台快速开发的UI框架
+					 {{$t('common.intro')}}
 				</view>
 			</view>
 		</view>
 		<view class="nav-desc">
 			{{desc}}
 		</view>
+		<view class="lang" @tap="switchLang">
+			<u-icon size="46" color="warning" :name="lang"></u-icon>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
 		props: {
-			desc: String
+			desc: String,
+			title: String,
+		},
+		computed: {
+			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)
+				});
+			}
 		}
 	}
 </script>
@@ -28,6 +48,13 @@
 <style lang="scss" scoped>
 	.nav-wrap {
 		padding: 30rpx;
+		position: relative;
+	}
+	
+	.lang {
+		position: absolute;
+		top: 30rpx;
+		right: 30rpx;
 	}
 	
 	.nav-title {
@@ -48,6 +75,7 @@
 	
 	.logo {
 		width: 140rpx;
+		flex: 0 0 140rpx;
 		height: auto;
 	}
 	

main.js

@@ -29,9 +29,34 @@ Vue.mixin(vuexStore)
 let mpShare = require('uview-ui/libs/mixin/mpShare.js');
 Vue.mixin(mpShare)
 
+// i18n部分的配置
+// 引入语言包，注意路径
+import Chinese from '@/common/locales/zh.js';
+import English from '@/common/locales/en.js';
+
+// VueI18n
+import VueI18n from 'vue-i18n'
+
+// VueI18n
+Vue.use(VueI18n)
+
+const i18n = new VueI18n({
+	// 默认语言
+	locale: 'zh',
+	// 引入语言文件
+	messages: {
+		'zh': Chinese,
+		'en': English,
+	}
+})
+
+// 由于微信小程序的运行机制问题，需声明如下一行，H5和APP非必填
+Vue.prototype._i18n = i18n
+
 const app = new Vue({
-  store,
-  ...App
+	i18n,
+	store,
+	...App
 })
 
 // http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用
@@ -43,4 +68,3 @@ import httpApi from '@/common/http.api.js'
 Vue.use(httpApi, app)
 
 app.$mount()
-

manifest.json

@@ -2,7 +2,7 @@
     "name" : "uView",
     "appid" : "__UNI__60F4B81",
     "description" : "多平台快速开发的UI框架",
-    "versionName" : "1.5.8",
+    "versionName" : "1.6.0",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

package-lock.json

+{
+  "name": "uView",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "vue-i18n": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",
+      "integrity": "sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg=="
+    }
+  }
+}

package.json

+{
+  "name": "uView",
+  "version": "1.0.0",
+  "description": "<p align=\"center\">\r     <img alt=\"logo\" src=\"https://uviewui.com/common/logo.png\" width=\"120\" height=\"120\" style=\"margin-bottom: 10px;\">\r </p>\r <h3 align=\"center\" style=\"margin: 30px 0 30px;font-weight: bold;font-size:40px;\">uView</h3>\r <h3 align=\"center\">多平台快速开发的UI框架</h3>",
+  "main": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/YanxinNet/uView.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/YanxinNet/uView/issues"
+  },
+  "homepage": "https://github.com/YanxinNet/uView#readme",
+  "dependencies": {
+    "vue-i18n": "^8.20.0"
+  }
+}

pages.json

@@ -2,14 +2,14 @@
 	"easycom": {
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
-	// "condition": { //模式配置，仅开发期间生效
-	// 	"current": 0, //当前激活的模式(list 的索引项)
-	// 	"list": [{
-	// 		"name": "test", //模式名称
-	// 		"path": "pages/componentsC/test/index", //启动页面，必选
-	// 		"query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
-	// 	}]
-	// },
+	"condition": { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [{
+			"name": "test", //模式名称
+			"path": "pages/componentsC/test/index", //启动页面，必选
+			"query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
+		}]
+	},
 	"pages": [
 		// 演示-组件
 		{
@@ -61,9 +61,9 @@
 				{
 					"path": "test/index",
 					"style": {
-						// "navigationBarTitleText": "navbar-自定义导航栏",
-						"navigationStyle": "custom" ,// 隐藏系统导航栏
-						"navigationBarTextStyle": "white" // 状态栏字体为白色
+						"navigationBarTitleText": "navbar-自定义导航栏"
+						// "navigationStyle": "custom" ,// 隐藏系统导航栏
+						// "navigationBarTextStyle": "white" // 状态栏字体为白色
 					}
 				},
 				// gap-间隔槽

pages/componentsB/image/index.vue

@@ -3,7 +3,7 @@
 		<view class="u-demo-wrap">
 			<view class="u-demo-title">演示效果</view>
 			<view class="u-demo-area u-flex u-row-center">
-				<u-image border-radius="100%" :shape="shape" ref="uImage" :width="width" :height="height" :src="src" mode="aspectFill">
+				<u-image :shape="shape" ref="uImage" :width="width" :height="height" :src="src" mode="aspectFill">
 					<u-loading size="44" mode="flower" slot="loading" v-if="loadingSlot"></u-loading>
 					<view v-if="errorSlot" slot="error" style="font-size: 24rpx;">加载失败</view>
 				</u-image>

pages/componentsC/test/index.vue

 <template>
-	<view style="padding-top: 200px;">
-		<u-button @click="show = true" :custom-style="{
-			color: 'red',
-			borderColor: 'blue'
-		}">打开</u-button>
+	<view style="margin-top: 200rpx;">
 	</view>
 </template>
 
@@ -11,29 +7,17 @@
 	export default {
 		data() {
 			return {
-				show: true,
-				list: [{
-					name: '待收货'
-				}, {
-					name: '待付款'
-				}, {
-					name: '待评价'
-				}],
-				current: 0
+				// 错误示例，切换语言时，这个intro并不会自动更新到视图
+				// intro: this.$t('lang.intro')
 			}
 		},
-		onLoad() {
-			// setTimeout(() => {
-			// 	this.show = false;
-			// }, 2000)
+		computed: {
+			// 正确用法
+			
 		},
-		methods: {
-			close() {
-				//console.log('close');
-			},
-			change(index) {
-				this.current = index;
-			}
-		}
+		onShow() {
+			
+		},
+		
 	}
-</script>
+</script>
\ No newline at end of file

pages/example/components.config.js

+
 export default [{
 		groupName: '基础组件',
+		groupName_en: 'Basic components',
 		list: [{
 			path: '/pages/componentsC/color/index',
 			icon: 'color',
 			title: 'Color 色彩',
+			title_en: 'Color',
 		}, {
 			path: '/pages/componentsA/icon/index',
 			icon: 'icon',
 			title: 'Icon 图标',
+			title_en: 'Icon',
 		},{
 			path: '/pages/componentsB/image/index',
 			icon: 'image',
 			title: 'Image 图片',
+			title_en: 'Image',
 		}, {
 			path: '/pages/componentsC/button/index',
 			icon: 'button',
 			title: 'Button 按钮',
+			title_en: 'Button',
 		}, {
 			path: '/pages/componentsC/layout/index',
 			icon: 'layout',
 			title: 'Layout 布局',
+			title_en: 'Layout',
 		}, {
 			path: '/pages/componentsC/cell/index',
 			icon: 'cell',
 			title: 'Cell 单元格',
+			title_en: 'Cell',
 		}, {
 			path: '/pages/componentsC/badge/index',
 			icon: 'badge',
 			title: 'Badge 徽标数',
+			title_en: 'Badge',
 		}, {
 			path: '/pages/componentsA/tag/index',
 			icon: 'tag',
 			title: 'Tag 标签',
+			title_en: 'Tag',
 		}]
 	},
 	{
 		groupName: '表单组件',
+		groupName_en: 'Form components',
 		list: [{
 			path: '/pages/componentsA/form/index',
 			icon: 'form',
 			title: 'Form 表单',
+			title_en: 'Form',
 		}, {
 			path: '/pages/componentsA/calendar/index',
 			icon: 'calendar',
 			title: 'Calendar 日历',
+			title_en: 'Calendar',
 		}, {
 			path: '/pages/componentsA/select/index',
 			icon: 'select',
 			title: 'Select 列选择器',
+			title_en: 'Select',
 		}, {
 			path: '/pages/componentsA/keyboard/index',
 			icon: 'keyboard',
 			title: 'Keyboard 键盘',
+			title_en: 'Keyboard',
 		}, {
 			path: '/pages/componentsB/picker/index',
 			icon: 'picker',
 			title: 'Picker 选择器',
+			title_en: 'Picker',
 		}, {
 			path: '/pages/componentsB/rate/index',
 			icon: 'rate',
 			title: 'Rate 评分',
+			title_en: 'Rate',
 		}, {
 			path: '/pages/componentsB/search/index',
 			icon: 'search',
 			title: 'Search 搜索',
+			title_en: 'Search',
 		}, {
 			path: '/pages/componentsC/numberBox/index',
 			icon: 'numberBox',
 			title: 'NumberBox 步进器',
+			title_en: 'NumberBox',
 		}, {
 			path: '/pages/componentsB/upload/index',
 			icon: 'upload',
 			title: 'Upload 上传',
+			title_en: 'Upload',
 		}, {
 			path: '/pages/componentsA/verificationCode/index',
 			icon: 'verificationCode',
 			title: 'VerificationCode 验证码倒计时',
+			title_en: 'VerificationCode',
 		}, {
 			path: '/pages/componentsA/field/index',
 			icon: 'field',
 			title: 'Field 输入框',
+			title_en: 'Field',
 		}, {
 			path: '/pages/componentsB/checkbox/index',
 			icon: 'checkbox',
 			title: 'Checkbox 复选框',
+			title_en: 'Checkbox',
 		}, {
 			path: '/pages/componentsB/radio/index',
 			icon: 'radio',
 			title: 'Radio 单选框',
+			title_en: 'Radio',
 		}, {
 			path: '/pages/componentsB/switch/index',
 			icon: 'switch',
 			title: 'Switch 开关选择器',
+			title_en: 'Switch',
 		}, {
 			path: '/pages/componentsA/slider/index',
 			icon: 'slider',
 			title: 'Slider 滑动选择器',
+			title_en: 'Slider',
 		}]
 	}, {
 		groupName: '数据组件',
+		groupName_en: 'Data components',
 		list: [{
 			path: '/pages/componentsC/progress/index',
 			icon: 'progress',
 			title: 'Progress 进度条',
+			title_en: 'Progress',
 		}, {
 			path: '/pages/componentsB/table/index',
 			icon: 'table',
 			title: 'Table 表格',
+			title_en: 'Table',
 		}, {
 			path: '/pages/componentsC/countDown/index',
 			icon: 'countDown',
 			title: 'CountDown 倒计时',
+			title_en: 'CountDown',
 		}, {
 			path: '/pages/componentsC/countTo/index',
 			icon: 'countTo',
 			title: 'CountTo 数字滚动',
+			title_en: 'CountTo',
 		}]
 	}, {
 		groupName: '反馈组件',
+		groupName_en: 'Feedback components',
 		list: [{
 			path: '/pages/componentsC/actionSheet/index',
 			icon: 'actionSheet',
 			title: 'ActionSheet 操作菜单',
+			title_en: 'ActionSheet',
 		}, {
 			path: '/pages/componentsC/alertTips/index',
 			icon: 'alertTips',
 			title: 'AlertTips 警告提示',
+			title_en: 'AlertTips',
 		}, {
 			path: '/pages/componentsA/toast/index',
 			icon: 'toast',
 			title: 'Toast 消息提示',
+			title_en: 'Toast',
 		}, {
 			path: '/pages/componentsB/noticeBar/index',
 			icon: 'noticeBar',
 			title: 'NoticeBar 滚动通知',
+			title_en: 'NoticeBar',
 		}, {
 			path: '/pages/componentsA/topTips/index',
 			icon: 'topTips',
 			title: 'TopTips 顶部提示',
+			title_en: 'TopTips',
 		}, {
 			path: '/pages/componentsB/swipeAction/index',
 			icon: 'swipeAction',
 			title: 'SwipeAction 滑动单元格',
+			title_en: 'SwipeAction',
 		}, {
 			path: '/pages/componentsC/collapse/index',
 			icon: 'collapse',
 			title: 'Collapse 折叠面板',
+			title_en: 'Collapse',
 		}, {
 			path: '/pages/componentsC/popup/index',
 			icon: 'popup',
 			title: 'Popup 弹出层',
+			title_en: 'Popup',
 		}, {
 			path: '/pages/componentsA/modal/index',
 			icon: 'modal',
 			title: 'Modal 模态框',
+			title_en: 'Modal',
 		}, {
 			path: '/pages/componentsA/fullScreen/index',
 			icon: 'pressingScreen',
 			title: 'fullScreen 压窗屏',
+			title_en: 'fullScreen',
 		}]
 	}, {
 		groupName: '布局组件',
+		groupName_en: 'Layout components',
 		list: [{
 			path: '/pages/componentsB/line/index',
 			icon: 'line',
 			title: 'Line 线条',
+			title_en: 'Line',
 		}, {
 			path: '/pages/componentsB/card/index',
 			icon: 'card',
 			title: 'Card 卡片',
+			title_en: 'Card',
 		}, {
 			path: '/pages/componentsC/mask/index',
 			icon: 'mask',
 			title: 'Mask 遮罩层',
+			title_en: 'Mask',
 		}, {
 			path: '/pages/componentsA/noNetwork/index',
 			icon: 'noNetwork',
 			title: 'NoNetwork 无网络提示',
+			title_en: 'NoNetwork',
 		}, {
 			path: '/pages/componentsC/grid/index',
 			icon: 'grid',
 			title: 'Grid 宫格布局',
+			title_en: 'Grid',
 		}, {
 			path: '/pages/componentsB/swiper/index',
 			icon: 'swiper',
 			title: 'Swiper 轮播图',
+			title_en: 'Swiper',
 		}, {
 			path: '/pages/componentsA/timeLine/index',
 			icon: 'timeLine',
 			title: 'TimeLine 时间轴',
+			title_en: 'TimeLine',
 		}, {
 			path: '/pages/componentsB/skeleton/index',
 			icon: 'skeleton',
 			title: 'Skeleton 骨架屏',
+			title_en: 'Skeleton',
 		}, {
 			path: '/pages/componentsB/sticky/index',
 			icon: 'sticky',
 			title: 'Sticky 吸顶',
+			title_en: 'Sticky',
 		}, 
 		{
 			path: '/pages/componentsB/waterfall/index',
 			icon: 'waterfall',
 			title: 'Waterfall 瀑布流',
+			title_en: 'Waterfall',
 		},
 		{
 			path: '/pages/componentsB/divider/index',
 			icon: 'divider',
 			title: 'Divider 分割线',
+			title_en: 'Divider',
 		}]
 	}, {
 		groupName: '导航组件',
+		groupName_en: 'Navigation components',
 		list: [{
 			path: '/pages/componentsB/tabbar/index',
 			icon: 'tabbar',
 			title: 'Tabbar 底部导航栏',
+			title_en: 'Tabbar',
 		},{
 			path: '/pages/componentsA/backTop/index',
 			icon: 'backTop',
 			title: 'BackTop 返回顶部',
+			title_en: 'BackTop',
 		},{
 			path: '/pages/componentsA/navbar/index',
 			icon: 'navbar',
 			title: 'Navbar 导航栏',
+			title_en: 'Navbar',
 		}, {
 			path: '/pages/componentsA/tabs/index',
 			icon: 'tabs',
 			title: 'Tabs 标签',
+			title_en: 'Tabs',
 		}, 
 		// #ifndef MP-ALIPAY
 		{
 			path: '/pages/template/order/index',
 			icon: 'tabsSwiper',
 			title: 'TabsSwiper 全屏选项卡',
+			title_en: 'TabsSwiper',
 		},
 		// #endif
 		{
 			path: '/pages/componentsC/subsection/index',
 			icon: 'subsection',
 			title: 'Subsection 分段器',
+			title_en: 'Subsection',
 		}, {
 			path: '/pages/componentsA/indexList/index',
 			icon: 'indexList',
 			title: 'IndexList 索引列表',
+			title_en: 'IndexList',
 		}, {
 			path: '/pages/componentsB/steps/index',
 			icon: 'steps',
 			title: 'Steps 步骤条',
+			title_en: 'Steps',
 		}, {
 			path: '/pages/componentsA/empty/index',
 			icon: 'empty',
 			title: 'Empty 内容为空',
+			title_en: 'Empty',
 		}, {
 			path: '/pages/componentsC/section/index',
 			icon: 'section',
 			title: 'Section 查看更多',
+			title_en: 'Section',
 		}]
 	}, {
 		groupName: '其他组件',
+		groupName_en: 'Other components',
 		list: [{
 			path: '/pages/componentsA/parse/index',
 			icon: 'parse',
-			title: 'parse 富文本解析器',
+			title: 'Parse 富文本解析器',
+			title_en: 'Parse',
 		},{
 			path: '/pages/componentsC/messageInput/index',
 			icon: 'messageInput',
 			title: 'MessageInput 验证码输入',
+			title_en: 'MessageInput',
 		}, {
 			path: '/pages/componentsA/avatarCropper/index',
 			icon: 'avatarCropper',
 			title: 'AvatarCropper 头像裁剪',
+			title_en: 'AvatarCropper',
 		}, {
 			path: '/pages/componentsC/loadmore/index',
 			icon: 'loadmore', 
 			title: 'Loadmore 加载更多',
+			title_en: 'Loadmore',
 		}, {
 			path: '/pages/componentsB/readMore/index',
 			icon: 'readMore',
 			title: 'ReadMore 展开阅读更多',
+			title_en: 'ReadMore',
 		}, {
 			path: '/pages/componentsA/lazyLoad/index',
 			icon: 'lazyLoad',
 			title: 'LazyLoad 懒加载',
+			title_en: 'LazyLoad',
 		}, {
 			path: '/pages/componentsC/gap/index',
 			icon: 'gap',
 			title: 'Gap 间隔槽',
+			title_en: 'Gap',
 		}, {
 			path: '/pages/componentsA/avatar/index',
 			icon: 'avatar',
 			title: 'Avatar 头像',
+			title_en: 'Avatar',
 		}, {
 			path: '/pages/componentsC/link/index',
 			icon: 'link',
 			title: 'Link 超链接',
+			title_en: 'Link',
 		}, {
 			path: '/pages/componentsB/loading/index',
 			icon: 'loading',
-			title: 'loading 加载动画',
+			title: 'Loading 加载动画',
+			title_en: 'Loading',
 		}]
 	},
 ]

pages/example/components.vue

 <template>
 	<view class="wrap">
-		<page-nav :desc="desc"></page-nav>
+		<page-nav :desc="desc" title="nav.components"></page-nav>
 		<view class="list-wrap">
-			<u-cell-group title-bg-color="rgb(243, 244, 246)" :title="item.groupName" v-for="(item, index) in list" :key="index">
-				<u-cell-item :titleStyle="{fontWeight: 500}" @click="openPage(item1.path)" :title="item1.title" v-for="(item1, index1) in item.list" :key="index1">
+			<u-cell-group title-bg-color="rgb(243, 244, 246)" :title="getGroupTitle(item)" v-for="(item, index) in list" :key="index">
+				<u-cell-item :titleStyle="{fontWeight: 500}" @click="openPage(item1.path)" :title="getFieldTitle(item1)"
+				 v-for="(item1, index1) in item.list" :key="index1">
 					<image slot="icon" class="u-cell-icon" :src="getIcon(item1.icon)" mode="widthFix"></image>
 				</u-cell-item>
 			</u-cell-group>
@@ -19,7 +20,7 @@
 		data() {
 			return {
 				list: list,
-				desc: '众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让你快速集成，开箱即用。',
+				//desc: '众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让你快速集成，开箱即用。',
 			}
 		},
 		computed: {
@@ -27,16 +28,30 @@
 				return path => {
 					return 'https://cdn.uviewui.com/uview/example/' + path + '.png';
 				}
+			},
+			desc() {
+				return this.$t('components.desc');
 			}
 		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.$t('nav.components')
+			});
+		},
 		created() {
-			
+
 		},
 		methods: {
 			openPage(path) {
 				this.$u.route({
 					url: path
 				})
+			},
+			getGroupTitle(item) {
+				return this.$i18n.locale == 'zh' ? item.groupName : item.groupName_en
+			},
+			getFieldTitle(item) {
+				return this.$i18n.locale == 'zh' ? item.title : item.title_en
 			}
 		}
 	}

pages/example/js.config.js

 export default [
 	{
 		groupName: '网络',
+		groupName_en: 'Network',
 		list: [
 			{
 				path: 'http',
 				icon: 'http',
 				title: 'Http 请求',
+				title_en: 'Http',
 			}
 		]
 	},
 	{
 		groupName: '全局变量',
+		groupName_en: 'Global variable',
 		list: [
 			{
 				path: 'globalVariable',
 				icon: 'globalVariable',
 				title: 'GlobalVariable 全局变量',
+				title_en: 'GlobalVariable',
 			}
 		]
 	},
 	{
 		groupName: '工具库',
+		groupName_en: 'Tool library',
 		list: [
 			{
 				path: 'debounce',
 				icon: 'debounce',
-				title: 'throttle | debounce 节流防抖',
+				title: 'Throttle | Debounce 节流防抖',
+				title_en: 'Throttle | Debounce',
 			},
 			{
 				path: 'deepMerge',
 				icon: 'deepMerge',
-				title: 'deepMerge 对象深度合并',
+				title: 'DeepMerge 对象深度合并',
+				title_en: 'DeepMerge',
 			},{
 				path: 'deepClone',
 				icon: 'deepClone',
-				title: 'deepClone 对象深度克隆',
+				title: 'DeepClone 对象深度克隆',
+				title_en: 'DeepClone',
 			},
 			{
 				path: 'timeFormat',
 				icon: 'timeFormat',
 				title: 'TimeFormat 时间格式化',
+				title_en: 'TimeFormat',
 			},{
 				path: 'timeFrom',
 				icon: 'timeFrom',
-				title: 'timeFrom 多久之前',
+				title: 'TimeFrom 多久之前',
+				title_en: 'TimeFrom',
 			},{
 				path: 'guid',
 				icon: 'guid',
 				title: 'Guid 全局唯一id',
+				title_en: 'Guid',
 			},{
 				path: 'route',
 				icon: 'route',
 				title: 'Route 路由跳转',
+				title_en: 'Route',
 			},{
 				path: 'randomArray',
 				icon: 'randomArray',
 				title: 'RandomArray 数组乱序',
+				title_en: 'RandomArray',
 			},{
 				path: 'colorSwitch',
 				icon: 'colorSwitch',
 				title: 'ColorSwitch 颜色转换',
+				title_en: 'ColorSwitch',
 			},{
 				path: 'color',
 				icon: 'color',
 				title: 'Color 颜色值',
+				title_en: 'Color',
 			},{
 				path: 'queryParams',
 				icon: 'queryParams',
 				title: 'QueryParams 对象转URL参数',
+				title_en: 'QueryParams',
 			},{
 				path: 'test',
 				icon: 'test',
 				title: 'Test 规则校验',
+				title_en: 'Test',
 			},{
 				path: 'md5',
 				icon: 'md5',
 				title: 'Md5 md5加密',
+				title_en: 'Md5',
 			},{
 				path: 'random',
 				icon: 'random',
 				title: 'Random 随机数值',
+				title_en: 'Random',
 			},{
 				path: 'trim',
 				icon: 'trim',
 				title: 'Trim 去除空格',
+				title_en: 'Trim',
 			},{
 				path: 'getRect',
 				icon: 'getRect',
 				title: 'GetRect 节点信息',
+				title_en: 'GetRect',
 			},{
 				path: 'mpShare',
 				icon: 'mpShare',
 				title: 'MpShare 小程序分享',
+				title_en: 'MpShare',
 			}
 		]
 	}

pages/example/js.vue

 <template>
 	<view class="wrap">
-		<page-nav :desc="desc"></page-nav>
+		<page-nav :desc="desc" title="nav.js"></page-nav>
 		<view class="list-wrap">
-			<u-cell-group title-bg-color="rgb(243, 244, 246)" :title="item.groupName" v-for="(item, index) in list" :key="index">
-				<u-cell-item :titleStyle="{fontWeight: 500}" @click="openPage(item1.path)" :title="item1.title" v-for="(item1, index1) in item.list" :key="index1">
+			<u-cell-group title-bg-color="rgb(243, 244, 246)" :title="getGroupTitle(item)" v-for="(item, index) in list" :key="index">
+				<u-cell-item :titleStyle="{fontWeight: 500}" @click="openPage(item1.path)" :title="getFieldTitle(item1)"
+				 v-for="(item1, index1) in item.list" :key="index1">
 					<image slot="icon" class="u-cell-icon" :src="getIcon(item1.icon)" mode="widthFix"></image>
 				</u-cell-item>
 			</u-cell-group>
@@ -19,7 +20,7 @@
 		data() {
 			return {
 				list: list,
-				desc: '众多的贴心小工具，是你开发过程中召之即来的利器，让你飞镖在手，百步穿杨'
+				// desc: '众多的贴心小工具，是你开发过程中召之即来的利器，让你飞镖在手，百步穿杨'
 			}
 		},
 		computed: {
@@ -27,13 +28,27 @@
 				return path => {
 					return 'https://cdn.uviewui.com/uview/example/' + path + '.png';
 				}
+			},
+			desc() {
+				return this.$t('js.desc');
 			}
 		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.$t('nav.js')
+			});
+		},
 		methods: {
 			openPage(path) {
 				this.$u.route({
 					url: '/pages/library/' + path + '/index'
 				})
+			},
+			getGroupTitle(item) {
+				return this.$i18n.locale == 'zh' ? item.groupName : item.groupName_en
+			},
+			getFieldTitle(item) {
+				return this.$i18n.locale == 'zh' ? item.title : item.title_en
 			}
 		}
 	}

pages/example/template.config.js

 export default [
 	{
 		groupName: '部件',
+		groupName_en: 'Parts',
 		list: [
 			{
 				path: 'coupon',
 				icon: 'coupon',
 				title: 'Coupon 优惠券',
+				title_en: 'Coupon',
 			}
 		]
 	},
 	{
 		groupName: '页面',
+		groupName_en: 'Page',
 		list: [
 			{
 				path: '/pages/template/wxCenter/index',
 				icon: 'wxCenter',
 				title: 'WxCenter 仿微信个人中心',
+				title_en: 'WxCenter',
 			},
 			// {
 			// 	path: '/pages/template/douyin/index',
@@ -26,39 +30,48 @@ export default [
 				path: '/pages/template/keyboardPay/index',
 				icon: 'keyboardPay',
 				title: 'KeyboardPay 自定义键盘支付模板',
+				title_en: 'KeyboardPay',
 			},
 			{
 				path: '/pages/template/mallMenu/index1',
 				icon: 'mall_menu_1',
 				title: 'MallMenu 垂直分类(左右独立)',
+				title_en: 'MallMenu 1',
 			},{
 				path: '/pages/template/mallMenu/index2',
 				icon: 'mall_menu_2',
 				title: 'MallMenu 垂直分类(左右联动)',
+				title_en: 'MallMenu 2',
 			},{
 				path: 'submitBar',
 				icon: 'submitBar',
 				title: 'SubmitBar 提交订单栏',
+				title_en: 'SubmitBar',
 			},{
 				path: 'comment',
 				icon: 'comment',
 				title: 'Comment 评论列表',
+				title_en: 'Comment',
 			},{
 				path: 'order',
 				icon: 'order',
 				title: 'Order 订单列表',
+				title_en: 'Order',
 			},{
 				path: 'login',
 				icon: 'login',
 				title: 'Login 登录界面',
+				title_en: 'Login',
 			},{
 				path: 'address',
 				icon: 'address',
 				title: 'Address 收货地址',
+				title_en: 'Address',
 			},{
 				path: 'citySelect',
 				icon: 'citySelect',
-				title: 'citySelect 城市选择',
+				title: 'CitySelect 城市选择',
+				title_en: 'CitySelect',
 			}
 		]
 	}

pages/example/template.vue

 <template>
 	<view class="wrap">
-		<page-nav :desc="desc"></page-nav>
+		<page-nav :desc="desc" title="nav.template"></page-nav>
 		<view class="list-wrap">
-			<u-cell-group title-bg-color="rgb(243, 244, 246)" :title="item.groupName" v-for="(item, index) in list" :key="index">
-				<u-cell-item :titleStyle="{fontWeight: 500}" @click="openPage(item1.path)" :title="item1.title" v-for="(item1, index1) in item.list" :key="index1">
+			<u-cell-group title-bg-color="rgb(243, 244, 246)" :title="getGroupTitle(item)" v-for="(item, index) in list" :key="index">
+				<u-cell-item :titleStyle="{fontWeight: 500}" @click="openPage(item1.path)" :title="getFieldTitle(item1)"
+				 v-for="(item1, index1) in item.list" :key="index1">
 					<image slot="icon" class="u-cell-icon" :src="getIcon(item1.icon)" mode="widthFix"></image>
 				</u-cell-item>
 			</u-cell-group>
@@ -19,7 +20,7 @@
 		data() {
 			return {
 				list: list,
-				desc: '收集众多的常用页面和布局，减少开发者的重复工作，让你专注逻辑，事半功倍'
+				// desc: '收集众多的常用页面和布局，减少开发者的重复工作，让你专注逻辑，事半功倍'
 			}
 		},
 		computed: {
@@ -27,13 +28,27 @@
 				return path => {
 					return 'https://cdn.uviewui.com/uview/example/' + path + '.png';
 				}
+			},
+			desc() {
+				return this.$t('template.desc');
 			}
 		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.$t('nav.template')
+			});
+		},
 		methods: {
 			openPage(path) {
 				this.$u.route({
 					url: path.indexOf('/page') == 0 ? path : '/pages/template/' + path + '/index'
 				})
+			},
+			getGroupTitle(item) {
+				return this.$i18n.locale == 'zh' ? item.groupName : item.groupName_en
+			},
+			getFieldTitle(item) {
+				return this.$i18n.locale == 'zh' ? item.title : item.title_en
 			}
 		}
 	}

pages/template/order/index.vue

@@ -348,7 +348,7 @@ export default {
 		// tab栏切换
 		change(index) {
 			this.swiperCurrent = index;
-			this.getOrderList();
+			this.getOrderList(index);
 		},
 		transition({ detail: { dx } }) {
 			this.$refs.tabs.setDx(dx);

uview-ui/components/u-alert-tips/u-alert-tips.vue

@@ -142,7 +142,7 @@
 			},
 			uIcon() {
 				// 如果有设置icon名称就使用，否则根据type主题，推定一个默认的图标
-				return this.icon ? this.icon : this.$u.type2icon(type);
+				return this.icon ? this.icon : this.$u.type2icon(this.type);
 			},
 			uIconType() {
 				// 如果有设置图标的样式，优先使用，没有的话，则用type的样式

uview-ui/components/u-avatar/u-avatar.vue

@@ -122,7 +122,13 @@
         watch: {
             src(n) {
                 // 用户可能会在头像加载失败时，再次修改头像值，所以需要重新赋值
-                this.avatar = n;
+                if(!n) {
+					// 如果传入null或者''，或者undefined，显示默认头像
+					this.error = true;
+				} else {
+					this.avatar = n;
+					this.error = false;
+				}
             }
         },
 		computed: {

uview-ui/components/u-back-top/u-back-top.vue

@@ -6,9 +6,9 @@
 		zIndex: uZIndex,
 		opacity: opacity
 	}, customStyle]">
-		<view class="" v-if="!$slots.default">
+		<view class="u-back-top__content" v-if="!$slots.default">
 			<u-icon @click="backToTop" :name="icon" :custom-style="iconStyle"></u-icon>
-			<view class="u-back-top__tips">
+			<view class="u-back-top__content__tips">
 				{{tips}}
 			</view>
 		</view>
@@ -138,10 +138,16 @@
 		align-items: center;
 		transition: opacity 0.4s;
 		
-		&__tips {
-			font-size: 24rpx;
-			transform: scale(0.8);
-			line-height: 1;
+		&__content {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			
+			&__tips {
+				font-size: 24rpx;
+				transform: scale(0.8);
+				line-height: 1;
+			}
 		}
 	}
 </style>

uview-ui/components/u-form-item/u-form-item.vue

@@ -4,9 +4,9 @@
 			flexDirection: elLabelPosition == 'left' ? 'row' : 'column'
 		}">
 			<!-- 微信小程序中，将一个参数设置空字符串，结果会变成字符串"true" -->
-			<view class="u-form-item--left" v-if="label !== '' && label !== 'true'" :style="{
-				width: elLabelPosition == 'left' ? $u.addUnit(elLabelWidth) : '100%',
-				flex: `0 0 ${elLabelPosition == 'left' ? $u.addUnit(elLabelWidth) : '100%'}`,
+			<view class="u-form-item--left" :style="{
+				width: uLabelWidth,
+				flex: `0 0 ${uLabelWidth}`,
 				marginBottom: elLabelPosition == 'left' ? 0 : '10rpx',
 			}">
 				<!-- 为了块对齐 -->
@@ -169,6 +169,11 @@ export default {
 		},
 	},
 	computed: {
+		// 计算后的label宽度，由于需要多个判断，故放到computed中
+		uLabelWidth() {
+			// 如果用户设置label为空字符串(微信小程序空字符串最终会变成字符串的'true')，意味着要将label的位置宽度设置为auto
+			return this.elLabelPosition == 'left' ? (this.label === 'true' || this.label === '' ? 'auto' : this.$u.addUnit(this.elLabelWidth)) : '100%';
+		},
 		fieldValue() {
 			return this.uForm.model[this.prop];
 		},

uview-ui/components/u-image/u-image.vue

@@ -161,6 +161,16 @@ export default {
 			backgroundStyle: {}
 		};
 	},
+	watch: {
+		src(n) {
+			if(!n) {
+				// 如果传入null或者''，或者false，或者undefined，标记为错误状态
+				this.isError = true;
+			} else {
+				this.isError = false;
+			}
+		}
+	},
 	computed: {
 		wrapStyle() {
 			let style = {};

uview-ui/components/u-lazy-load/u-lazy-load.vue

@@ -136,7 +136,13 @@
 			},
 			// 图片路径发生变化时，需要重新标记一些变量，否则会一直卡在某一个状态，比如isError
 			image(n) {
-				this.init();
+				if(!n) {
+					// 如果传入null或者''，或者undefined，标记为错误状态
+					this.isError = true;
+				} else {
+					this.init();
+					this.isError = false;
+				}
 			}
 		},
 		methods: {

uview-ui/components/u-modal/u-modal.vue

@@ -15,11 +15,14 @@
 					 :style="[cancelBtnStyle]" @tap="cancel">
 						{{cancelText}}
 					</view>
-					<view v-if="showConfirmButton" :hover-stay-time="100" :hover-class="asyncClose ? 'none' : 'u-model__btn--hover'"
+					<view v-if="showConfirmButton || $slots['confirm-button']" :hover-stay-time="100" :hover-class="asyncClose ? 'none' : 'u-model__btn--hover'"
 					 class="u-model__footer__button hairline-left" :style="[confirmBtnStyle]" @tap="confirm">
-						<u-loading mode="circle" :color="confirmColor" v-if="loading"></u-loading>
+						<slot v-if="$slots['confirm-button']" name="confirm-button"></slot>
 						<block v-else>
-							{{confirmText}}
+							<u-loading mode="circle" :color="confirmColor" v-if="loading"></u-loading>
+							<block v-else>
+								{{confirmText}}
+							</block>
 						</block>
 					</view>
 				</view>

uview-ui/components/u-number-box/u-number-box.vue

@@ -145,8 +145,13 @@
 				// 只有value的改变是来自外部的时候，才去同步inputVal的值，否则会造成循环错误
 				if(!this.changeFromInner) {
 					this.inputVal = v1;
+					// 因为inputVal变化后，会触发this.handleChange()，在其中changeFromInner会再次被设置为true，
+					// 造成外面修改值，也导致被认为是内部修改的混乱，这里进行this.$nextTick延时，保证在运行周期的最后处
+					// 将changeFromInner设置为false
+					this.$nextTick(function(){
+						this.changeFromInner = false;
+					})
 				}
-				this.changeFromInner = false;
 			},
 			inputVal(v1, v2) {
 				// 为了让用户能够删除所有输入值，重新输入内容，删除所有值后，内容为空字符串

uview-ui/components/u-picker/u-picker.vue

@@ -39,37 +39,37 @@
 					</picker-view-column>
 				</picker-view>
 				<picker-view v-else-if="mode == 'time'" :value="valueArr" @change="change" class="u-picker-view" @pickstart="pickstart" @pickend="pickend">
-					<picker-view-column v-if="!reset && params.year">
+					<picker-view-column v-if="params.year">
 						<view class="u-column-item" v-for="(item, index) in years" :key="index">
 							{{ item }}
 							<text class="u-text" v-if="showTimeTag">年</text>
 						</view>
 					</picker-view-column>
-					<picker-view-column v-if="!reset && params.month">
+					<picker-view-column v-if="params.month">
 						<view class="u-column-item" v-for="(item, index) in months" :key="index">
 							{{ formatNumber(item) }}
 							<text class="u-text" v-if="showTimeTag">月</text>
 						</view>
 					</picker-view-column>
-					<picker-view-column v-if="!reset && params.day">
+					<picker-view-column v-if="params.day">
 						<view class="u-column-item" v-for="(item, index) in days" :key="index">
 							{{ formatNumber(item) }}
 							<text class="u-text" v-if="showTimeTag">日</text>
 						</view>
 					</picker-view-column>
-					<picker-view-column v-if="!reset && params.hour">
+					<picker-view-column v-if="params.hour">
 						<view class="u-column-item" v-for="(item, index) in hours" :key="index">
 							{{ formatNumber(item) }}
 							<text class="u-text" v-if="showTimeTag">时</text>
 						</view>
 					</picker-view-column>
-					<picker-view-column v-if="!reset && params.minute">
+					<picker-view-column v-if="params.minute">
 						<view class="u-column-item" v-for="(item, index) in minutes" :key="index">
 							{{ formatNumber(item) }}
 							<text class="u-text" v-if="showTimeTag">分</text>
 						</view>
 					</picker-view-column>
-					<picker-view-column v-if="!reset && params.second">
+					<picker-view-column v-if="params.second">
 						<view class="u-column-item" v-for="(item, index) in seconds" :key="index">
 							{{ formatNumber(item) }}
 							<text class="u-text" v-if="showTimeTag">秒</text>
@@ -267,7 +267,6 @@ export default {
 			startDate: '',
 			endDate: '',
 			valueArr: [],
-			reset: false,
 			provinces: provinces,
 			citys: citys[0],
 			areas: areas[0][0],
@@ -299,7 +298,6 @@ export default {
 	},
 	watch: {
 		propsChange() {
-			this.reset = true;
 			setTimeout(() => this.init(), 10);
 		},
 		// 如果地区发生变化，为了让picker联动起来，必须重置this.citys和this.areas
@@ -315,7 +313,6 @@ export default {
 		// 微信和QQ小程序由于一些奇怪的原因(故同时对所有平台均初始化一遍)，需要重新初始化才能显示正确的值
 		value(n) {
 			if (n) {
-				this.reset = true;
 				setTimeout(() => this.init(), 10);
 			}
 		}
@@ -377,7 +374,6 @@ export default {
 		},
 		init() {
 			this.valueArr = [];
-			this.reset = false;
 			if (this.mode == 'time') {
 				this.initTimeValue();
 				if (this.params.year) {
@@ -446,6 +442,9 @@ export default {
 			else if (this.params.month) index = 1;
 			else if (this.params.year) index = 1;
 			else index = 0;
+			// 当月份变化时，会导致日期的天数也会变化，如果原来选的天数大于变化后的天数，则重置为变化后的最大值
+			// 比如原来选中3月31日，调整为2月后，日期变为最大29，这时如果day值继续为31显然不合理，于是将其置为29(picker-column从1开始)
+			if(this.day > this.days.length) this.day = this.days.length;
 			this.valueArr.splice(index, 1, this.getIndex(this.days, this.day));
 		},
 		setHours() {

uview-ui/components/u-section/u-section.vue

@@ -13,13 +13,16 @@
 			</view>
 			<text class="u-flex u-section__title__text">{{title}}</text>
 		</view>
-		<view class="u-section__right-info" v-if="right" :style="{
+		<view class="u-section__right-info" v-if="right || $slots.right" :style="{
 			color: subColor
 		}" @tap="rightClick"> 
-			{{subTitle}}
-			<view class="u-section__right-info__icon-arrow u-flex">
-				<u-icon name="arrow-right" size="24" :color="subColor"></u-icon>
-			</view>
+			<slot name="right" v-if="$slots.right" />
+			<block v-else>
+				{{subTitle}}
+				<view class="u-section__right-info__icon-arrow u-flex">
+					<u-icon name="arrow-right" size="24" :color="subColor"></u-icon>
+				</view>
+			</block>
 		</view>
 	</view>
 </template>
@@ -94,7 +97,7 @@
 				return {
 					// 由于竖线为字体图标，具有比实际线宽更宽的宽度，所以也需要根据字体打下动态调整
 					left: -(Number(this.fontSize) * 0.9) + 'rpx',
-					top: -(Number(this.fontSize) * (this.$u.os == 'ios' ? 0.14 : 0.15)) + 'rpx',
+					top: -(Number(this.fontSize) * (this.$u.os() == 'ios' ? 0.14 : 0.15)) + 'rpx',
 				}
 			}
 		},

uview-ui/components/u-switch/u-switch.vue

@@ -152,7 +152,7 @@
 	}
 
 	.u-switch--on .u-switch__node {
-		transform: translateX(1em);
+		transform: translateX(100%);
 	}
 
 	.u-switch--disabled {

uview-ui/components/u-tabbar/u-tabbar.vue

@@ -221,7 +221,7 @@
 			},
 			// 获取凸起按钮外层元素的left值，让其水平居中
 			getMidButtonLeft() {
-				let windowWidth = this.$u.sys.windowWidth;
+				let windowWidth = this.$u.sys().windowWidth;
 				// 由于安卓中css计算left: 50%的结果不准确，故用js计算
 				this.midButtonLeft = (windowWidth / 2) + 'px';
 			}

uview-ui/libs/config/config.js

-// 此版本发布于2020-08-04
-let version = '1.5.8';
+// 此版本发布于2020-08-06
+let version = '1.6.0';
 
 export default {
 	v: version,

uview-ui/libs/function/timeFormat.js

 // padStart 的 polyfill，因为某些机型或情况，还无法支持es7的padStart，比如电脑版的微信小程序
 // 所以这里做一个兼容polyfill的兼容处理
-if (!String.prototype.padStart){
-	String.prototype.padStart =
+if (!String.prototype.padStart) {
 	// 为了方便表示这里 fillString 用了ES6 的默认参数，不影响理解
-	function(maxLength, fillString = ' ') {
-		if (Object.prototype.toString.call(fillString) !== "[object String]") throw new TypeError('fillString must be String')
+	String.prototype.padStart = function(maxLength, fillString = ' ') {
+		if (Object.prototype.toString.call(fillString) !== "[object String]") throw new TypeError(
+			'fillString must be String')
 		let str = this
 		// 返回 String(str) 这里是为了使返回的值是字符串字面量，在控制台中更符合直觉
 		if (str.length >= maxLength) return String(str)
@@ -43,7 +43,6 @@ function timeFormat(timestamp = null, fmt = 'yyyy-mm-dd') {
 	for (let k in opt) {
 		ret = new RegExp("(" + k + ")").exec(fmt);
 		if (ret) {
-			console.log(k, ret, opt[k]);
 			fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
 		};
 	};

uview-ui/libs/request/index.js

@@ -14,7 +14,7 @@ class Request {
 			let tmpConfig = {};
 			let interceptorReuest = this.interceptor.request(options);
 			if (interceptorReuest === false) {
-				// 返回一个处于pending状态中的Promise，来取消原promise
+				// 返回一个处于pending状态中的Promise，来取消原promise，避免进入then()回调
 				return new Promise(()=>{});
 			}
 			this.options = interceptorReuest;
@@ -32,7 +32,7 @@ class Request {
 				uni.hideLoading();
 				// 清除定时器，如果请求回来了，就无需loading
 				clearTimeout(this.config.timer);
-				this.timer = null;
+				this.config.timer = null;
 				// 判断用户对拦截返回数据的要求，如果originalData为true，返回所有的数据(response)到拦截器，否则只返回response.data
 				if(this.config.originalData) {
 					// 判断是否存在拦截器
@@ -91,11 +91,12 @@ class Request {
 				}, this.config.loadingTime);
 			}
 			uni.request(options);
-		}).catch(res => {
-			// 如果返回reject()，不让其进入this.$u.post().then().catch()后面的catct()
-			// 因为很多人都会忘了写后面的catch()，导致报错捕获不到catch
-			return new Promise(()=>{});
 		})
+		// .catch(res => {
+		// 	// 如果返回reject()，不让其进入this.$u.post().then().catch()后面的catct()
+		// 	// 因为很多人都会忘了写后面的catch()，导致报错捕获不到catch
+		// 	return new Promise(()=>{});
+		// })
 	}
 
 	constructor() {

uview-ui/libs/util/async-validator.js

@@ -867,7 +867,7 @@ function pattern$2(rule, value, callback, source, options) {
 
 function date(rule, value, callback, source, options) {
 	var errors = [];
-	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field); // console.log('validate on %s value', value);
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field); 
 
 	if (validate) {
 		if (isEmptyValue(value) && !rule.required) {

uview-ui/libs/util/city.js

-/* eslint-disable */
-var cityData = [
+var cityData=[[{"label":"市辖区","value":"1101"}],[{"label":"市辖区","value":"1201"}],[{"label":"石家庄市","value":"1301"},{"label":"唐山市","value":"1302"},{"label":"秦皇岛市","value":"1303"},{"label":"邯郸市","value":"1304"},{"label":"邢台市","value":"1305"},{"label":"保定市","value":"1306"},{"label":"张家口市","value":"1307"},{"label":"承德市","value":"1308"},{"label":"沧州市","value":"1309"},{"label":"廊坊市","value":"1310"},{"label":"衡水市","value":"1311"}],[{"label":"太原市","value":"1401"},{"label":"大同市","value":"1402"},{"label":"阳泉市","value":"1403"},{"label":"长治市","value":"1404"},{"label":"晋城市","value":"1405"},{"label":"朔州市","value":"1406"},{"label":"晋中市","value":"1407"},{"label":"运城市","value":"1408"},{"label":"忻州市","value":"1409"},{"label":"临汾市","value":"1410"},{"label":"吕梁市","value":"1411"}],[{"label":"呼和浩特市","value":"1501"},{"label":"包头市","value":"1502"},{"label":"乌海市","value":"1503"},{"label":"赤峰市","value":"1504"},{"label":"通辽市","value":"1505"},{"label":"鄂尔多斯市","value":"1506"},{"label":"呼伦贝尔市","value":"1507"},{"label":"巴彦淖尔市","value":"1508"},{"label":"乌兰察布市","value":"1509"},{"label":"兴安盟","value":"1522"},{"label":"锡林郭勒盟","value":"1525"},{"label":"阿拉善盟","value":"1529"}],[{"label":"沈阳市","value":"2101"},{"label":"大连市","value":"2102"},{"label":"鞍山市","value":"2103"},{"label":"抚顺市","value":"2104"},{"label":"本溪市","value":"2105"},{"label":"丹东市","value":"2106"},{"label":"锦州市","value":"2107"},{"label":"营口市","value":"2108"},{"label":"阜新市","value":"2109"},{"label":"辽阳市","value":"2110"},{"label":"盘锦市","value":"2111"},{"label":"铁岭市","value":"2112"},{"label":"朝阳市","value":"2113"},{"label":"葫芦岛市","value":"2114"}],[{"label":"长春市","value":"2201"},{"label":"吉林市","value":"2202"},{"label":"四平市","value":"2203"},{"label":"辽源市","value":"2204"},{"label":"通化市","value":"2205"},{"label":"白山市","value":"2206"},{"label":"松原市","value":"2207"},{"label":"白城市","value":"2208"},{"label":"延边朝鲜族自治州","value":"2224"}],[{"label":"哈尔滨市","value":"2301"},{"label":"齐齐哈尔市","value":"2302"},{"label":"鸡西市","value":"2303"},{"label":"鹤岗市","value":"2304"},{"label":"双鸭山市","value":"2305"},{"label":"大庆市","value":"2306"},{"label":"伊春市","value":"2307"},{"label":"佳木斯市","value":"2308"},{"label":"七台河市","value":"2309"},{"label":"牡丹江市","value":"2310"},{"label":"黑河市","value":"2311"},{"label":"绥化市","value":"2312"},{"label":"大兴安岭地区","value":"2327"}],[{"label":"市辖区","value":"3101"}],[{"label":"南京市","value":"3201"},{"label":"无锡市","value":"3202"},{"label":"徐州市","value":"3203"},{"label":"常州市","value":"3204"},{"label":"苏州市","value":"3205"},{"label":"南通市","value":"3206"},{"label":"连云港市","value":"3207"},{"label":"淮安市","value":"3208"},{"label":"盐城市","value":"3209"},{"label":"扬州市","value":"3210"},{"label":"镇江市","value":"3211"},{"label":"泰州市","value":"3212"},{"label":"宿迁市","value":"3213"}],[{"label":"杭州市","value":"3301"},{"label":"宁波市","value":"3302"},{"label":"温州市","value":"3303"},{"label":"嘉兴市","value":"3304"},{"label":"湖州市","value":"3305"},{"label":"绍兴市","value":"3306"},{"label":"金华市","value":"3307"},{"label":"衢州市","value":"3308"},{"label":"舟山市","value":"3309"},{"label":"台州市","value":"3310"},{"label":"丽水市","value":"3311"}],[{"label":"合肥市","value":"3401"},{"label":"芜湖市","value":"3402"},{"label":"蚌埠市","value":"3403"},{"label":"淮南市","value":"3404"},{"label":"马鞍山市","value":"3405"},{"label":"淮北市","value":"3406"},{"label":"铜陵市","value":"3407"},{"label":"安庆市","value":"3408"},{"label":"黄山市","value":"3410"},{"label":"滁州市","value":"3411"},{"label":"阜阳市","value":"3412"},{"label":"宿州市","value":"3413"},{"label":"六安市","value":"3415"},{"label":"亳州市","value":"3416"},{"label":"池州市","value":"3417"},{"label":"宣城市","value":"3418"}],[{"label":"福州市","value":"3501"},{"label":"厦门市","value":"3502"},{"label":"莆田市","value":"3503"},{"label":"三明市","value":"3504"},{"label":"泉州市","value":"3505"},{"label":"漳州市","value":"3506"},{"label":"南平市","value":"3507"},{"label":"龙岩市","value":"3508"},{"label":"宁德市","value":"3509"}],[{"label":"南昌市","value":"3601"},{"label":"景德镇市","value":"3602"},{"label":"萍乡市","value":"3603"},{"label":"九江市","value":"3604"},{"label":"新余市","value":"3605"},{"label":"鹰潭市","value":"3606"},{"label":"赣州市","value":"3607"},{"label":"吉安市","value":"3608"},{"label":"宜春市","value":"3609"},{"label":"抚州市","value":"3610"},{"label":"上饶市","value":"3611"}],[{"label":"济南市","value":"3701"},{"label":"青岛市","value":"3702"},{"label":"淄博市","value":"3703"},{"label":"枣庄市","value":"3704"},{"label":"东营市","value":"3705"},{"label":"烟台市","value":"3706"},{"label":"潍坊市","value":"3707"},{"label":"济宁市","value":"3708"},{"label":"泰安市","value":"3709"},{"label":"威海市","value":"3710"},{"label":"日照市","value":"3711"},{"label":"莱芜市","value":"3712"},{"label":"临沂市","value":"3713"},{"label":"德州市","value":"3714"},{"label":"聊城市","value":"3715"},{"label":"滨州市","value":"3716"},{"label":"菏泽市","value":"3717"}],[{"label":"郑州市","value":"4101"},{"label":"开封市","value":"4102"},{"label":"洛阳市","value":"4103"},{"label":"平顶山市","value":"4104"},{"label":"安阳市","value":"4105"},{"label":"鹤壁市","value":"4106"},{"label":"新乡市","value":"4107"},{"label":"焦作市","value":"4108"},{"label":"濮阳市","value":"4109"},{"label":"许昌市","value":"4110"},{"label":"漯河市","value":"4111"},{"label":"三门峡市","value":"4112"},{"label":"南阳市","value":"4113"},{"label":"商丘市","value":"4114"},{"label":"信阳市","value":"4115"},{"label":"周口市","value":"4116"},{"label":"驻马店市","value":"4117"},{"label":"省直辖县级行政区划","value":"4190"}],[{"label":"武汉市","value":"4201"},{"label":"黄石市","value":"4202"},{"label":"十堰市","value":"4203"},{"label":"宜昌市","value":"4205"},{"label":"襄阳市","value":"4206"},{"label":"鄂州市","value":"4207"},{"label":"荆门市","value":"4208"},{"label":"孝感市","value":"4209"},{"label":"荆州市","value":"4210"},{"label":"黄冈市","value":"4211"},{"label":"咸宁市","value":"4212"},{"label":"随州市","value":"4213"},{"label":"恩施土家族苗族自治州","value":"4228"},{"label":"省直辖县级行政区划","value":"4290"}],[{"label":"长沙市","value":"4301"},{"label":"株洲市","value":"4302"},{"label":"湘潭市","value":"4303"},{"label":"衡阳市","value":"4304"},{"label":"邵阳市","value":"4305"},{"label":"岳阳市","value":"4306"},{"label":"常德市","value":"4307"},{"label":"张家界市","value":"4308"},{"label":"益阳市","value":"4309"},{"label":"郴州市","value":"4310"},{"label":"永州市","value":"4311"},{"label":"怀化市","value":"4312"},{"label":"娄底市","value":"4313"},{"label":"湘西土家族苗族自治州","value":"4331"}],[{"label":"广州市","value":"4401"},{"label":"韶关市","value":"4402"},{"label":"深圳市","value":"4403"},{"label":"珠海市","value":"4404"},{"label":"汕头市","value":"4405"},{"label":"佛山市","value":"4406"},{"label":"江门市","value":"4407"},{"label":"湛江市","value":"4408"},{"label":"茂名市","value":"4409"},{"label":"肇庆市","value":"4412"},{"label":"惠州市","value":"4413"},{"label":"梅州市","value":"4414"},{"label":"汕尾市","value":"4415"},{"label":"河源市","value":"4416"},{"label":"阳江市","value":"4417"},{"label":"清远市","value":"4418"},{"label":"东莞市","value":"4419"},{"label":"中山市","value":"4420"},{"label":"潮州市","value":"4451"},{"label":"揭阳市","value":"4452"},{"label":"云浮市","value":"4453"}],[{"label":"南宁市","value":"4501"},{"label":"柳州市","value":"4502"},{"label":"桂林市","value":"4503"},{"label":"梧州市","value":"4504"},{"label":"北海市","value":"4505"},{"label":"防城港市","value":"4506"},{"label":"钦州市","value":"4507"},{"label":"贵港市","value":"4508"},{"label":"玉林市","value":"4509"},{"label":"百色市","value":"4510"},{"label":"贺州市","value":"4511"},{"label":"河池市","value":"4512"},{"label":"来宾市","value":"4513"},{"label":"崇左市","value":"4514"}],[{"label":"海口市","value":"4601"},{"label":"三亚市","value":"4602"},{"label":"三沙市","value":"4603"},{"label":"儋州市","value":"4604"},{"label":"省直辖县级行政区划","value":"4690"}],[{"label":"市辖区","value":"5001"},{"label":"县","value":"5002"}],[{"label":"成都市","value":"5101"},{"label":"自贡市","value":"5103"},{"label":"攀枝花市","value":"5104"},{"label":"泸州市","value":"5105"},{"label":"德阳市","value":"5106"},{"label":"绵阳市","value":"5107"},{"label":"广元市","value":"5108"},{"label":"遂宁市","value":"5109"},{"label":"内江市","value":"5110"},{"label":"乐山市","value":"5111"},{"label":"南充市","value":"5113"},{"label":"眉山市","value":"5114"},{"label":"宜宾市","value":"5115"},{"label":"广安市","value":"5116"},{"label":"达州市","value":"5117"},{"label":"雅安市","value":"5118"},{"label":"巴中市","value":"5119"},{"label":"资阳市","value":"5120"},{"label":"阿坝藏族羌族自治州","value":"5132"},{"label":"甘孜藏族自治州","value":"5133"},{"label":"凉山彝族自治州","value":"5134"}],[{"label":"贵阳市","value":"5201"},{"label":"六盘水市","value":"5202"},{"label":"遵义市","value":"5203"},{"label":"安顺市","value":"5204"},{"label":"毕节市","value":"5205"},{"label":"铜仁市","value":"5206"},{"label":"黔西南布依族苗族自治州","value":"5223"},{"label":"黔东南苗族侗族自治州","value":"5226"},{"label":"黔南布依族苗族自治州","value":"5227"}],[{"label":"昆明市","value":"5301"},{"label":"曲靖市","value":"5303"},{"label":"玉溪市","value":"5304"},{"label":"保山市","value":"5305"},{"label":"昭通市","value":"5306"},{"label":"丽江市","value":"5307"},{"label":"普洱市","value":"5308"},{"label":"临沧市","value":"5309"},{"label":"楚雄彝族自治州","value":"5323"},{"label":"红河哈尼族彝族自治州","value":"5325"},{"label":"文山壮族苗族自治州","value":"5326"},{"label":"西双版纳傣族自治州","value":"5328"},{"label":"大理白族自治州","value":"5329"},{"label":"德宏傣族景颇族自治州","value":"5331"},{"label":"怒江傈僳族自治州","value":"5333"},{"label":"迪庆藏族自治州","value":"5334"}],[{"label":"拉萨市","value":"5401"},{"label":"日喀则市","value":"5402"},{"label":"昌都市","value":"5403"},{"label":"林芝市","value":"5404"},{"label":"山南市","value":"5405"},{"label":"那曲地区","value":"5424"},{"label":"阿里地区","value":"5425"}],[{"label":"西安市","value":"6101"},{"label":"铜川市","value":"6102"},{"label":"宝鸡市","value":"6103"},{"label":"咸阳市","value":"6104"},{"label":"渭南市","value":"6105"},{"label":"延安市","value":"6106"},{"label":"汉中市","value":"6107"},{"label":"榆林市","value":"6108"},{"label":"安康市","value":"6109"},{"label":"商洛市","value":"6110"}],[{"label":"兰州市","value":"6201"},{"label":"嘉峪关市","value":"6202"},{"label":"金昌市","value":"6203"},{"label":"白银市","value":"6204"},{"label":"天水市","value":"6205"},{"label":"武威市","value":"6206"},{"label":"张掖市","value":"6207"},{"label":"平凉市","value":"6208"},{"label":"酒泉市","value":"6209"},{"label":"庆阳市","value":"6210"},{"label":"定西市","value":"6211"},{"label":"陇南市","value":"6212"},{"label":"临夏回族自治州","value":"6229"},{"label":"甘南藏族自治州","value":"6230"}],[{"label":"西宁市","value":"6301"},{"label":"海东市","value":"6302"},{"label":"海北藏族自治州","value":"6322"},{"label":"黄南藏族自治州","value":"6323"},{"label":"海南藏族自治州","value":"6325"},{"label":"果洛藏族自治州","value":"6326"},{"label":"玉树藏族自治州","value":"6327"},{"label":"海西蒙古族藏族自治州","value":"6328"}],[{"label":"银川市","value":"6401"},{"label":"石嘴山市","value":"6402"},{"label":"吴忠市","value":"6403"},{"label":"固原市","value":"6404"},{"label":"中卫市","value":"6405"}],[{"label":"乌鲁木齐市","value":"6501"},{"label":"克拉玛依市","value":"6502"},{"label":"吐鲁番市","value":"6504"},{"label":"哈密市","value":"6505"},{"label":"昌吉回族自治州","value":"6523"},{"label":"博尔塔拉蒙古自治州","value":"6527"},{"label":"巴音郭楞蒙古自治州","value":"6528"},{"label":"阿克苏地区","value":"6529"},{"label":"克孜勒苏柯尔克孜自治州","value":"6530"},{"label":"喀什地区","value":"6531"},{"label":"和田地区","value":"6532"},{"label":"伊犁哈萨克自治州","value":"6540"},{"label":"塔城地区","value":"6542"},{"label":"阿勒泰地区","value":"6543"},{"label":"自治区直辖县级行政区划","value":"6590"}],[{"label":"台北","value":"6601"},{"label":"高雄","value":"6602"},{"label":"基隆","value":"6603"},{"label":"台中","value":"6604"},{"label":"台南","value":"6605"},{"label":"新竹","value":"6606"},{"label":"嘉义","value":"6607"},{"label":"宜兰","value":"6608"},{"label":"桃园","value":"6609"},{"label":"苗栗","value":"6610"},{"label":"彰化","value":"6611"},{"label":"南投","value":"6612"},{"label":"云林","value":"6613"},{"label":"屏东","value":"6614"},{"label":"台东","value":"6615"},{"label":"花莲","value":"6616"},{"label":"澎湖","value":"6617"}],[{"label":"香港岛","value":"6701"},{"label":"九龙","value":"6702"},{"label":"新界","value":"6703"}],[{"label":"澳门半岛","value":"6801"},{"label":"氹仔岛","value":"6802"},{"label":"路环岛","value":"6803"},{"label":"路氹城","value":"6804"}]];export default cityData;
\ No newline at end of file
-  [{
-    "label": "市辖区",
-    "value": "1101"
-  }],
-  [{
-    "label": "市辖区",
-    "value": "1201"
-  }],
-  [{
-      "label": "石家庄市",
-      "value": "1301"
-    },
-    {
-      "label": "唐山市",
-      "value": "1302"
-    },
-    {
-      "label": "秦皇岛市",
-      "value": "1303"
-    },
-    {
-      "label": "邯郸市",
-      "value": "1304"
-    },
-    {
-      "label": "邢台市",
-      "value": "1305"
-    },
-    {
-      "label": "保定市",
-      "value": "1306"
-    },
-    {
-      "label": "张家口市",
-      "value": "1307"
-    },
-    {
-      "label": "承德市",
-      "value": "1308"
-    },
-    {
-      "label": "沧州市",
-      "value": "1309"
-    },
-    {
-      "label": "廊坊市",
-      "value": "1310"
-    },
-    {
-      "label": "衡水市",
-      "value": "1311"
-    }
-  ],
-  [{
-      "label": "太原市",
-      "value": "1401"
-    },
-    {
-      "label": "大同市",
-      "value": "1402"
-    },
-    {
-      "label": "阳泉市",
-      "value": "1403"
-    },
-    {
-      "label": "长治市",
-      "value": "1404"
-    },
-    {
-      "label": "晋城市",
-      "value": "1405"
-    },
-    {
-      "label": "朔州市",
-      "value": "1406"
-    },
-    {
-      "label": "晋中市",
-      "value": "1407"
-    },
-    {
-      "label": "运城市",
-      "value": "1408"
-    },
-    {
-      "label": "忻州市",
-      "value": "1409"
-    },
-    {
-      "label": "临汾市",
-      "value": "1410"
-    },
-    {
-      "label": "吕梁市",
-      "value": "1411"
-    }
-  ],
-  [{
-      "label": "呼和浩特市",
-      "value": "1501"
-    },
-    {
-      "label": "包头市",
-      "value": "1502"
-    },
-    {
-      "label": "乌海市",
-      "value": "1503"
-    },
-    {
-      "label": "赤峰市",
-      "value": "1504"
-    },
-    {
-      "label": "通辽市",
-      "value": "1505"
-    },
-    {
-      "label": "鄂尔多斯市",
-      "value": "1506"
-    },
-    {
-      "label": "呼伦贝尔市",
-      "value": "1507"
-    },
-    {
-      "label": "巴彦淖尔市",
-      "value": "1508"
-    },
-    {
-      "label": "乌兰察布市",
-      "value": "1509"
-    },
-    {
-      "label": "兴安盟",
-      "value": "1522"
-    },
-    {
-      "label": "锡林郭勒盟",
-      "value": "1525"
-    },
-    {
-      "label": "阿拉善盟",
-      "value": "1529"
-    }
-  ],
-  [{
-      "label": "沈阳市",
-      "value": "2101"
-    },
-    {
-      "label": "大连市",
-      "value": "2102"
-    },
-    {
-      "label": "鞍山市",
-      "value": "2103"
-    },
-    {
-      "label": "抚顺市",
-      "value": "2104"
-    },
-    {
-      "label": "本溪市",
-      "value": "2105"
-    },
-    {
-      "label": "丹东市",
-      "value": "2106"
-    },
-    {
-      "label": "锦州市",
-      "value": "2107"
-    },
-    {
-      "label": "营口市",
-      "value": "2108"
-    },
-    {
-      "label": "阜新市",
-      "value": "2109"
-    },
-    {
-      "label": "辽阳市",
-      "value": "2110"
-    },
-    {
-      "label": "盘锦市",
-      "value": "2111"
-    },
-    {
-      "label": "铁岭市",
-      "value": "2112"
-    },
-    {
-      "label": "朝阳市",
-      "value": "2113"
-    },
-    {
-      "label": "葫芦岛市",
-      "value": "2114"
-    }
-  ],
-  [{
-      "label": "长春市",
-      "value": "2201"
-    },
-    {
-      "label": "吉林市",
-      "value": "2202"
-    },
-    {
-      "label": "四平市",
-      "value": "2203"
-    },
-    {
-      "label": "辽源市",
-      "value": "2204"
-    },
-    {
-      "label": "通化市",
-      "value": "2205"
-    },
-    {
-      "label": "白山市",
-      "value": "2206"
-    },
-    {
-      "label": "松原市",
-      "value": "2207"
-    },
-    {
-      "label": "白城市",
-      "value": "2208"
-    },
-    {
-      "label": "延边朝鲜族自治州",
-      "value": "2224"
-    }
-  ],
-  [{
-      "label": "哈尔滨市",
-      "value": "2301"
-    },
-    {
-      "label": "齐齐哈尔市",
-      "value": "2302"
-    },
-    {
-      "label": "鸡西市",
-      "value": "2303"
-    },
-    {
-      "label": "鹤岗市",
-      "value": "2304"
-    },
-    {
-      "label": "双鸭山市",
-      "value": "2305"
-    },
-    {
-      "label": "大庆市",
-      "value": "2306"
-    },
-    {
-      "label": "伊春市",
-      "value": "2307"
-    },
-    {
-      "label": "佳木斯市",
-      "value": "2308"
-    },
-    {
-      "label": "七台河市",
-      "value": "2309"
-    },
-    {
-      "label": "牡丹江市",
-      "value": "2310"
-    },
-    {
-      "label": "黑河市",
-      "value": "2311"
-    },
-    {
-      "label": "绥化市",
-      "value": "2312"
-    },
-    {
-      "label": "大兴安岭地区",
-      "value": "2327"
-    }
-  ],
-  [{
-    "label": "市辖区",
-    "value": "3101"
-  }],
-  [{
-      "label": "南京市",
-      "value": "3201"
-    },
-    {
-      "label": "无锡市",
-      "value": "3202"
-    },
-    {
-      "label": "徐州市",
-      "value": "3203"
-    },
-    {
-      "label": "常州市",
-      "value": "3204"
-    },
-    {
-      "label": "苏州市",
-      "value": "3205"
-    },
-    {
-      "label": "南通市",
-      "value": "3206"
-    },
-    {
-      "label": "连云港市",
-      "value": "3207"
-    },
-    {
-      "label": "淮安市",
-      "value": "3208"
-    },
-    {
-      "label": "盐城市",
-      "value": "3209"
-    },
-    {
-      "label": "扬州市",
-      "value": "3210"
-    },
-    {
-      "label": "镇江市",
-      "value": "3211"
-    },
-    {
-      "label": "泰州市",
-      "value": "3212"
-    },
-    {
-      "label": "宿迁市",
-      "value": "3213"
-    }
-  ],
-  [{
-      "label": "杭州市",
-      "value": "3301"
-    },
-    {
-      "label": "宁波市",
-      "value": "3302"
-    },
-    {
-      "label": "温州市",
-      "value": "3303"
-    },
-    {
-      "label": "嘉兴市",
-      "value": "3304"
-    },
-    {
-      "label": "湖州市",
-      "value": "3305"
-    },
-    {
-      "label": "绍兴市",
-      "value": "3306"
-    },
-    {
-      "label": "金华市",
-      "value": "3307"
-    },
-    {
-      "label": "衢州市",
-      "value": "3308"
-    },
-    {
-      "label": "舟山市",
-      "value": "3309"
-    },
-    {
-      "label": "台州市",
-      "value": "3310"
-    },
-    {
-      "label": "丽水市",
-      "value": "3311"
-    }
-  ],
-  [{
-      "label": "合肥市",
-      "value": "3401"
-    },
-    {
-      "label": "芜湖市",
-      "value": "3402"
-    },
-    {
-      "label": "蚌埠市",
-      "value": "3403"
-    },
-    {
-      "label": "淮南市",
-      "value": "3404"
-    },
-    {
-      "label": "马鞍山市",
-      "value": "3405"
-    },
-    {
-      "label": "淮北市",
-      "value": "3406"
-    },
-    {
-      "label": "铜陵市",
-      "value": "3407"
-    },
-    {
-      "label": "安庆市",
-      "value": "3408"
-    },
-    {
-      "label": "黄山市",
-      "value": "3410"
-    },
-    {
-      "label": "滁州市",
-      "value": "3411"
-    },
-    {
-      "label": "阜阳市",
-      "value": "3412"
-    },
-    {
-      "label": "宿州市",
-      "value": "3413"
-    },
-    {
-      "label": "六安市",
-      "value": "3415"
-    },
-    {
-      "label": "亳州市",
-      "value": "3416"
-    },
-    {
-      "label": "池州市",
-      "value": "3417"
-    },
-    {
-      "label": "宣城市",
-      "value": "3418"
-    }
-  ],
-  [{
-      "label": "福州市",
-      "value": "3501"
-    },
-    {
-      "label": "厦门市",
-      "value": "3502"
-    },
-    {
-      "label": "莆田市",
-      "value": "3503"
-    },
-    {
-      "label": "三明市",
-      "value": "3504"
-    },
-    {
-      "label": "泉州市",
-      "value": "3505"
-    },
-    {
-      "label": "漳州市",
-      "value": "3506"
-    },
-    {
-      "label": "南平市",
-      "value": "3507"
-    },
-    {
-      "label": "龙岩市",
-      "value": "3508"
-    },
-    {
-      "label": "宁德市",
-      "value": "3509"
-    }
-  ],
-  [{
-      "label": "南昌市",
-      "value": "3601"
-    },
-    {
-      "label": "景德镇市",
-      "value": "3602"
-    },
-    {
-      "label": "萍乡市",
-      "value": "3603"
-    },
-    {
-      "label": "九江市",
-      "value": "3604"
-    },
-    {
-      "label": "新余市",
-      "value": "3605"
-    },
-    {
-      "label": "鹰潭市",
-      "value": "3606"
-    },
-    {
-      "label": "赣州市",
-      "value": "3607"
-    },
-    {
-      "label": "吉安市",
-      "value": "3608"
-    },
-    {
-      "label": "宜春市",
-      "value": "3609"
-    },
-    {
-      "label": "抚州市",
-      "value": "3610"
-    },
-    {
-      "label": "上饶市",
-      "value": "3611"
-    }
-  ],
-  [{
-      "label": "济南市",
-      "value": "3701"
-    },
-    {
-      "label": "青岛市",
-      "value": "3702"
-    },
-    {
-      "label": "淄博市",
-      "value": "3703"
-    },
-    {
-      "label": "枣庄市",
-      "value": "3704"
-    },
-    {
-      "label": "东营市",
-      "value": "3705"
-    },
-    {
-      "label": "烟台市",
-      "value": "3706"
-    },
-    {
-      "label": "潍坊市",
-      "value": "3707"
-    },
-    {
-      "label": "济宁市",
-      "value": "3708"
-    },
-    {
-      "label": "泰安市",
-      "value": "3709"
-    },
-    {
-      "label": "威海市",
-      "value": "3710"
-    },
-    {
-      "label": "日照市",
-      "value": "3711"
-    },
-    {
-      "label": "莱芜市",
-      "value": "3712"
-    },
-    {
-      "label": "临沂市",
-      "value": "3713"
-    },
-    {
-      "label": "德州市",
-      "value": "3714"
-    },
-    {
-      "label": "聊城市",
-      "value": "3715"
-    },
-    {
-      "label": "滨州市",
-      "value": "3716"
-    },
-    {
-      "label": "菏泽市",
-      "value": "3717"
-    }
-  ],
-  [{
-      "label": "郑州市",
-      "value": "4101"
-    },
-    {
-      "label": "开封市",
-      "value": "4102"
-    },
-    {
-      "label": "洛阳市",
-      "value": "4103"
-    },
-    {
-      "label": "平顶山市",
-      "value": "4104"
-    },
-    {
-      "label": "安阳市",
-      "value": "4105"
-    },
-    {
-      "label": "鹤壁市",
-      "value": "4106"
-    },
-    {
-      "label": "新乡市",
-      "value": "4107"
-    },
-    {
-      "label": "焦作市",
-      "value": "4108"
-    },
-    {
-      "label": "濮阳市",
-      "value": "4109"
-    },
-    {
-      "label": "许昌市",
-      "value": "4110"
-    },
-    {
-      "label": "漯河市",
-      "value": "4111"
-    },
-    {
-      "label": "三门峡市",
-      "value": "4112"
-    },
-    {
-      "label": "南阳市",
-      "value": "4113"
-    },
-    {
-      "label": "商丘市",
-      "value": "4114"
-    },
-    {
-      "label": "信阳市",
-      "value": "4115"
-    },
-    {
-      "label": "周口市",
-      "value": "4116"
-    },
-    {
-      "label": "驻马店市",
-      "value": "4117"
-    },
-    {
-      "label": "省直辖县级行政区划",
-      "value": "4190"
-    }
-  ],
-  [{
-      "label": "武汉市",
-      "value": "4201"
-    },
-    {
-      "label": "黄石市",
-      "value": "4202"
-    },
-    {
-      "label": "十堰市",
-      "value": "4203"
-    },
-    {
-      "label": "宜昌市",
-      "value": "4205"
-    },
-    {
-      "label": "襄阳市",
-      "value": "4206"
-    },
-    {
-      "label": "鄂州市",
-      "value": "4207"
-    },
-    {
-      "label": "荆门市",
-      "value": "4208"
-    },
-    {
-      "label": "孝感市",
-      "value": "4209"
-    },
-    {
-      "label": "荆州市",
-      "value": "4210"
-    },
-    {
-      "label": "黄冈市",
-      "value": "4211"
-    },
-    {
-      "label": "咸宁市",
-      "value": "4212"
-    },
-    {
-      "label": "随州市",
-      "value": "4213"
-    },
-    {
-      "label": "恩施土家族苗族自治州",
-      "value": "4228"
-    },
-    {
-      "label": "省直辖县级行政区划",
-      "value": "4290"
-    }
-  ],
-  [{
-      "label": "长沙市",
-      "value": "4301"
-    },
-    {
-      "label": "株洲市",
-      "value": "4302"
-    },
-    {
-      "label": "湘潭市",
-      "value": "4303"
-    },
-    {
-      "label": "衡阳市",
-      "value": "4304"
-    },
-    {
-      "label": "邵阳市",
-      "value": "4305"
-    },
-    {
-      "label": "岳阳市",
-      "value": "4306"
-    },
-    {
-      "label": "常德市",
-      "value": "4307"
-    },
-    {
-      "label": "张家界市",
-      "value": "4308"
-    },
-    {
-      "label": "益阳市",
-      "value": "4309"
-    },
-    {
-      "label": "郴州市",
-      "value": "4310"
-    },
-    {
-      "label": "永州市",
-      "value": "4311"
-    },
-    {
-      "label": "怀化市",
-      "value": "4312"
-    },
-    {
-      "label": "娄底市",
-      "value": "4313"
-    },
-    {
-      "label": "湘西土家族苗族自治州",
-      "value": "4331"
-    }
-  ],
-  [{
-      "label": "广州市",
-      "value": "4401"
-    },
-    {
-      "label": "韶关市",
-      "value": "4402"
-    },
-    {
-      "label": "深圳市",
-      "value": "4403"
-    },
-    {
-      "label": "珠海市",
-      "value": "4404"
-    },
-    {
-      "label": "汕头市",
-      "value": "4405"
-    },
-    {
-      "label": "佛山市",
-      "value": "4406"
-    },
-    {
-      "label": "江门市",
-      "value": "4407"
-    },
-    {
-      "label": "湛江市",
-      "value": "4408"
-    },
-    {
-      "label": "茂名市",
-      "value": "4409"
-    },
-    {
-      "label": "肇庆市",
-      "value": "4412"
-    },
-    {
-      "label": "惠州市",
-      "value": "4413"
-    },
-    {
-      "label": "梅州市",
-      "value": "4414"
-    },
-    {
-      "label": "汕尾市",
-      "value": "4415"
-    },
-    {
-      "label": "河源市",
-      "value": "4416"
-    },
-    {
-      "label": "阳江市",
-      "value": "4417"
-    },
-    {
-      "label": "清远市",
-      "value": "4418"
-    },
-    {
-      "label": "东莞市",
-      "value": "4419"
-    },
-    {
-      "label": "中山市",
-      "value": "4420"
-    },
-    {
-      "label": "潮州市",
-      "value": "4451"
-    },
-    {
-      "label": "揭阳市",
-      "value": "4452"
-    },
-    {
-      "label": "云浮市",
-      "value": "4453"
-    }
-  ],
-  [{
-      "label": "南宁市",
-      "value": "4501"
-    },
-    {
-      "label": "柳州市",
-      "value": "4502"
-    },
-    {
-      "label": "桂林市",
-      "value": "4503"
-    },
-    {
-      "label": "梧州市",
-      "value": "4504"
-    },
-    {
-      "label": "北海市",
-      "value": "4505"
-    },
-    {
-      "label": "防城港市",
-      "value": "4506"
-    },
-    {
-      "label": "钦州市",
-      "value": "4507"
-    },
-    {
-      "label": "贵港市",
-      "value": "4508"
-    },
-    {
-      "label": "玉林市",
-      "value": "4509"
-    },
-    {
-      "label": "百色市",
-      "value": "4510"
-    },
-    {
-      "label": "贺州市",
-      "value": "4511"
-    },
-    {
-      "label": "河池市",
-      "value": "4512"
-    },
-    {
-      "label": "来宾市",
-      "value": "4513"
-    },
-    {
-      "label": "崇左市",
-      "value": "4514"
-    }
-  ],
-  [{
-      "label": "海口市",
-      "value": "4601"
-    },
-    {
-      "label": "三亚市",
-      "value": "4602"
-    },
-    {
-      "label": "三沙市",
-      "value": "4603"
-    },
-    {
-      "label": "儋州市",
-      "value": "4604"
-    },
-    {
-      "label": "省直辖县级行政区划",
-      "value": "4690"
-    }
-  ],
-  [{
-      "label": "市辖区",
-      "value": "5001"
-    },
-    {
-      "label": "县",
-      "value": "5002"
-    }
-  ],
-  [{
-      "label": "成都市",
-      "value": "5101"
-    },
-    {
-      "label": "自贡市",
-      "value": "5103"
-    },
-    {
-      "label": "攀枝花市",
-      "value": "5104"
-    },
-    {
-      "label": "泸州市",
-      "value": "5105"
-    },
-    {
-      "label": "德阳市",
-      "value": "5106"
-    },
-    {
-      "label": "绵阳市",
-      "value": "5107"
-    },
-    {
-      "label": "广元市",
-      "value": "5108"
-    },
-    {
-      "label": "遂宁市",
-      "value": "5109"
-    },
-    {
-      "label": "内江市",
-      "value": "5110"
-    },
-    {
-      "label": "乐山市",
-      "value": "5111"
-    },
-    {
-      "label": "南充市",
-      "value": "5113"
-    },
-    {
-      "label": "眉山市",
-      "value": "5114"
-    },
-    {
-      "label": "宜宾市",
-      "value": "5115"
-    },
-    {
-      "label": "广安市",
-      "value": "5116"
-    },
-    {
-      "label": "达州市",
-      "value": "5117"
-    },
-    {
-      "label": "雅安市",
-      "value": "5118"
-    },
-    {
-      "label": "巴中市",
-      "value": "5119"
-    },
-    {
-      "label": "资阳市",
-      "value": "5120"
-    },
-    {
-      "label": "阿坝藏族羌族自治州",
-      "value": "5132"
-    },
-    {
-      "label": "甘孜藏族自治州",
-      "value": "5133"
-    },
-    {
-      "label": "凉山彝族自治州",
-      "value": "5134"
-    }
-  ],
-  [{
-      "label": "贵阳市",
-      "value": "5201"
-    },
-    {
-      "label": "六盘水市",
-      "value": "5202"
-    },
-    {
-      "label": "遵义市",
-      "value": "5203"
-    },
-    {
-      "label": "安顺市",
-      "value": "5204"
-    },
-    {
-      "label": "毕节市",
-      "value": "5205"
-    },
-    {
-      "label": "铜仁市",
-      "value": "5206"
-    },
-    {
-      "label": "黔西南布依族苗族自治州",
-      "value": "5223"
-    },
-    {
-      "label": "黔东南苗族侗族自治州",
-      "value": "5226"
-    },
-    {
-      "label": "黔南布依族苗族自治州",
-      "value": "5227"
-    }
-  ],
-  [{
-      "label": "昆明市",
-      "value": "5301"
-    },
-    {
-      "label": "曲靖市",
-      "value": "5303"
-    },
-    {
-      "label": "玉溪市",
-      "value": "5304"
-    },
-    {
-      "label": "保山市",
-      "value": "5305"
-    },
-    {
-      "label": "昭通市",
-      "value": "5306"
-    },
-    {
-      "label": "丽江市",
-      "value": "5307"
-    },
-    {
-      "label": "普洱市",
-      "value": "5308"
-    },
-    {
-      "label": "临沧市",
-      "value": "5309"
-    },
-    {
-      "label": "楚雄彝族自治州",
-      "value": "5323"
-    },
-    {
-      "label": "红河哈尼族彝族自治州",
-      "value": "5325"
-    },
-    {
-      "label": "文山壮族苗族自治州",
-      "value": "5326"
-    },
-    {
-      "label": "西双版纳傣族自治州",
-      "value": "5328"
-    },
-    {
-      "label": "大理白族自治州",
-      "value": "5329"
-    },
-    {
-      "label": "德宏傣族景颇族自治州",
-      "value": "5331"
-    },
-    {
-      "label": "怒江傈僳族自治州",
-      "value": "5333"
-    },
-    {
-      "label": "迪庆藏族自治州",
-      "value": "5334"
-    }
-  ],
-  [{
-      "label": "拉萨市",
-      "value": "5401"
-    },
-    {
-      "label": "日喀则市",
-      "value": "5402"
-    },
-    {
-      "label": "昌都市",
-      "value": "5403"
-    },
-    {
-      "label": "林芝市",
-      "value": "5404"
-    },
-    {
-      "label": "山南市",
-      "value": "5405"
-    },
-    {
-      "label": "那曲地区",
-      "value": "5424"
-    },
-    {
-      "label": "阿里地区",
-      "value": "5425"
-    }
-  ],
-  [{
-      "label": "西安市",
-      "value": "6101"
-    },
-    {
-      "label": "铜川市",
-      "value": "6102"
-    },
-    {
-      "label": "宝鸡市",
-      "value": "6103"
-    },
-    {
-      "label": "咸阳市",
-      "value": "6104"
-    },
-    {
-      "label": "渭南市",
-      "value": "6105"
-    },
-    {
-      "label": "延安市",
-      "value": "6106"
-    },
-    {
-      "label": "汉中市",
-      "value": "6107"
-    },
-    {
-      "label": "榆林市",
-      "value": "6108"
-    },
-    {
-      "label": "安康市",
-      "value": "6109"
-    },
-    {
-      "label": "商洛市",
-      "value": "6110"
-    }
-  ],
-  [{
-      "label": "兰州市",
-      "value": "6201"
-    },
-    {
-      "label": "嘉峪关市",
-      "value": "6202"
-    },
-    {
-      "label": "金昌市",
-      "value": "6203"
-    },
-    {
-      "label": "白银市",
-      "value": "6204"
-    },
-    {
-      "label": "天水市",
-      "value": "6205"
-    },
-    {
-      "label": "武威市",
-      "value": "6206"
-    },
-    {
-      "label": "张掖市",
-      "value": "6207"
-    },
-    {
-      "label": "平凉市",
-      "value": "6208"
-    },
-    {
-      "label": "酒泉市",
-      "value": "6209"
-    },
-    {
-      "label": "庆阳市",
-      "value": "6210"
-    },
-    {
-      "label": "定西市",
-      "value": "6211"
-    },
-    {
-      "label": "陇南市",
-      "value": "6212"
-    },
-    {
-      "label": "临夏回族自治州",
-      "value": "6229"
-    },
-    {
-      "label": "甘南藏族自治州",
-      "value": "6230"
-    }
-  ],
-  [{
-      "label": "西宁市",
-      "value": "6301"
-    },
-    {
-      "label": "海东市",
-      "value": "6302"
-    },
-    {
-      "label": "海北藏族自治州",
-      "value": "6322"
-    },
-    {
-      "label": "黄南藏族自治州",
-      "value": "6323"
-    },
-    {
-      "label": "海南藏族自治州",
-      "value": "6325"
-    },
-    {
-      "label": "果洛藏族自治州",
-      "value": "6326"
-    },
-    {
-      "label": "玉树藏族自治州",
-      "value": "6327"
-    },
-    {
-      "label": "海西蒙古族藏族自治州",
-      "value": "6328"
-    }
-  ],
-  [{
-      "label": "银川市",
-      "value": "6401"
-    },
-    {
-      "label": "石嘴山市",
-      "value": "6402"
-    },
-    {
-      "label": "吴忠市",
-      "value": "6403"
-    },
-    {
-      "label": "固原市",
-      "value": "6404"
-    },
-    {
-      "label": "中卫市",
-      "value": "6405"
-    }
-  ],
-  [{
-      "label": "乌鲁木齐市",
-      "value": "6501"
-    },
-    {
-      "label": "克拉玛依市",
-      "value": "6502"
-    },
-    {
-      "label": "吐鲁番市",
-      "value": "6504"
-    },
-    {
-      "label": "哈密市",
-      "value": "6505"
-    },
-    {
-      "label": "昌吉回族自治州",
-      "value": "6523"
-    },
-    {
-      "label": "博尔塔拉蒙古自治州",
-      "value": "6527"
-    },
-    {
-      "label": "巴音郭楞蒙古自治州",
-      "value": "6528"
-    },
-    {
-      "label": "阿克苏地区",
-      "value": "6529"
-    },
-    {
-      "label": "克孜勒苏柯尔克孜自治州",
-      "value": "6530"
-    },
-    {
-      "label": "喀什地区",
-      "value": "6531"
-    },
-    {
-      "label": "和田地区",
-      "value": "6532"
-    },
-    {
-      "label": "伊犁哈萨克自治州",
-      "value": "6540"
-    },
-    {
-      "label": "塔城地区",
-      "value": "6542"
-    },
-    {
-      "label": "阿勒泰地区",
-      "value": "6543"
-    },
-    {
-      "label": "自治区直辖县级行政区划",
-      "value": "6590"
-    }
-  ],
-  [{
-      "label": "台北",
-      "value": "6601"
-    },
-    {
-      "label": "高雄",
-      "value": "6602"
-    },
-    {
-      "label": "基隆",
-      "value": "6603"
-    },
-    {
-      "label": "台中",
-      "value": "6604"
-    },
-    {
-      "label": "台南",
-      "value": "6605"
-    },
-    {
-      "label": "新竹",
-      "value": "6606"
-    },
-    {
-      "label": "嘉义",
-      "value": "6607"
-    },
-    {
-      "label": "宜兰",
-      "value": "6608"
-    },
-    {
-      "label": "桃园",
-      "value": "6609"
-    },
-    {
-      "label": "苗栗",
-      "value": "6610"
-    },
-    {
-      "label": "彰化",
-      "value": "6611"
-    },
-    {
-      "label": "南投",
-      "value": "6612"
-    },
-    {
-      "label": "云林",
-      "value": "6613"
-    },
-    {
-      "label": "屏东",
-      "value": "6614"
-    },
-    {
-      "label": "台东",
-      "value": "6615"
-    },
-    {
-      "label": "花莲",
-      "value": "6616"
-    },
-    {
-      "label": "澎湖",
-      "value": "6617"
-    }
-  ],
-  [{
-      "label": "香港岛",
-      "value": "6701"
-    },
-    {
-      "label": "九龙",
-      "value": "6702"
-    },
-    {
-      "label": "新界",
-      "value": "6703"
-    }
-  ],
-  [{
-      "label": "澳门半岛",
-      "value": "6801"
-    },
-    {
-      "label": "氹仔岛",
-      "value": "6802"
-    },
-    {
-      "label": "路环岛",
-      "value": "6803"
-    },
-    {
-      "label": "路氹城",
-      "value": "6804"
-    }
-  ]
-]
-export default cityData;

uview-ui/libs/util/province.js

-/* eslint-disable */
-var provinceData = [{
+var provinceData=[{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;
\ No newline at end of file
-    "label": "北京市",
-    "value": "11"
-  },
-  {
-    "label": "天津市",
-    "value": "12"
-  },
-  {
-    "label": "河北省",
-    "value": "13"
-  },
-  {
-    "label": "山西省",
-    "value": "14"
-  },
-  {
-    "label": "内蒙古自治区",
-    "value": "15"
-  },
-  {
-    "label": "辽宁省",
-    "value": "21"
-  },
-  {
-    "label": "吉林省",
-    "value": "22"
-  },
-  {
-    "label": "黑龙江省",
-    "value": "23"
-  },
-  {
-    "label": "上海市",
-    "value": "31"
-  },
-  {
-    "label": "江苏省",
-    "value": "32"
-  },
-  {
-    "label": "浙江省",
-    "value": "33"
-  },
-  {
-    "label": "安徽省",
-    "value": "34"
-  },
-  {
-    "label": "福建省",
-    "value": "35"
-  },
-  {
-    "label": "江西省",
-    "value": "36"
-  },
-  {
-    "label": "山东省",
-    "value": "37"
-  },
-  {
-    "label": "河南省",
-    "value": "41"
-  },
-  {
-    "label": "湖北省",
-    "value": "42"
-  },
-  {
-    "label": "湖南省",
-    "value": "43"
-  },
-  {
-    "label": "广东省",
-    "value": "44"
-  },
-  {
-    "label": "广西壮族自治区",
-    "value": "45"
-  },
-  {
-    "label": "海南省",
-    "value": "46"
-  },
-  {
-    "label": "重庆市",
-    "value": "50"
-  },
-  {
-    "label": "四川省",
-    "value": "51"
-  },
-  {
-    "label": "贵州省",
-    "value": "52"
-  },
-  {
-    "label": "云南省",
-    "value": "53"
-  },
-  {
-    "label": "西藏自治区",
-    "value": "54"
-  },
-  {
-    "label": "陕西省",
-    "value": "61"
-  },
-  {
-    "label": "甘肃省",
-    "value": "62"
-  },
-  {
-    "label": "青海省",
-    "value": "63"
-  },
-  {
-    "label": "宁夏回族自治区",
-    "value": "64"
-  },
-  {
-    "label": "新疆维吾尔自治区",
-    "value": "65"
-  },
-  {
-    "label": "台湾",
-    "value": "66"
-  },
-  {
-    "label": "香港",
-    "value": "67"
-  },
-  {
-    "label": "澳门",
-    "value": "68"
-  }
-]
-export default provinceData;

uview-ui/package.json

 {
 	"name": "uview-ui",
-	"version": "1.5.8",
+	"version": "1.6.0",
 	"description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
 	"main": "index.js",
 	"keywords": ["uview", "uView", "uni-app", "uni-app ui", "uniapp", "uviewui", "uview ui", "uviewUI", "uViewui", "uViewUI", "uView UI", "uni ui", "uni UI", "uniapp ui", "ui", "UI框架", "uniapp ui框架", "uniapp UI"],

vue.config.js

@@ -2,6 +2,7 @@ module.exports = {
 	// 配置路径别名
 	configureWebpack: {
 		devServer: {
+			// 调试时允许内网穿透，让外网的人访问到本地调试的H5页面
 			disableHostCheck: true
 		}
 	}