From 69f39539ef7fc531b7669c0e0bc0b4552daa9620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E6=A9=99=E6=A5=8A?= <2370374436@qq.com>
Date: Tue, 15 Oct 2019 03:17:54 +0800
Subject: [PATCH] init

---
 .gitignore                           |    1 +
 package.json                         |    5 +-
 postcss.config.js                    |    2 +-
 src/App.vue                          |    5 +
 src/common/uni.css                   | 1447 ++++++++++++++++++++++++++
 src/manifest.json                    |    2 +-
 src/pages.json                       |   57 +-
 src/pages/index/index.vue            |   10 +-
 src/pages/waste_sorting/baike.vue    |   62 ++
 src/pages/waste_sorting/query.vue    |   75 ++
 src/pages/waste_sorting/question.vue |   91 ++
 src/static/photo.png                 |  Bin 0 -> 10841 bytes
 src/static/uni.ttf                   |  Bin 0 -> 18472 bytes
 src/uni.scss                         |   34 +-
 yarn.lock                            |   30 +-
 15 files changed, 1775 insertions(+), 46 deletions(-)
 create mode 100644 src/common/uni.css
 create mode 100644 src/pages/waste_sorting/baike.vue
 create mode 100644 src/pages/waste_sorting/query.vue
 create mode 100644 src/pages/waste_sorting/question.vue
 create mode 100644 src/static/photo.png
 create mode 100644 src/static/uni.ttf

diff --git a/.gitignore b/.gitignore
index 2561bb4..eda1a93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+/package-lock.json
diff --git a/package.json b/package.json
index 0457ba1..a7476e9 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "@dcloudio/uni-mp-weixin": "^2.0.0-23320190923002",
     "@dcloudio/uni-stat": "^2.0.0-23320190923002",
     "flyio": "^0.6.2",
+    "mpvue-weui": "^1.0.13",
     "regenerator-runtime": "^0.12.1",
     "vue": "^2.6.10",
     "vuex": "^3.0.1"
@@ -46,8 +47,8 @@
     "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.0-23320190923002",
     "@dcloudio/webpack-uni-mp-loader": "^2.0.0-23320190923002",
     "@dcloudio/webpack-uni-pages-loader": "^2.0.0-23320190923002",
-    "@types/html5plus": "*",
-    "@types/uni-app": "*",
+    "@types/html5plus": "^1.0.0",
+    "@types/uni-app": "^1.4.0",
     "@vue/cli-plugin-babel": "3.5.1",
     "@vue/cli-service": "^3.12.0",
     "babel-plugin-import": "^1.11.0",
diff --git a/postcss.config.js b/postcss.config.js
index 5112863..7867f0a 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -5,6 +5,6 @@ module.exports = {
     require('autoprefixer')({
       remove: process.env.UNI_PLATFORM !== 'h5'
     }),
-    require('@dcloudio/vue-cli-plugin-uni/packages/postcss')
+    require('@dcloudio/vue-cli-plugin-uni/packages/postcss'),
   ]
 }
diff --git a/src/App.vue b/src/App.vue
index 8c2b732..8050a38 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,4 +14,9 @@
 
 <style>
 	/*每个页面公共css */
+
+    /* #ifndef APP-PLUS-NVUE */
+    /* uni.css - 通用组件、模板样式库，可以当作一套ui库应用 */
+    @import './common/uni.css';
+    @import '../node_modules/mpvue-weui/src/style/weui.css';
 </style>
diff --git a/src/common/uni.css b/src/common/uni.css
new file mode 100644
index 0000000..c6ec0a6
--- /dev/null
+++ b/src/common/uni.css
@@ -0,0 +1,1447 @@
+@font-face {
+	font-family: uniicons;
+	font-weight: normal;
+	font-style: normal;
+	src: url('./static/uni.ttf') format('truetype');
+}
+
+/*通用 */
+view{
+	font-size:28rpx;
+	line-height:1.8;
+}
+progress, checkbox-group{
+	width: 100%;
+}
+form {
+	width: 100%;
+}
+.uni-flex {
+	display: flex;
+	flex-direction: row;
+}
+.uni-flex-item {
+	flex: 1;
+}
+.uni-row {
+	flex-direction: row;
+}
+.uni-column {
+	flex-direction: column;
+}
+.uni-link{
+	color:#576B95;
+	font-size:26rpx;
+}
+.uni-center{
+	text-align:center;
+}
+.uni-inline-item{
+	display: flex;
+	flex-direction: row;
+	align-items:center;
+}
+.uni-inline-item text{
+	margin-right: 20rpx;
+}
+.uni-inline-item text:last-child{
+	margin-right: 0rpx;
+	margin-left: 20rpx;
+}
+
+/* page */
+.uni-page-head{
+	padding:35rpx;
+	text-align: center;
+}
+.uni-page-head-title {
+	display: inline-block;
+	padding: 0 40rpx;
+	font-size: 30rpx;
+	height: 88rpx;
+	line-height: 88rpx;
+	color: #BEBEBE;
+	box-sizing: border-box;
+	border-bottom: 2rpx solid #D8D8D8;
+}
+.uni-page-body {
+	width: 100%;
+	flex-grow: 1;
+	overflow-x: hidden;
+}
+.uni-padding-wrap{
+	width:690rpx;
+	padding:0 30rpx;
+}
+.uni-word {
+	text-align: center;
+	padding:200rpx 100rpx;
+}
+.uni-title {
+	font-size:30rpx;
+	font-weight:500;
+	padding:20rpx 0;
+	line-height:1.5;
+}
+.uni-text{
+	font-size:28rpx;
+}
+.uni-title text{
+	font-size:24rpx;
+	color:#888;
+}
+
+.uni-text-gray{
+	color: #ccc;
+}
+.uni-text-small {
+	font-size:24rpx;
+}
+.uni-common-mb{
+	margin-bottom:30rpx;
+}
+.uni-common-pb{
+	padding-bottom:30rpx;
+}
+.uni-common-pl{
+	padding-left:30rpx;
+}
+.uni-common-mt{
+	margin-top:30rpx;
+}
+/* 背景色 */
+.uni-bg-red{
+	background:#F76260; color:#FFF;
+}
+.uni-bg-green{
+	background:#09BB07; color:#FFF;
+}
+.uni-bg-blue{
+	background:#007AFF; color:#FFF;
+}
+/* 标题 */
+.uni-h1 {font-size: 80rpx; font-weight:700;}
+.uni-h2 {font-size: 60rpx; font-weight:700;}
+.uni-h3 {font-size: 48rpx; font-weight:700;}
+.uni-h4 {font-size: 36rpx; font-weight:700;}
+.uni-h5 {font-size: 28rpx; color: #8f8f94;}
+.uni-h6 {font-size: 24rpx; color: #8f8f94;}
+.uni-bold{font-weight:bold;}
+
+/* 文本溢出隐藏 */
+.uni-ellipsis {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
+
+/* 竖向百分百按钮 */
+.uni-btn-v{
+	padding:10rpx 0;
+}
+.uni-btn-v button{margin:20rpx 0;}
+
+/* 表单 */
+.uni-form-item{
+	display:flex;
+	width:100%;
+	padding:10rpx 0;
+}
+.uni-form-item .title{
+	padding:10rpx 25rpx;
+}
+.uni-label {
+	width: 210rpx;
+	word-wrap: break-word;
+	word-break: break-all;
+	text-indent:20rpx;
+}
+.uni-input {
+	height: 50rpx;
+	padding: 15rpx 25rpx;
+	line-height:50rpx;
+	font-size:28rpx;
+	background:#FFF;
+	flex: 1;
+}
+radio-group, checkbox-group{
+	width:100%;
+}
+radio-group label, checkbox-group label{
+	padding-right:20rpx;
+}
+.uni-form-item .with-fun{
+	display:flex;
+	flex-wrap:nowrap;
+	background:#FFFFFF;
+}
+.uni-form-item .with-fun .uni-icon{
+	width:40px;
+	height:80rpx;
+	line-height:80rpx;
+	flex-shrink:0;
+}
+
+/* loadmore */
+.uni-loadmore{
+	height:80rpx;
+	line-height:80rpx;
+	text-align:center;
+	padding-bottom:30rpx;
+}
+/*数字角标*/
+.uni-badge,
+.uni-badge-default {
+	font-family: 'Helvetica Neue', Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 1;
+	display: inline-block;
+	padding: 3px 6px;
+	color: #333;
+	border-radius: 100px;
+	background-color: rgba(0, 0, 0, .15);
+}
+.uni-badge.uni-badge-inverted {
+	padding: 0 5px 0 0;
+	color: #929292;
+	background-color: transparent
+}
+.uni-badge-primary {
+	color: #fff;
+	background-color: #007aff
+}
+.uni-badge-blue.uni-badge-inverted,
+.uni-badge-primary.uni-badge-inverted {
+	color: #007aff;
+	background-color: transparent
+}
+.uni-badge-green,
+.uni-badge-success {
+	color: #fff;
+	background-color: #4cd964;
+}
+.uni-badge-green.uni-badge-inverted,
+.uni-badge-success.uni-badge-inverted {
+	color: #4cd964;
+	background-color: transparent
+}
+.uni-badge-warning,
+.uni-badge-yellow {
+	color: #fff;
+	background-color: #f0ad4e
+}
+.uni-badge-warning.uni-badge-inverted,
+.uni-badge-yellow.uni-badge-inverted {
+	color: #f0ad4e;
+	background-color: transparent
+}
+.uni-badge-danger,
+.uni-badge-red {
+	color: #fff;
+	background-color: #dd524d
+}
+.uni-badge-danger.uni-badge-inverted,
+.uni-badge-red.uni-badge-inverted {
+	color: #dd524d;
+	background-color: transparent
+}
+.uni-badge-purple,
+.uni-badge-royal {
+	color: #fff;
+	background-color: #8a6de9
+}
+.uni-badge-purple.uni-badge-inverted,
+.uni-badge-royal.uni-badge-inverted {
+	color: #8a6de9;
+	background-color: transparent
+}
+
+/*折叠面板 */
+.uni-collapse-content {
+	height: 0;
+	width: 100%;
+	overflow: hidden;
+}
+.uni-collapse-content.uni-active {
+	height: auto;
+}
+
+/*卡片视图 */
+.uni-card {
+	background: #fff;
+	border-radius: 8rpx;
+	margin:20rpx 0;
+	position: relative;
+	box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, .3);
+}
+.uni-card-content {
+	font-size: 30rpx;
+}
+.uni-card-content.image-view{
+    width: 100%;
+    margin: 0;
+}
+.uni-card-content-inner {
+	position: relative;
+	padding: 30rpx;
+}
+.uni-card-footer,
+.uni-card-header {
+	position: relative;
+	display: flex;
+	min-height: 50rpx;
+	padding: 20rpx 30rpx;
+	justify-content: space-between;
+	align-items: center;
+}
+.uni-card-header {
+	font-size: 36rpx;
+}
+.uni-card-footer {
+	color: #6d6d72;
+}
+.uni-card-footer:before,
+.uni-card-header:after {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+.uni-card-header:after {
+	top: auto;
+	bottom: 0;
+}
+.uni-card-media {
+	justify-content: flex-start;
+}
+.uni-card-media-logo {
+	height: 84rpx;
+	width: 84rpx;
+	margin-right: 20rpx;
+}
+.uni-card-media-body {
+	height: 84rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+}
+.uni-card-media-text-top {
+	line-height: 36rpx;
+	font-size: 34rpx;
+}
+.uni-card-media-text-bottom {
+	line-height: 30rpx;
+	font-size: 28rpx;
+	color: #8f8f94;
+}
+.uni-card-link {
+	color: #007AFF;
+}
+
+/* 列表 */
+.uni-list {
+	background-color: #FFFFFF;
+	position: relative;
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+}
+.uni-list:after {
+	position: absolute;
+	z-index: 10;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+.uni-list::before {
+	position: absolute;
+	z-index: 10;
+	right: 0;
+	top: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+.uni-list-cell {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+}
+.uni-list-cell-hover {
+	background-color: #eee;
+}
+.uni-list-cell-pd {
+	padding: 22rpx 30rpx;
+}
+.uni-list-cell-left {
+	font-size:28rpx;
+	padding: 0 30rpx;
+}
+.uni-list-cell-db,
+.uni-list-cell-right {
+	flex: 1;
+}
+.uni-list-cell::after {
+	position: absolute;
+  z-index: 3;
+	right: 0;
+	bottom: 0;
+	left: 30rpx;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+.uni-list .uni-list-cell:last-child::after {
+	height: 0rpx;
+}
+.uni-list-cell-last.uni-list-cell::after {
+	height: 0rpx;
+}
+.uni-list-cell-divider {
+	position: relative;
+	display: flex;
+	color: #999;
+	background-color: #f7f7f7;
+	padding:15rpx 20rpx;
+}
+.uni-list-cell-divider::before {
+	position: absolute;
+	right: 0;
+	top: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+.uni-list-cell-divider::after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 0rpx;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+.uni-list-cell-navigate {
+	font-size:30rpx;
+	padding: 22rpx 30rpx;
+	line-height: 48rpx;
+	position: relative;
+	display: flex;
+	box-sizing: border-box;
+	width: 100%;
+	flex: 1;
+	justify-content: space-between;
+	align-items: center;
+}
+.uni-list-cell-navigate {
+	padding-right: 36rpx;
+}
+.uni-navigate-badge {
+	padding-right: 50rpx;
+}
+.uni-list-cell-navigate.uni-navigate-right:after {
+	font-family: uniicons;
+	content: '\e583';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+.uni-list-cell-navigate.uni-navigate-bottom:after {
+	font-family: uniicons;
+	content: '\e581';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+.uni-list-cell-navigate.uni-navigate-bottom.uni-active::after {
+	font-family: uniicons;
+	content: '\e580';
+	position: absolute;
+	right: 24rpx;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+.uni-collapse.uni-list-cell {
+	flex-direction: column;
+}
+.uni-list-cell-navigate.uni-active {
+	background: #eee;
+}
+.uni-list.uni-collapse {
+	box-sizing: border-box;
+	height: 0;
+	overflow: hidden;
+}
+.uni-collapse .uni-list-cell {
+	padding-left: 20rpx;
+}
+.uni-collapse .uni-list-cell::after {
+	left: 52rpx;
+}
+.uni-list.uni-active {
+	height: auto;
+}
+
+/* 三行列表 */
+.uni-triplex-row {
+	display: flex;
+	flex: 1;
+	width: 100%;
+	box-sizing: border-box;
+	flex-direction: row;
+	padding: 22rpx 30rpx;
+}
+.uni-triplex-right,
+.uni-triplex-left {
+	display: flex;
+	flex-direction: column;
+}
+.uni-triplex-left {
+	width: 84%;
+}
+.uni-triplex-left .uni-title{
+	padding:8rpx 0;
+}
+.uni-triplex-left .uni-text, .uni-triplex-left .uni-text-small{color:#999999;}
+.uni-triplex-right {
+	width: 16%;
+	text-align: right;
+}
+
+/* 图文列表 */
+.uni-media-list {
+	padding: 22rpx 30rpx;
+	box-sizing: border-box;
+	display: flex;
+	width: 100%;
+	flex-direction: row;
+}
+.uni-navigate-right.uni-media-list {
+	padding-right: 74rpx;
+}
+.uni-pull-right {
+	flex-direction: row-reverse;
+}
+.uni-pull-right>.uni-media-list-logo {
+	margin-right: 0rpx;
+	margin-left: 20rpx;
+}
+.uni-media-list-logo {
+	height: 84rpx;
+	width: 84rpx;
+	margin-right: 20rpx;
+}
+.uni-media-list-logo image {
+	height: 100%;
+	width: 100%;
+}
+.uni-media-list-body {
+	height: 84rpx;
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+	overflow: hidden;
+}
+.uni-media-list-text-top {
+	width: 100%;
+	line-height: 36rpx;
+	font-size: 30rpx;
+}
+.uni-media-list-text-bottom {
+	width: 100%;
+	line-height: 30rpx;
+	font-size: 26rpx;
+	color: #8f8f94;
+}
+
+/* 九宫格 */
+.uni-grid-9 {
+	background: #f2f2f2;
+	width: 750rpx;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	border-top: 2rpx solid #eee;
+}
+.uni-grid-9-item {
+	width: 250rpx;
+	height: 200rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	border-bottom: 2rpx solid;
+	border-right: 2rpx solid;
+	border-color: #eee;
+	box-sizing: border-box;
+}
+.no-border-right {
+	border-right: none;
+}
+.uni-grid-9-image {
+	width: 100rpx;
+	height: 100rpx;
+}
+.uni-grid-9-text {
+	width: 250rpx;
+	line-height: 4rpx;
+	height: 40rpx;
+	text-align: center;
+	font-size: 30rpx;
+}
+.uni-grid-9-item-hover {
+	background: rgba(0, 0, 0, 0.1);
+}
+
+/* 上传 */
+.uni-uploader {
+	flex: 1;
+	flex-direction: column;
+}
+.uni-uploader-head {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+.uni-uploader-info {
+	color: #B2B2B2;
+}
+.uni-uploader-body {
+	margin-top: 16rpx;
+}
+.uni-uploader__files {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+}
+.uni-uploader__file {
+	margin: 10rpx;
+	width: 210rpx;
+	height: 210rpx;
+}
+.uni-uploader__img {
+	display: block;
+	width: 210rpx;
+	height: 210rpx;
+}
+.uni-uploader__input-box {
+	position: relative;
+	margin:10rpx;
+	width: 208rpx;
+	height: 208rpx;
+	border: 2rpx solid #D9D9D9;
+}
+.uni-uploader__input-box:before,
+.uni-uploader__input-box:after {
+	content: " ";
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	background-color: #D9D9D9;
+}
+.uni-uploader__input-box:before {
+	width: 4rpx;
+	height: 79rpx;
+}
+.uni-uploader__input-box:after {
+	width: 79rpx;
+	height: 4rpx;
+}
+.uni-uploader__input-box:active {
+	border-color: #999999;
+}
+.uni-uploader__input-box:active:before,
+.uni-uploader__input-box:active:after {
+	background-color: #999999;
+}
+.uni-uploader__input {
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+}
+
+/*问题反馈*/
+.feedback-title {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	padding: 20rpx;
+	color: #8f8f94;
+	font-size: 28rpx;
+}
+.feedback-star-view.feedback-title {
+	justify-content: flex-start;
+	margin: 0;
+}
+.feedback-quick {
+	position: relative;
+	padding-right: 40rpx;
+}
+.feedback-quick:after {
+	font-family: uniicons;
+	font-size: 40rpx;
+	content: '\e581';
+	position: absolute;
+	right: 0;
+	top: 50%;
+	color: #bbb;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+}
+.feedback-body {
+	background: #fff;
+}
+.feedback-textare {
+	height: 200rpx;
+	font-size: 34rpx;
+	line-height: 50rpx;
+	width: 100%;
+	box-sizing: border-box;
+	padding: 20rpx 30rpx 0;
+}
+.feedback-input {
+	font-size: 34rpx;
+	height: 50rpx;
+	min-height: 50rpx;
+	padding: 15rpx 20rpx;
+	line-height: 50rpx;
+}
+.feedback-uploader {
+	padding: 22rpx 20rpx;
+}
+.feedback-star {
+	font-family: uniicons;
+	font-size: 40rpx;
+	margin-left: 6rpx;
+}
+.feedback-star-view {
+	margin-left: 20rpx;
+}
+.feedback-star:after {
+	content: '\e408';
+}
+.feedback-star.active {
+	color: #FFB400;
+}
+.feedback-star.active:after {
+	content: '\e438';
+}
+.feedback-submit {
+	background: #007AFF;
+	color: #FFFFFF;
+	margin: 20rpx;
+}
+
+/* input group */
+.uni-input-group {
+	position: relative;
+	padding: 0;
+	border: 0;
+	background-color: #fff;
+}
+
+.uni-input-group:before {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-group:after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-row {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	font-size:28rpx;
+	padding: 22rpx 30rpx;
+	justify-content: space-between;
+}
+
+.uni-input-group .uni-input-row:after {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 30rpx;
+	height: 2rpx;
+	content: '';
+	transform: scaleY(.5);
+	background-color: #c8c7cc;
+}
+
+.uni-input-row label {
+	line-height: 70rpx;
+}
+
+/* textarea */
+.uni-textarea{
+	width:100%;
+	background:#FFF;
+}
+.uni-textarea textarea{
+	width:96%;
+	padding:18rpx 2%;
+	line-height:1.6;
+	font-size:28rpx;
+	height:150rpx;
+}
+
+/* tab bar */
+.uni-tab-bar {
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	overflow: hidden;
+	height: 100%;
+}
+
+.uni-tab-bar .list {
+	width: 750rpx;
+	height: 100%;
+}
+
+.uni-swiper-tab {
+	width: 100%;
+	white-space: nowrap;
+	line-height: 100rpx;
+	height: 100rpx;
+	border-bottom: 1px solid #c8c7cc;
+}
+
+.swiper-tab-list {
+	font-size: 30rpx;
+	width: 150rpx;
+	display: inline-block;
+	text-align: center;
+	color: #555;
+}
+
+.uni-tab-bar .active {
+	color: #007AFF;
+}
+
+.uni-tab-bar .swiper-box {
+	flex: 1;
+	width: 100%;
+	height: calc(100% - 100rpx);
+}
+
+.uni-tab-bar-loading{
+	padding:20rpx 0;
+}
+
+/* comment */
+.uni-comment{padding:5rpx 0; display: flex; flex-grow:1; flex-direction: column;}
+.uni-comment-list{flex-wrap:nowrap; padding:10rpx 0; margin:10rpx 0; width:100%; display: flex;}
+.uni-comment-face{width:70rpx; height:70rpx; border-radius:100%; margin-right:20rpx; flex-shrink:0; overflow:hidden;}
+.uni-comment-face image{width:100%; border-radius:100%;}
+.uni-comment-body{width:100%;}
+.uni-comment-top{line-height:1.5em; justify-content:space-between;}
+.uni-comment-top text{color:#0A98D5; font-size:24rpx;}
+.uni-comment-date{line-height:38rpx; flex-direction:row; justify-content:space-between; display:flex !important; flex-grow:1;}
+.uni-comment-date view{color:#666666; font-size:24rpx; line-height:38rpx;}
+.uni-comment-content{line-height:1.6em; font-size:28rpx; padding:8rpx 0;}
+.uni-comment-replay-btn{background:#FFF; font-size:24rpx; line-height:28rpx; padding:5rpx 20rpx; border-radius:30rpx; color:#333 !important; margin:0 10rpx;}
+
+/* swiper msg */
+.uni-swiper-msg{width:100%; padding:12rpx 0; flex-wrap:nowrap; display:flex;}
+.uni-swiper-msg-icon{width:50rpx; margin-right:20rpx;}
+.uni-swiper-msg-icon image{width:100%; flex-shrink:0;}
+.uni-swiper-msg swiper{width:100%; height:50rpx;}
+.uni-swiper-msg swiper-item{line-height:50rpx;}
+
+/* product */
+.uni-product-list {
+    display: flex;
+    width: 100%;
+    flex-wrap: wrap;
+    flex-direction: row;
+}
+
+.uni-product {
+    padding: 20rpx;
+    display: flex;
+    flex-direction: column;
+}
+
+.image-view {
+    height: 330rpx;
+    width: 330rpx;
+	margin:12rpx 0;
+}
+
+.uni-product-image {
+    height: 330rpx;
+    width: 330rpx;
+}
+
+.uni-product-title {
+    width: 300rpx;
+    word-break: break-all;
+    display: -webkit-box;
+    overflow: hidden;
+	line-height:1.5;
+    text-overflow: ellipsis;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+}
+
+.uni-product-price {
+	margin-top:10rpx;
+    font-size: 28rpx;
+	line-height:1.5;
+    position: relative;
+}
+
+.uni-product-price-original {
+    color: #e80080;
+}
+
+.uni-product-price-favour {
+    color: #888888;
+    text-decoration: line-through;
+    margin-left: 10rpx;
+}
+
+.uni-product-tip {
+    position: absolute;
+    right: 10rpx;
+    background-color: #ff3333;
+    color: #ffffff;
+    padding: 0 10rpx;
+    border-radius: 5rpx;
+}
+
+/* timeline */
+.uni-timeline {
+		margin: 35rpx 0;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+
+
+	.uni-timeline-item {
+		display: flex;
+		flex-direction: row;
+		position: relative;
+		padding-bottom: 20rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+
+	}
+
+	.uni-timeline-item .uni-timeline-item-keynode {
+		width: 160rpx;
+		flex-shrink: 0;
+		box-sizing: border-box;
+		padding-right: 20rpx;
+		text-align: right;
+		line-height: 65rpx;
+	}
+
+	.uni-timeline-item .uni-timeline-item-divider {
+		flex-shrink: 0;
+		position: relative;
+		width: 30rpx;
+		height: 30rpx;
+		top: 15rpx;
+		border-radius: 50%;
+		background-color: #bbb;
+	}
+
+
+
+	.uni-timeline-item-divider::before,
+	.uni-timeline-item-divider::after {
+		position: absolute;
+		left: 15rpx;
+		width: 1rpx;
+		height: 100vh;
+		content: '';
+		background: inherit;
+	}
+
+	.uni-timeline-item-divider::before {
+		bottom: 100%;
+	}
+
+	.uni-timeline-item-divider::after {
+		top: 100%;
+	}
+
+
+	.uni-timeline-last-item .uni-timeline-item-divider:after {
+		display: none;
+	}
+
+	.uni-timeline-first-item .uni-timeline-item-divider:before {
+		display: none;
+	}
+
+	.uni-timeline-item .uni-timeline-item-content {
+		padding-left: 20rpx;
+	}
+
+	.uni-timeline-last-item .bottom-border::after{
+		display: none;
+	}
+
+	.uni-timeline-item-content .datetime{
+		color: #CCCCCC;
+	}
+
+	/* 自定义节点颜色 */
+	.uni-timeline-last-item .uni-timeline-item-divider{
+		background-color: #1AAD19;
+	}
+
+
+/* uni-icon */
+
+.uni-icon {
+	font-family: uniicons;
+	font-size: 24px;
+	font-weight: normal;
+	font-style: normal;
+	line-height: 1;
+	display: inline-block;
+	text-decoration: none;
+	-webkit-font-smoothing: antialiased;
+}
+
+.uni-icon.uni-active {
+	color: #007aff;
+}
+
+.uni-icon-contact:before {
+	content: '\e100';
+}
+
+.uni-icon-person:before {
+	content: '\e101';
+}
+
+.uni-icon-personadd:before {
+	content: '\e102';
+}
+
+.uni-icon-contact-filled:before {
+	content: '\e130';
+}
+
+.uni-icon-person-filled:before {
+	content: '\e131';
+}
+
+.uni-icon-personadd-filled:before {
+	content: '\e132';
+}
+
+.uni-icon-phone:before {
+	content: '\e200';
+}
+
+.uni-icon-email:before {
+	content: '\e201';
+}
+
+.uni-icon-chatbubble:before {
+	content: '\e202';
+}
+
+.uni-icon-chatboxes:before {
+	content: '\e203';
+}
+
+.uni-icon-phone-filled:before {
+	content: '\e230';
+}
+
+.uni-icon-email-filled:before {
+	content: '\e231';
+}
+
+.uni-icon-chatbubble-filled:before {
+	content: '\e232';
+}
+
+.uni-icon-chatboxes-filled:before {
+	content: '\e233';
+}
+
+.uni-icon-weibo:before {
+	content: '\e260';
+}
+
+.uni-icon-weixin:before {
+	content: '\e261';
+}
+
+.uni-icon-pengyouquan:before {
+	content: '\e262';
+}
+
+.uni-icon-chat:before {
+	content: '\e263';
+}
+
+.uni-icon-qq:before {
+	content: '\e264';
+}
+
+.uni-icon-videocam:before {
+	content: '\e300';
+}
+
+.uni-icon-camera:before {
+	content: '\e301';
+}
+
+.uni-icon-mic:before {
+	content: '\e302';
+}
+
+.uni-icon-location:before {
+	content: '\e303';
+}
+
+.uni-icon-mic-filled:before,
+.uni-icon-speech:before {
+	content: '\e332';
+}
+
+.uni-icon-location-filled:before {
+	content: '\e333';
+}
+
+.uni-icon-micoff:before {
+	content: '\e360';
+}
+
+.uni-icon-image:before {
+	content: '\e363';
+}
+
+.uni-icon-map:before {
+	content: '\e364';
+}
+
+.uni-icon-compose:before {
+	content: '\e400';
+}
+
+.uni-icon-trash:before {
+	content: '\e401';
+}
+
+.uni-icon-upload:before {
+	content: '\e402';
+}
+
+.uni-icon-download:before {
+	content: '\e403';
+}
+
+.uni-icon-close:before {
+	content: '\e404';
+}
+
+.uni-icon-redo:before {
+	content: '\e405';
+}
+
+.uni-icon-undo:before {
+	content: '\e406';
+}
+
+.uni-icon-refresh:before {
+	content: '\e407';
+}
+
+.uni-icon-star:before {
+	content: '\e408';
+}
+
+.uni-icon-plus:before {
+	content: '\e409';
+}
+
+.uni-icon-minus:before {
+	content: '\e410';
+}
+
+.uni-icon-circle:before,
+.uni-icon-checkbox:before {
+	content: '\e411';
+}
+
+.uni-icon-close-filled:before,
+.uni-icon-clear:before {
+	content: '\e434';
+}
+
+.uni-icon-refresh-filled:before {
+	content: '\e437';
+}
+
+.uni-icon-star-filled:before {
+	content: '\e438';
+}
+
+.uni-icon-plus-filled:before {
+	content: '\e439';
+}
+
+.uni-icon-minus-filled:before {
+	content: '\e440';
+}
+
+.uni-icon-circle-filled:before {
+	content: '\e441';
+}
+
+.uni-icon-checkbox-filled:before {
+	content: '\e442';
+}
+
+.uni-icon-closeempty:before {
+	content: '\e460';
+}
+
+.uni-icon-refreshempty:before {
+	content: '\e461';
+}
+
+.uni-icon-reload:before {
+	content: '\e462';
+}
+
+.uni-icon-starhalf:before {
+	content: '\e463';
+}
+
+.uni-icon-spinner:before {
+	content: '\e464';
+}
+
+.uni-icon-spinner-cycle:before {
+	content: '\e465';
+}
+
+.uni-icon-search:before {
+	content: '\e466';
+}
+
+.uni-icon-plusempty:before {
+	content: '\e468';
+}
+
+.uni-icon-forward:before {
+	content: '\e470';
+}
+
+.uni-icon-back:before,
+.uni-icon-left-nav:before {
+	content: '\e471';
+}
+
+.uni-icon-checkmarkempty:before {
+	content: '\e472';
+}
+
+.uni-icon-home:before {
+	content: '\e500';
+}
+
+.uni-icon-navigate:before {
+	content: '\e501';
+}
+
+.uni-icon-gear:before {
+	content: '\e502';
+}
+
+.uni-icon-paperplane:before {
+	content: '\e503';
+}
+
+.uni-icon-info:before {
+	content: '\e504';
+}
+
+.uni-icon-help:before {
+	content: '\e505';
+}
+
+.uni-icon-locked:before {
+	content: '\e506';
+}
+
+.uni-icon-more:before {
+	content: '\e507';
+}
+
+.uni-icon-flag:before {
+	content: '\e508';
+}
+
+.uni-icon-home-filled:before {
+	content: '\e530';
+}
+
+.uni-icon-gear-filled:before {
+	content: '\e532';
+}
+
+.uni-icon-info-filled:before {
+	content: '\e534';
+}
+
+.uni-icon-help-filled:before {
+	content: '\e535';
+}
+
+.uni-icon-more-filled:before {
+	content: '\e537';
+}
+
+.uni-icon-settings:before {
+	content: '\e560';
+}
+
+.uni-icon-list:before {
+	content: '\e562';
+}
+
+.uni-icon-bars:before {
+	content: '\e563';
+}
+
+.uni-icon-loop:before {
+	content: '\e565';
+}
+
+.uni-icon-paperclip:before {
+	content: '\e567';
+}
+
+.uni-icon-eye:before {
+	content: '\e568';
+}
+
+.uni-icon-arrowup:before {
+	content: '\e580';
+}
+
+.uni-icon-arrowdown:before {
+	content: '\e581';
+}
+
+.uni-icon-arrowleft:before {
+	content: '\e582';
+}
+
+.uni-icon-arrowright:before {
+	content: '\e583';
+}
+
+.uni-icon-arrowthinup:before {
+	content: '\e584';
+}
+
+.uni-icon-arrowthindown:before {
+	content: '\e585';
+}
+
+.uni-icon-arrowthinleft:before {
+	content: '\e586';
+}
+
+.uni-icon-arrowthinright:before {
+	content: '\e587';
+}
+
+.uni-icon-pulldown:before {
+	content: '\e588';
+}
+
+.uni-icon-scan:before {
+    content: "\e612";
+}
+
+/* 分界线 */
+.uni-divider{
+    height: 110rpx;
+    display: flex;
+    align-items:center;
+    justify-content: center;
+    position: relative;
+}
+.uni-divider__content{
+    font-size: 28rpx;
+    color: #999;
+    padding: 0 20rpx;
+    position: relative;
+    z-index: 101;
+    background: #F4F5F6;
+}
+.uni-divider__line{
+    background-color: #CCCCCC;
+    height: 1px;
+    width: 100%;
+    position: absolute;
+    z-index: 100;
+    top: 50%;
+    left: 0;
+    transform: translateY(50%);
+}
diff --git a/src/manifest.json b/src/manifest.json
index 972bd1e..1512164 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -54,7 +54,7 @@
 
 	},
 	"mp-weixin": { /* 微信小程序特有相关 */
-		"appid": "",
+		"appid": "wx3f63b0c4127278ac",
 		"setting": {
 			"urlCheck": false
 		},
diff --git a/src/pages.json b/src/pages.json
index 1aea851..6370ba6 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,16 +1,45 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "uni-app"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	}
+  "pages": [
+    //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+    {
+      "path": "pages/waste_sorting/query",
+      "style": {
+        "navigationBarTitleText": "查询"
+      }
+    },
+    {
+      "path": "pages/waste_sorting/baike",
+      "style": {
+        "navigationBarTitleText": "百科"
+      }
+    },
+    {
+      "path": "pages/waste_sorting/question",
+      "style": {
+        "navigationBarTitleText": "测验"
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  "tabBar": {
+    "list": [
+      {
+        "pagePath": "pages/waste_sorting/query",
+        "text": "查询"
+      },
+      {
+        "pagePath": "pages/waste_sorting/baike",
+        "text": "百科"
+      },
+      {
+        "pagePath": "pages/waste_sorting/question",
+        "text": "测验"
+      }
+    ]
+  }
 }
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 30323da..3280c0d 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -26,17 +26,17 @@
 <style>
 	.content {
 		text-align: center;
-		height: 400upx;
+		height: 400rpx;
 	}
 
 	.logo {
-		height: 200upx;
-		width: 200upx;
-		margin-top: 200upx;
+		height: 200rpx;
+		width: 200rpx;
+		margin-top: 200rpx;
 	}
 
 	.title {
-		font-size: 36upx;
+		font-size: 36rpx;
 		color: #8f8f94;
 	}
 </style>
diff --git a/src/pages/waste_sorting/baike.vue b/src/pages/waste_sorting/baike.vue
new file mode 100644
index 0000000..462ed4d
--- /dev/null
+++ b/src/pages/waste_sorting/baike.vue
@@ -0,0 +1,62 @@
+<template>
+    <view>
+        <view class="uni-padding-wrap uni-common-mt">
+            <view class="uni-form-item uni-column">
+
+                <view class="weui-cells weui-cells_after-title" v-for="(group,index) in groups" :key="index">
+                    <button url="" class="weui-cell weui-cell_access" hover-class="weui-cell_active" @click="loadGroup(group)">
+                        <view class="weui-cell__bd">{{group.name}}</view>
+                        <view class="weui-cell__ft weui-cell__ft_in-access"></view>
+                    </button>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: "baike",
+        data:function () {
+            return {
+                title:"垃圾分类百科",
+                groups:[
+                    {
+                        name:"可回收垃圾",
+                        icon:"",
+                        type:1
+                    },
+                    {
+                        name:"有害垃圾",
+                        icon:"",
+                        type:2
+                    },
+                    {
+                        name:"湿垃圾",
+                        icon:"",
+                        type:4
+                    },
+                    {
+                        name:"干垃圾",
+                        icon:"",
+                        type:8
+                    },
+                    {
+                        name:"大件垃圾",
+                        icon:"",
+                        type:16
+                    }
+                ]
+            }
+        },
+        methods:{
+            loadGroup:function (group) {
+                console.info("选中"+group.name)
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/pages/waste_sorting/query.vue b/src/pages/waste_sorting/query.vue
new file mode 100644
index 0000000..e0ffe2c
--- /dev/null
+++ b/src/pages/waste_sorting/query.vue
@@ -0,0 +1,75 @@
+<template>
+    <view>
+        <view class="uni-padding-wrap uni-common-mt">
+
+            <view class="uni-form-item uni-column">
+
+                <text class="title uni-center">从文本框输入垃圾关键字查询</text>
+                <view class="weui-cells weui-cells_after-title">
+                    <view class="weui-cell ">
+                        <view class="weui-cell__bd">
+                            <input class="weui-input" v-model="textValue" placeholder="请输入垃圾关键字" @input="changeTextQuery" />
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <view class="uni-flex uni-column">
+                <text class="title uni-center">点击图标拍照查询</text>
+                <view class="flex-item flex-item-V uni-center">
+                <image class="photo"  @click="chooseImage"></image>
+                </view>
+            </view>
+
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: "query",
+        data:function(){
+            return {
+                title:"垃圾分类查询",
+                textValue:""
+            }
+        },
+        methods:{
+            changeTextQuery:function () {
+                console.info("文本查询值："+this.textValue)
+            },
+            chooseImage:function () {
+                console.info("拍照查询")
+                uni.authorize({
+                    scope:"scope.camera",
+                    success:function () {
+                        console.info("摄像头调用成功")
+                        uni.chooseImage({
+                            sourceType:["camera"],
+                            success:function (obj) {
+                                console.info("拍照成功，照片路径"+obj.tempFilePaths[0])
+                            },
+                            fail:function () {
+                                console.error("拍照失败")
+                            }
+                        })
+                    },
+                    fail:function () {
+                        console.error("授权摄像头权限失败，请刷新页面重新授权")
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style scoped>
+   .photo{
+       background-image:url("~@/static/photo.png");
+       background-size: 100% 100%;
+       width: 100%;
+   }
+    text{
+        font-size: 15px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/waste_sorting/question.vue b/src/pages/waste_sorting/question.vue
new file mode 100644
index 0000000..a75461d
--- /dev/null
+++ b/src/pages/waste_sorting/question.vue
@@ -0,0 +1,91 @@
+<template>
+    <view>
+        <view class="uni-padding-wrap uni-common-mt" v-if="isLoad">
+
+            <view v-for="(question,q_index) in questions" :key="q_index" class="question uni-flex uni-column">
+                <text class="title uni-center">{{question.question}}</text>
+                <radio-group>
+                    <label class="uni-list-cell uni-list-cell-pd" v-for="(answer,a_index) in question.answers" :key="a_index">
+                        <view>
+                            <radio :value="a_index"/>
+                        </view>
+                        <view>{{answer}}</view>
+                    </label>
+                </radio-group>
+            </view>
+
+            <view class="uni-flex uni-row button-group question">
+                <view class="flex-item">
+                    <button type="primary" @click="submit">提交答卷</button>
+                </view>
+                <view class="flex-item">
+                    <button type="primary" class="reset" @click="reset">重置答卷</button>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: "question",
+        data: function () {
+            return {
+                title: "垃圾百科测验",
+                questions:[],
+                isLoad:false
+            }
+        },
+        methods:{
+            reset:function () {
+                uni.reLaunch({
+                    url: 'question'
+                });
+            },
+            submit:function () {
+                console.info("提交答卷")
+            }
+        },
+        onShow:function(){
+            console.info("加载试题中")
+            uni.showLoading({
+                title:"加载试题中"
+            })
+            let _this=this
+            console.info(_this)
+            setTimeout(function () {
+                _this.questions=[
+                    {
+                        question: "测试问题?",
+                        answers: ["答案1", "答案2", "答案3", "答案4"]
+                    },
+                    {
+                        question: "测试问题?",
+                        answers: ["答案1", "答案2", "答案3", "答案4"]
+                    },
+                    {
+                        question: "测试问题?",
+                        answers: ["答案1", "答案2", "答案3", "答案4"]
+                    }
+                ]
+                _this.isLoad=true
+                uni.hideLoading()
+            },1000)
+        }
+    }
+</script>
+
+<style scoped>
+    .uni-list-cell {
+        justify-content: flex-start
+    }
+    .question{
+        margin-top:10px;
+    }
+    .reset{
+        margin-left: 20px;
+    }
+    .button-group{
+        justify-content: center;
+    }
+</style>
\ No newline at end of file
diff --git a/src/static/photo.png b/src/static/photo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fed8406ceecf087cd1637262a47f6ace7b70c90b
GIT binary patch
literal 10841
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
Gi~kEll3tDg

literal 0
HcmV?d00001

diff --git a/src/static/uni.ttf b/src/static/uni.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e8d4909fbb46b6309064297aa31d1146f6ac678e
GIT binary patch
literal 18472
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
J2KvVt`*#P5aykG2

literal 0
HcmV?d00001

diff --git a/src/uni.scss b/src/uni.scss
index f0f426c..845142d 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -39,38 +39,38 @@ $uni-border-color:#c8c7cc;
 /* 尺寸变量 */
 
 /* 文字尺寸 */
-$uni-font-size-sm:24upx;
-$uni-font-size-base:28upx;
-$uni-font-size-lg:32upx;
+$uni-font-size-sm:24rpx;
+$uni-font-size-base:28rpx;
+$uni-font-size-lg:32rpx;
 
 /* 图片尺寸 */
-$uni-img-size-sm:40upx;
-$uni-img-size-base:52upx;
-$uni-img-size-lg:80upx;
+$uni-img-size-sm:40rpx;
+$uni-img-size-base:52rpx;
+$uni-img-size-lg:80rpx;
 
 /* Border Radius */
-$uni-border-radius-sm: 4upx;
-$uni-border-radius-base: 6upx;
-$uni-border-radius-lg: 12upx;
+$uni-border-radius-sm: 4rpx;
+$uni-border-radius-base: 6rpx;
+$uni-border-radius-lg: 12rpx;
 $uni-border-radius-circle: 50%;
 
 /* 水平间距 */
 $uni-spacing-row-sm: 10px;
-$uni-spacing-row-base: 20upx;
-$uni-spacing-row-lg: 30upx;
+$uni-spacing-row-base: 20rpx;
+$uni-spacing-row-lg: 30rpx;
 
 /* 垂直间距 */
-$uni-spacing-col-sm: 8upx;
-$uni-spacing-col-base: 16upx;
-$uni-spacing-col-lg: 24upx;
+$uni-spacing-col-sm: 8rpx;
+$uni-spacing-col-base: 16rpx;
+$uni-spacing-col-lg: 24rpx;
 
 /* 透明度 */
 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
 /* 文章场景相关 */
 $uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:40upx;
+$uni-font-size-title:40rpx;
 $uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:36upx;
+$uni-font-size-subtitle:36rpx;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30upx;
\ No newline at end of file
+$uni-font-size-paragraph:30rpx;
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 0f4625d..060f2b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -862,10 +862,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/html5plus@*":
+"@types/html5plus@^1.0.0":
   version "1.0.0"
-  resolved "https://registry.npm.taobao.org/@types/html5plus/download/@types/html5plus-1.0.0.tgz#a88600fc9de85b785959754aea403c0a8d0714ba"
-  integrity sha1-qIYA/J3oW3hZWXVK6kA8Co0HFLo=
+  resolved "https://registry.yarnpkg.com/@types/html5plus/-/html5plus-1.0.0.tgz#a88600fc9de85b785959754aea403c0a8d0714ba"
+  integrity sha512-kTL4Ik+pTXEAhzDS0jUp0x1kEEY025LQzqEKN1ggnQwWgRHQzAf3tY2ZCYr57jPz9TypN0z1Tf/XY6xQbSPSDw==
 
 "@types/minimatch@*":
   version "3.0.3"
@@ -887,10 +887,10 @@
   resolved "https://registry.npm.taobao.org/@types/q/download/@types/q-1.5.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha1-aQoUdbhPKohP0HzXl8APXzE1bqg=
 
-"@types/uni-app@*":
+"@types/uni-app@^1.4.0":
   version "1.4.0"
-  resolved "https://registry.npm.taobao.org/@types/uni-app/download/@types/uni-app-1.4.0.tgz#83b910384733c19b1947e285ac07924bbdb074a6"
-  integrity sha1-g7kQOEczwZsZR+KFrAeSS72wdKY=
+  resolved "https://registry.yarnpkg.com/@types/uni-app/-/uni-app-1.4.0.tgz#83b910384733c19b1947e285ac07924bbdb074a6"
+  integrity sha512-qRrNTzPOVTIDzDQWJ4zXhKxfnk4LfQwkf5HVBMWL/d0ke039eHbmlhZJCm7kIxa0fa/mNgREkWDgvzs2Uz2y3A==
   dependencies:
     vue "^2.6.8"
 
@@ -5054,6 +5054,24 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
+mpvue-citypicker@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/mpvue-citypicker/-/mpvue-citypicker-1.0.6.tgz#861b9d4b1ed2245ad860d7e29dd2872d8fa7c74a"
+  integrity sha512-V8TuUILYw7pFV0ii02tXKUtLmoa+mTxxJS85dEIc4sp85dVTLNi2GmXqBoz9MkT+QwKeOf3fPvFZzoucERz5rA==
+
+mpvue-picker@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/mpvue-picker/-/mpvue-picker-2.1.6.tgz#e4e423bf66e063e3ab17076094601e847f670798"
+  integrity sha512-qm4sAw8uFfwIl6CBSyKWij8OcAcLntag3acqeYJy4TgNjaANOrZMx8UaA9dY+NZOrLmFJL/rZwxWKd3rg3O7dA==
+
+mpvue-weui@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/mpvue-weui/-/mpvue-weui-1.0.13.tgz#d4b42a42f7b73fa32526deb54f3d48dc6e776c7d"
+  integrity sha512-zgIQ0LqOVywaASOLJptgI3MAEiTcO9cwKO2NTO0dBBF3kFwbopAGMROOd+lRqQFuC9+46huYxjqijVbNMfkejg==
+  dependencies:
+    mpvue-citypicker "^1.0.6"
+    mpvue-picker "^2.1.6"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"